From 6b9cfd36742398717de7c41b61ef4daa5484f4ab Mon Sep 17 00:00:00 2001 From: Yuichi Ito Date: Mon, 9 Jun 2014 13:37:40 +0900 Subject: [PATCH] sw test tool: Improve readability of IP mask values 4294967040 -> "255.255.255.0" 4294902015 -> "255.255.0.255" 340282366920938463463374607431768145920 -> "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0" 5192296858534827628530496329220095 -> "0:ffff:ffff:ffff:ffff:ffff:ffff:ffff" Signed-off-by: Yuichi Ito Signed-off-by: FUJITA Tomonori --- .../switch/of13/match/11_IPV4_SRC_Mask.json | 48 +++++++++---------- .../switch/of13/match/12_IPV4_DST_Mask.json | 48 +++++++++---------- .../switch/of13/match/22_ARP_SPA_Mask.json | 48 +++++++++---------- .../switch/of13/match/23_ARP_TPA_Mask.json | 48 +++++++++---------- .../switch/of13/match/26_IPV6_SRC_Mask.json | 48 +++++++++---------- .../switch/of13/match/27_IPV6_DST_Mask.json | 48 +++++++++---------- 6 files changed, 144 insertions(+), 144 deletions(-) diff --git a/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json b/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json index 48ce171d..63c3c6fe 100644 --- a/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json @@ -1,7 +1,7 @@ [ "match: 11_IPV4_SRC (Mask)", { - "description":"ethernet/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -60,7 +60,7 @@ ] }, { - "description":"ethernet/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -77,7 +77,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -120,7 +120,7 @@ ] }, { - "description":"ethernet/ipv4(src='10.10.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/ipv4(src='10.10.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -137,7 +137,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -176,7 +176,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/vlan/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -193,7 +193,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -237,7 +237,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv4(src='192.168.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -254,7 +254,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -299,7 +299,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(src='10.10.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/vlan/ipv4(src='10.10.10.10')/tcp-->'ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -316,7 +316,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -356,7 +356,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(src='192.168.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/mpls/ipv4(src='192.168.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -409,7 +409,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -452,7 +452,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(src='192.168.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv4(src='192.168.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -505,7 +505,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -549,7 +549,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(src='10.10.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/mpls/ipv4(src='10.10.10.10')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -602,7 +602,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -642,7 +642,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(src='192.168.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv4(src='192.168.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -693,7 +693,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -737,7 +737,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(src='192.168.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv4(src='192.168.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -788,7 +788,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -833,7 +833,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(src='10.10.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv4(src='10.10.10.10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_src=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -884,7 +884,7 @@ { "OXMTlv":{ "field":"ipv4_src", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } diff --git a/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json b/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json index 61fa1c6c..c0841b0e 100644 --- a/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json +++ b/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json @@ -2,7 +2,7 @@ [ "match: 12_IPV4_DST (Mask)", { - "description":"ethernet/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -19,7 +19,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -61,7 +61,7 @@ ] }, { - "description":"ethernet/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -78,7 +78,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -121,7 +121,7 @@ ] }, { - "description":"ethernet/ipv4(dst='10.10.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/ipv4(dst='10.10.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -138,7 +138,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -177,7 +177,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/vlan/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -194,7 +194,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -238,7 +238,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv4(dst='192.168.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -255,7 +255,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -300,7 +300,7 @@ ] }, { - "description":"ethernet/vlan/ipv4(dst='10.10.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/vlan/ipv4(dst='10.10.20.20')/tcp-->'ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -317,7 +317,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -357,7 +357,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/mpls/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -410,7 +410,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -453,7 +453,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -506,7 +506,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -550,7 +550,7 @@ ] }, { - "description":"ethernet/mpls/ipv4(dst='10.10.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/mpls/ipv4(dst='10.10.20.20')/tcp-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -603,7 +603,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -643,7 +643,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -694,7 +694,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -738,7 +738,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv4(dst='192.168.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -789,7 +789,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -834,7 +834,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv4(dst='10.10.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv4(dst='10.10.20.20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv4_dst=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -885,7 +885,7 @@ { "OXMTlv":{ "field":"ipv4_dst", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } diff --git a/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json b/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json index 7df99cbb..93cef596 100644 --- a/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json +++ b/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json @@ -1,7 +1,7 @@ [ "match: 22_ARP_SPA (Mask)", { - "description":"ethernet/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -58,7 +58,7 @@ ] }, { - "description":"ethernet/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -75,7 +75,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -116,7 +116,7 @@ ] }, { - "description":"ethernet/arp(src_ip='10.10.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/arp(src_ip='10.10.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -133,7 +133,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -171,7 +171,7 @@ ] }, { - "description":"ethernet/vlan/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/vlan/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -188,7 +188,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -230,7 +230,7 @@ ] }, { - "description":"ethernet/vlan/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/vlan/arp(src_ip='192.168.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -247,7 +247,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -290,7 +290,7 @@ ] }, { - "description":"ethernet/vlan/arp(src_ip='10.10.10.10')-->'arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/vlan/arp(src_ip='10.10.10.10')-->'arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -307,7 +307,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -346,7 +346,7 @@ ] }, { - "description":"ethernet/mpls/arp(src_ip='192.168.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/mpls/arp(src_ip='192.168.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -399,7 +399,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -440,7 +440,7 @@ ] }, { - "description":"ethernet/mpls/arp(src_ip='192.168.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/mpls/arp(src_ip='192.168.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -493,7 +493,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -535,7 +535,7 @@ ] }, { - "description":"ethernet/mpls/arp(src_ip='10.10.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/mpls/arp(src_ip='10.10.10.10')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -588,7 +588,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -627,7 +627,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(src_ip='192.168.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_ip='192.168.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -678,7 +678,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -720,7 +720,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(src_ip='192.168.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/arp(src_ip='192.168.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -771,7 +771,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } @@ -814,7 +814,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(src_ip='10.10.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=0xffffff00),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_ip='10.10.10.10')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_spa=192.168.10.0(mask=255.255.255.0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -865,7 +865,7 @@ { "OXMTlv":{ "field":"arp_spa", - "mask":4294967040, + "mask":"255.255.255.0", "value":"192.168.10.0" } } diff --git a/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json b/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json index 12a55382..2bb6693e 100644 --- a/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json +++ b/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json @@ -1,7 +1,7 @@ [ "match: 23_ARP_TPA (Mask)", { - "description":"ethernet/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -58,7 +58,7 @@ ] }, { - "description":"ethernet/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -75,7 +75,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -116,7 +116,7 @@ ] }, { - "description":"ethernet/arp(dst_ip='10.10.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/arp(dst_ip='10.10.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -133,7 +133,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -171,7 +171,7 @@ ] }, { - "description":"ethernet/vlan/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/vlan/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -188,7 +188,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -230,7 +230,7 @@ ] }, { - "description":"ethernet/vlan/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/vlan/arp(dst_ip='192.168.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -247,7 +247,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -290,7 +290,7 @@ ] }, { - "description":"ethernet/vlan/arp(dst_ip='10.10.20.20')-->'arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/vlan/arp(dst_ip='10.10.20.20')-->'arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -307,7 +307,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -346,7 +346,7 @@ ] }, { - "description":"ethernet/mpls/arp(dst_ip='192.168.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/mpls/arp(dst_ip='192.168.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -399,7 +399,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -440,7 +440,7 @@ ] }, { - "description":"ethernet/mpls/arp(dst_ip='192.168.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/mpls/arp(dst_ip='192.168.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -493,7 +493,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -535,7 +535,7 @@ ] }, { - "description":"ethernet/mpls/arp(dst_ip='10.10.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/mpls/arp(dst_ip='10.10.20.20')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -588,7 +588,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -627,7 +627,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(dst_ip='192.168.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(dst_ip='192.168.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -678,7 +678,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -720,7 +720,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(dst_ip='192.168.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/arp(dst_ip='192.168.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -771,7 +771,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } @@ -814,7 +814,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(dst_ip='10.10.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=0xffff00ff),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(dst_ip='10.10.20.20')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tpa=192.168.0.20(mask=255.255.0.255),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -865,7 +865,7 @@ { "OXMTlv":{ "field":"arp_tpa", - "mask":4294902015, + "mask":"255.255.0.255", "value":"192.168.0.20" } } diff --git a/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json b/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json index 3d3df8ac..6aff5b83 100644 --- a/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json @@ -1,7 +1,7 @@ [ "match: 26_IPV6_SRC (Mask)", { - "description":"ethernet/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -60,7 +60,7 @@ ] }, { - "description":"ethernet/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:CONTROLLER'", + "description":"ethernet/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -77,7 +77,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -120,7 +120,7 @@ ] }, { - "description":"ethernet/ipv6(src='a0::a0')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/ipv6(src='a0::a0')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -137,7 +137,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -176,7 +176,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/vlan/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -193,7 +193,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -237,7 +237,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv6(src='10::10')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -254,7 +254,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -299,7 +299,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(src='a0::a0')/tcp-->'ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/vlan/ipv6(src='a0::a0')/tcp-->'ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -316,7 +316,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -356,7 +356,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(src='10::10')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/mpls/ipv6(src='10::10')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -409,7 +409,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -452,7 +452,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(src='10::10')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv6(src='10::10')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -505,7 +505,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -549,7 +549,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(src='a0::a0')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/mpls/ipv6(src='a0::a0')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -602,7 +602,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -642,7 +642,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(src='10::10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6(src='10::10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -693,7 +693,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -737,7 +737,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(src='10::10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv6(src='10::10')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -788,7 +788,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } @@ -833,7 +833,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(src='a0::a0')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=0xffffffffffffffffffffffffffff0000),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6(src='a0::a0')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_src=10::0(mask=ffff:ffff:ffff:ffff:ffff:ffff:ffff:0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -884,7 +884,7 @@ { "OXMTlv":{ "field":"ipv6_src", - "mask":340282366920938463463374607431768145920, + "mask":"ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", "value":"10::0" } } diff --git a/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json b/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json index 53f43f09..34a9ec8b 100644 --- a/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json +++ b/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json @@ -1,7 +1,7 @@ [ "match: 27_IPV6_DST (Mask)", { - "description":"ethernet/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -60,7 +60,7 @@ ] }, { - "description":"ethernet/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:CONTROLLER'", + "description":"ethernet/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -77,7 +77,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -120,7 +120,7 @@ ] }, { - "description":"ethernet/ipv6(dst='b0::b0')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/ipv6(dst='b0::b0')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -137,7 +137,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -176,7 +176,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/vlan/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -193,7 +193,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -237,7 +237,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv6(dst='20::20')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -254,7 +254,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -299,7 +299,7 @@ ] }, { - "description":"ethernet/vlan/ipv6(dst='b0::b0')/tcp-->'ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/vlan/ipv6(dst='b0::b0')/tcp-->'ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -316,7 +316,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -356,7 +356,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(dst='20::20')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/mpls/ipv6(dst='20::20')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -409,7 +409,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -452,7 +452,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(dst='20::20')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv6(dst='20::20')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -505,7 +505,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -549,7 +549,7 @@ ] }, { - "description":"ethernet/mpls/ipv6(dst='b0::b0')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/mpls/ipv6(dst='b0::b0')/tcp-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -602,7 +602,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -642,7 +642,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(dst='20::20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6(dst='20::20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -693,7 +693,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -737,7 +737,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(dst='20::20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv6(dst='20::20')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -788,7 +788,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } } @@ -833,7 +833,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6(dst='b0::b0')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0x0000ffffffffffffffffffffffffffff),actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6(dst='b0::b0')/tcp-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_dst=0::20(mask=0:ffff:ffff:ffff:ffff:ffff:ffff:ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -884,7 +884,7 @@ { "OXMTlv":{ "field":"ipv6_dst", - "mask":5192296858534827628530496329220095, + "mask":"0:ffff:ffff:ffff:ffff:ffff:ffff:ffff", "value":"0::20" } }