From f3f784e01bfb53dab7ee7c9a99ea7a8e1c049ac3 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 21 Feb 2014 15:26:55 +0900 Subject: [PATCH] sw test tool: fix pop_pbb action "The Pop PBB header action does not remove the backbone VLAN header (B-TAG)" as described in openflow spec 1.3.3. The format of I-TAG TCI is pcp,..,I-SID,C-DA,C-SA as in 802.1Q-2011 Figure 9-3. Change the test senario, converting from B-MAC/I-TAG/S-TAG/C-TAG/ethertype/Data to C-MAC/S-TAG/C-TAG/ethertype/Data looks more common. Reported-by: Hiroaki KAWAI Signed-off-by: FUJITA Tomonori --- ryu/tests/switch/of13/action/27_POP_PBB.json | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ryu/tests/switch/of13/action/27_POP_PBB.json b/ryu/tests/switch/of13/action/27_POP_PBB.json index 821d3c92..14216c1a 100644 --- a/ryu/tests/switch/of13/action/27_POP_PBB.json +++ b/ryu/tests/switch/of13/action/27_POP_PBB.json @@ -1,7 +1,7 @@ [ "action: 27_POP_PBB", { - "description": "ethernet/svlan/itag/ethernet/svlan/vlan/ipv4/tcp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", + "description": "ethernet/itag/ethernet/svlan/vlan/ipv4/tcp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -41,8 +41,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", - "svlan(ethertype=35047, vid=10)", + "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", @@ -63,7 +62,7 @@ ] }, { - "description": "ethernet/svlan/itag/ethernet/svlan/vlan/ipv6/tcp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", + "description": "ethernet/itag/ethernet/svlan/vlan/ipv6/tcp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -103,8 +102,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", - "svlan(ethertype=35047, vid=10)", + "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", @@ -125,7 +123,7 @@ ] }, { - "description": "ethernet/svlan/itag/ethernet/svlan/vlan/arp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", + "description": "ethernet/itag/ethernet/svlan/vlan/arp-->'eth_type=0x88e7,actions=pop_pbb,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -165,8 +163,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", - "svlan(ethertype=35047, vid=10)", + "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)",