summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYuichi Ito <ito.yuichi0@gmail.com>2014-06-09 13:37:01 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-06-10 21:12:59 +0900
commit93c7c1e06452f7ebf0f5e77cb719fbc3672e6fc5 (patch)
tree9fc343be9cd5430dcfd4cce8812a7540be1811fe
parentae69bf231ec31706dd83f39fdb511515b7417e04 (diff)
sw test tool: Improve readability of MAC mask values
1099511627775 -> "00:ff:ff:ff:ff:ff" 281474976710400 -> "ff:ff:ff:ff:ff:00" 281474959998975 -> "ff:ff:ff:00:ff:ff" 281470698520575 -> "ff:ff:00:ff:ff:ff" Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/switch/of13/match/03_ETH_DST_Mask.json36
-rw-r--r--ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json36
-rw-r--r--ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json48
-rw-r--r--ryu/tests/switch/of13/match/25_ARP_THA_Mask.json48
4 files changed, 84 insertions, 84 deletions
diff --git a/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json b/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json
index d795ee7a..075c733d 100644
--- a/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json
+++ b/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json
@@ -1,7 +1,7 @@
[
"match: 03_ETH_DST (Mask)",
{
- "description":"ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -12,7 +12,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -54,7 +54,7 @@
]
},
{
- "description":"ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:CONTROLLER'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -65,7 +65,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -108,7 +108,7 @@
]
},
{
- "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -119,7 +119,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -158,7 +158,7 @@
]
},
{
- "description":"ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -169,7 +169,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -211,7 +211,7 @@
]
},
{
- "description":"ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:CONTROLLER'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -222,7 +222,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -265,7 +265,7 @@
]
},
{
- "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -276,7 +276,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -315,7 +315,7 @@
]
},
{
- "description":"ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -326,7 +326,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -366,7 +366,7 @@
]
},
{
- "description":"ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:CONTROLLER'",
+ "description":"ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -377,7 +377,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
@@ -418,7 +418,7 @@
]
},
{
- "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'",
+ "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:00(mask=ff:ff:ff:ff:ff:00),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -429,7 +429,7 @@
{
"OXMTlv":{
"field":"eth_dst",
- "mask":281474976710400,
+ "mask":"ff:ff:ff:ff:ff:00",
"value":"22:22:22:22:22:00"
}
}
diff --git a/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json b/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json
index 2c4e8e53..8794aa09 100644
--- a/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json
+++ b/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json
@@ -1,7 +1,7 @@
[
"match: 04_ETH_SRC (Mask)",
{
- "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -12,7 +12,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -54,7 +54,7 @@
]
},
{
- "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'",
+ "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -65,7 +65,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -108,7 +108,7 @@
]
},
{
- "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -119,7 +119,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -158,7 +158,7 @@
]
},
{
- "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -169,7 +169,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -211,7 +211,7 @@
]
},
{
- "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'",
+ "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -222,7 +222,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -265,7 +265,7 @@
]
},
{
- "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -276,7 +276,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -315,7 +315,7 @@
]
},
{
- "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -326,7 +326,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -366,7 +366,7 @@
]
},
{
- "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'",
+ "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -377,7 +377,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
@@ -418,7 +418,7 @@
]
},
{
- "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'",
+ "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/arp-->'eth_src=00:11:11:11:11:11(mask=00:ff:ff:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -429,7 +429,7 @@
{
"OXMTlv":{
"field":"eth_src",
- "mask":1099511627775,
+ "mask":"00:ff:ff:ff:ff:ff",
"value":"00:11:11:11:11:11"
}
}
diff --git a/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json b/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json
index 93e44746..d0a6fe79 100644
--- a/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json
+++ b/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json
@@ -1,7 +1,7 @@
[
"match: 24_ARP_SHA (Mask)",
{
- "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -18,7 +18,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -58,7 +58,7 @@
]
},
{
- "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'",
+ "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -75,7 +75,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -116,7 +116,7 @@
]
},
{
- "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -133,7 +133,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -171,7 +171,7 @@
]
},
{
- "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -188,7 +188,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -230,7 +230,7 @@
]
},
{
- "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'",
+ "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -247,7 +247,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -290,7 +290,7 @@
]
},
{
- "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -307,7 +307,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -346,7 +346,7 @@
]
},
{
- "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -399,7 +399,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -440,7 +440,7 @@
]
},
{
- "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'",
+ "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -493,7 +493,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -535,7 +535,7 @@
]
},
{
- "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -588,7 +588,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -627,7 +627,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -678,7 +678,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -720,7 +720,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'",
+ "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -771,7 +771,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
@@ -814,7 +814,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'",
+ "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=ff:ff:ff:00:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -865,7 +865,7 @@
{
"OXMTlv":{
"field":"arp_sha",
- "mask":281474959998975,
+ "mask":"ff:ff:ff:00:ff:ff",
"value":"12:11:11:00:11:11"
}
}
diff --git a/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json b/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json
index 38bde5f1..74712cfd 100644
--- a/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json
+++ b/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json
@@ -1,7 +1,7 @@
[
"match: 25_ARP_THA (Mask)",
{
- "description":"ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -18,7 +18,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -58,7 +58,7 @@
]
},
{
- "description":"ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:CONTROLLER'",
+ "description":"ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -75,7 +75,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -116,7 +116,7 @@
]
},
{
- "description":"ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -133,7 +133,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -171,7 +171,7 @@
]
},
{
- "description":"ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -188,7 +188,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -230,7 +230,7 @@
]
},
{
- "description":"ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:CONTROLLER'",
+ "description":"ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -247,7 +247,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -290,7 +290,7 @@
]
},
{
- "description":"ethernet/vlan/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/vlan/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -307,7 +307,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -346,7 +346,7 @@
]
},
{
- "description":"ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -399,7 +399,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -440,7 +440,7 @@
]
},
{
- "description":"ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:CONTROLLER'",
+ "description":"ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -493,7 +493,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -535,7 +535,7 @@
]
},
{
- "description":"ethernet/mpls/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/mpls/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -588,7 +588,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -627,7 +627,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -678,7 +678,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -720,7 +720,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:CONTROLLER'",
+ "description":"ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:CONTROLLER'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -771,7 +771,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}
@@ -814,7 +814,7 @@
]
},
{
- "description":"ethernet/itag/ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'",
+ "description":"ethernet/itag/ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=ff:ff:00:ff:ff:ff),actions=output:2'",
"prerequisite":[
{
"OFPFlowMod":{
@@ -865,7 +865,7 @@
{
"OXMTlv":{
"field":"arp_tha",
- "mask":281470698520575,
+ "mask":"ff:ff:00:ff:ff:ff",
"value":"22:22:00:22:22:22"
}
}