[ONOS-7285][ONOS-7263] VLAN support by fabric.p4
Change-Id: I9ea460bca2698eb74f0d4988830a1e7cc7bc2768
diff --git a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.p4info b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.p4info
index bc8c786..38c5346 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.p4info
+++ b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.p4info
@@ -392,6 +392,27 @@
}
tables {
preamble {
+ id: 33562709
+ name: "FabricIngress.next.vlan_meta"
+ alias: "vlan_meta"
+ }
+ match_fields {
+ id: 1
+ name: "fabric_metadata.next_id"
+ bitwidth: 32
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16790685
+ }
+ action_refs {
+ id: 16819938
+ }
+ direct_resource_ids: 302008112
+ size: 1024
+}
+tables {
+ preamble {
id: 33571723
name: "FabricIngress.next.simple"
alias: "simple"
@@ -415,6 +436,9 @@
id: 16780811
}
action_refs {
+ id: 16791579
+ }
+ action_refs {
id: 16800567
annotations: "@defaultonly()"
}
@@ -472,6 +496,32 @@
direct_resource_ids: 302024536
size: 1024
}
+tables {
+ preamble {
+ id: 33599342
+ name: "FabricEgress.egress_next.egress_vlan"
+ alias: "egress_vlan"
+ }
+ match_fields {
+ id: 1
+ name: "hdr.vlan_tag.vlan_id"
+ bitwidth: 12
+ match_type: EXACT
+ }
+ match_fields {
+ id: 2
+ name: "standard_metadata.egress_port"
+ bitwidth: 9
+ match_type: EXACT
+ }
+ action_refs {
+ id: 16790030
+ }
+ action_refs {
+ id: 16819938
+ }
+ size: 1024
+}
actions {
preamble {
id: 16800567
@@ -540,7 +590,7 @@
preamble {
id: 16793253
name: "FabricIngress.filtering.set_vlan"
- alias: "set_vlan"
+ alias: "filtering.set_vlan"
}
params {
id: 1
@@ -624,6 +674,18 @@
}
actions {
preamble {
+ id: 16790685
+ name: "FabricIngress.next.set_vlan"
+ alias: "next.set_vlan"
+ }
+ params {
+ id: 1
+ name: "new_vlan_id"
+ bitwidth: 12
+ }
+}
+actions {
+ preamble {
id: 16808391
name: "FabricIngress.next.set_vlan_output"
alias: "set_vlan_output"
@@ -663,6 +725,33 @@
}
actions {
preamble {
+ id: 16791579
+ name: "FabricIngress.next.l3_routing_vlan"
+ alias: "l3_routing_vlan"
+ }
+ params {
+ id: 1
+ name: "port_num"
+ bitwidth: 9
+ }
+ params {
+ id: 2
+ name: "smac"
+ bitwidth: 48
+ }
+ params {
+ id: 3
+ name: "dmac"
+ bitwidth: 48
+ }
+ params {
+ id: 4
+ name: "new_vlan_id"
+ bitwidth: 12
+ }
+}
+actions {
+ preamble {
id: 16780811
name: "FabricIngress.next.mpls_routing_v4"
alias: "mpls_routing_v4"
@@ -739,6 +828,20 @@
alias: "gtpu_encap"
}
}
+actions {
+ preamble {
+ id: 16801047
+ name: "FabricEgress.pkt_io_egress.pop_vlan"
+ alias: "pkt_io_egress.pop_vlan"
+ }
+}
+actions {
+ preamble {
+ id: 16790030
+ name: "FabricEgress.egress_next.pop_vlan"
+ alias: "egress_next.pop_vlan"
+ }
+}
action_profiles {
preamble {
id: 285233747
@@ -883,6 +986,17 @@
}
direct_counters {
preamble {
+ id: 302008112
+ name: "FabricIngress.next.vlan_meta_counter"
+ alias: "vlan_meta_counter"
+ }
+ spec {
+ unit: BOTH
+ }
+ direct_table_id: 33562709
+}
+direct_counters {
+ preamble {
id: 301991880
name: "FabricIngress.next.simple_counter"
alias: "simple_counter"