Added ethertype QinQ when double VLAN tagged packets
Double VLAN tagged packets in Mininet uses QinQ Ethertype.
Change-Id: I7c3fa5f1db1ade768e1d998185d9eadded9ebb81
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 14c6701..0f6a839 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -437,6 +437,18 @@
"transitions" : [
{
"type" : "hexstr",
+ "value" : "0x88a8",
+ "mask" : null,
+ "next_state" : "parse_vlan_tag"
+ },
+ {
+ "type" : "hexstr",
+ "value" : "0x9100",
+ "mask" : null,
+ "next_state" : "parse_vlan_tag"
+ },
+ {
+ "type" : "hexstr",
"value" : "0x8100",
"mask" : null,
"next_state" : "parse_vlan_tag"
@@ -500,18 +512,6 @@
"next_state" : "parse_inner_vlan_tag"
},
{
- "type" : "hexstr",
- "value" : "0x88a8",
- "mask" : null,
- "next_state" : "parse_inner_vlan_tag"
- },
- {
- "type" : "hexstr",
- "value" : "0x9100",
- "mask" : null,
- "next_state" : "parse_inner_vlan_tag"
- },
- {
"value" : "default",
"mask" : null,
"next_state" : null
@@ -1258,7 +1258,7 @@
"binding" : "FabricEgress.egress_next.egress_vlan",
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 309,
+ "line" : 310,
"column" : 50,
"source_fragment" : "egress_vlan_counter"
}
@@ -4235,7 +4235,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 312,
+ "line" : 313,
"column" : 8,
"source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.last_eth_type; ..."
}
@@ -4250,7 +4250,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 313,
+ "line" : 314,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -4340,7 +4340,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 334,
+ "line" : 335,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -4422,7 +4422,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -4471,7 +4471,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 366,
+ "line" : 367,
"column" : 12,
"source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
}
@@ -4493,7 +4493,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -4542,7 +4542,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 371,
"column" : 16,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -6451,7 +6451,7 @@
"id" : 39,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 334,
+ "line" : 335,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -6480,7 +6480,7 @@
"id" : 40,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 338,
+ "line" : 339,
"column" : 36,
"source_fragment" : "pop_mpls_if_present()"
},
@@ -6509,7 +6509,7 @@
"id" : 41,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 340,
+ "line" : 341,
"column" : 12,
"source_fragment" : "set_mpls()"
},
@@ -6538,7 +6538,7 @@
"id" : 42,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 317,
+ "line" : 318,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -6627,7 +6627,7 @@
"id" : 45,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 357,
+ "line" : 358,
"column" : 20,
"source_fragment" : "push_vlan()"
},
@@ -6656,7 +6656,7 @@
"id" : 46,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 366,
+ "line" : 367,
"column" : 25,
"source_fragment" : "="
},
@@ -6685,7 +6685,7 @@
"id" : 47,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -6714,7 +6714,7 @@
"id" : 48,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 371,
"column" : 29,
"source_fragment" : "="
},
@@ -6743,7 +6743,7 @@
"id" : 49,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -6863,7 +6863,7 @@
"id" : 22,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 332,
+ "line" : 333,
"column" : 12,
"source_fragment" : "fabric_metadata.is_multicast == true ..."
},
@@ -6916,7 +6916,7 @@
"id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 337,
+ "line" : 338,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_label == 0"
},
@@ -6942,7 +6942,7 @@
"id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 338,
+ "line" : 339,
"column" : 16,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -6965,7 +6965,7 @@
"id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 354,
+ "line" : 355,
"column" : 16,
"source_fragment" : "!egress_vlan.apply().hit"
},
@@ -6995,7 +6995,7 @@
"id" : 26,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 356,
+ "line" : 357,
"column" : 20,
"source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
},
@@ -7021,7 +7021,7 @@
"id" : 27,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 365,
+ "line" : 366,
"column" : 12,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -7044,7 +7044,7 @@
"id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 16,
"source_fragment" : "hdr.mpls.ttl == 0"
},
@@ -7070,7 +7070,7 @@
"id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 369,
+ "line" : 370,
"column" : 15,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -7093,7 +7093,7 @@
"id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl == 0"
},