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-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index f8bab98..7aa7642 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -562,6 +562,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"
@@ -625,18 +637,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
@@ -1330,7 +1330,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"
}
@@ -9491,7 +9491,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; ..."
}
@@ -9506,7 +9506,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 313,
+ "line" : 314,
"column" : 8,
"source_fragment" : "hdr.vlan_tag.setInvalid()"
}
@@ -9596,7 +9596,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 334,
+ "line" : 335,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9678,7 +9678,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9727,7 +9727,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 366,
+ "line" : 367,
"column" : 12,
"source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
}
@@ -9749,7 +9749,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
}
@@ -9798,7 +9798,7 @@
],
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 371,
"column" : 16,
"source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
}
@@ -11327,7 +11327,7 @@
"id" : 22,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 334,
+ "line" : 335,
"column" : 12,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -11356,7 +11356,7 @@
"id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 338,
+ "line" : 339,
"column" : 36,
"source_fragment" : "pop_mpls_if_present()"
},
@@ -11385,7 +11385,7 @@
"id" : 24,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 340,
+ "line" : 341,
"column" : 12,
"source_fragment" : "set_mpls()"
},
@@ -11414,7 +11414,7 @@
"id" : 25,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 317,
+ "line" : 318,
"column" : 10,
"source_fragment" : "egress_vlan"
},
@@ -11503,7 +11503,7 @@
"id" : 28,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 357,
+ "line" : 358,
"column" : 20,
"source_fragment" : "push_vlan()"
},
@@ -11532,7 +11532,7 @@
"id" : 29,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 366,
+ "line" : 367,
"column" : 25,
"source_fragment" : "="
},
@@ -11561,7 +11561,7 @@
"id" : 30,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 35,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -11590,7 +11590,7 @@
"id" : 31,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 370,
+ "line" : 371,
"column" : 29,
"source_fragment" : "="
},
@@ -11619,7 +11619,7 @@
"id" : 32,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 39,
"source_fragment" : "mark_to_drop(standard_metadata)"
},
@@ -12686,7 +12686,7 @@
"id" : 15,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 332,
+ "line" : 333,
"column" : 12,
"source_fragment" : "fabric_metadata.is_multicast == true ..."
},
@@ -12739,7 +12739,7 @@
"id" : 16,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 337,
+ "line" : 338,
"column" : 12,
"source_fragment" : "fabric_metadata.mpls_label == 0"
},
@@ -12765,7 +12765,7 @@
"id" : 17,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 338,
+ "line" : 339,
"column" : 16,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -12788,7 +12788,7 @@
"id" : 18,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 354,
+ "line" : 355,
"column" : 16,
"source_fragment" : "!egress_vlan.apply().hit"
},
@@ -12818,7 +12818,7 @@
"id" : 19,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 356,
+ "line" : 357,
"column" : 20,
"source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
},
@@ -12844,7 +12844,7 @@
"id" : 20,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 365,
+ "line" : 366,
"column" : 12,
"source_fragment" : "hdr.mpls.isValid()"
},
@@ -12867,7 +12867,7 @@
"id" : 21,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 367,
+ "line" : 368,
"column" : 16,
"source_fragment" : "hdr.mpls.ttl == 0"
},
@@ -12893,7 +12893,7 @@
"id" : 22,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 369,
+ "line" : 370,
"column" : 15,
"source_fragment" : "hdr.ipv4.isValid()"
},
@@ -12916,7 +12916,7 @@
"id" : 23,
"source_info" : {
"filename" : "include/control/next.p4",
- "line" : 371,
+ "line" : 372,
"column" : 20,
"source_fragment" : "hdr.ipv4.ttl == 0"
},