diff options
| author | Yuichi Ito <ito.yuichi0@gmail.com> | 2014-04-24 16:41:56 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-04-24 23:10:03 +0900 |
| commit | d1b9e371dbfd130cf6685046de287bfd79d8a164 (patch) | |
| tree | c661801049fbdc4d6f29c67ac714c78d8a386262 | |
| parent | 9c5e9288ccb1612246356130525611484c620dd5 (diff) | |
sw test tool: Modify lengths of pad fields for ARP
Wireshark may misunderstand a MAC frame (including ARP) whose length is 64 bytes or more, as a frame with the FCS field.
This patch fixes the issue by modifying lengths of pad fields for ARP.
Reported-by: Arne Goetje <arne_goetje@accton.com>
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
53 files changed, 352 insertions, 421 deletions
diff --git a/ryu/tests/switch/of13/action/00_OUTPUT.json b/ryu/tests/switch/of13/action/00_OUTPUT.json index 8f786682..65b4f6ff 100644 --- a/ryu/tests/switch/of13/action/00_OUTPUT.json +++ b/ryu/tests/switch/of13/action/00_OUTPUT.json @@ -109,12 +109,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json b/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json index f6658072..aca9fc80 100644 --- a/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json +++ b/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json @@ -164,13 +164,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=127)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json b/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json index 7c88f450..a55b4841 100644 --- a/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json +++ b/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json @@ -158,13 +158,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=63)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/17_PUSH_VLAN.json b/ryu/tests/switch/of13/action/17_PUSH_VLAN.json index 0af57611..b2e15feb 100644 --- a/ryu/tests/switch/of13/action/17_PUSH_VLAN.json +++ b/ryu/tests/switch/of13/action/17_PUSH_VLAN.json @@ -161,13 +161,13 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json b/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json index 62daffe3..dfc2d9af 100644 --- a/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json +++ b/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json @@ -166,14 +166,14 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(pcp=3, cfi=0, vid=100, ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/18_POP_VLAN.json b/ryu/tests/switch/of13/action/18_POP_VLAN.json index a9b8430d..0d89fe65 100644 --- a/ryu/tests/switch/of13/action/18_POP_VLAN.json +++ b/ryu/tests/switch/of13/action/18_POP_VLAN.json @@ -177,12 +177,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/19_PUSH_MPLS.json b/ryu/tests/switch/of13/action/19_PUSH_MPLS.json index 64b8028c..2eee31cb 100644 --- a/ryu/tests/switch/of13/action/19_PUSH_MPLS.json +++ b/ryu/tests/switch/of13/action/19_PUSH_MPLS.json @@ -161,13 +161,13 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(ttl=0)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json b/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json index 95910621..1d461e53 100644 --- a/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json +++ b/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json @@ -166,14 +166,14 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=0, label=100, exp=3, ttl=64)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/20_POP_MPLS.json b/ryu/tests/switch/of13/action/20_POP_MPLS.json index c8ec8752..0f9a1a68 100644 --- a/ryu/tests/switch/of13/action/20_POP_MPLS.json +++ b/ryu/tests/switch/of13/action/20_POP_MPLS.json @@ -162,12 +162,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/03_ETH_DST.json b/ryu/tests/switch/of13/action/25_SET_FIELD/03_ETH_DST.json index c193dd93..db9e3b51 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/03_ETH_DST.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/03_ETH_DST.json @@ -174,12 +174,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/04_ETH_SRC.json b/ryu/tests/switch/of13/action/25_SET_FIELD/04_ETH_SRC.json index bd77a138..56d34ac4 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/04_ETH_SRC.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/04_ETH_SRC.json @@ -174,12 +174,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/05_ETH_TYPE.json b/ryu/tests/switch/of13/action/25_SET_FIELD/05_ETH_TYPE.json index bdaca944..f88fda8c 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/05_ETH_TYPE.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/05_ETH_TYPE.json @@ -174,12 +174,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34888)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json b/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json index 389426e9..def62f9c 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/06_VLAN_VID.json @@ -179,13 +179,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json b/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json index 888503da..7b9bec81 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/07_VLAN_PCP.json @@ -197,13 +197,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/21_ARP_OP.json b/ryu/tests/switch/of13/action/25_SET_FIELD/21_ARP_OP.json index 823b1fad..fc6ce8a3 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/21_ARP_OP.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/21_ARP_OP.json @@ -56,12 +56,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=2, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -123,13 +123,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=2, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -227,12 +227,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=2, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -328,13 +328,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=2, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=2, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/22_ARP_SPA.json b/ryu/tests/switch/of13/action/25_SET_FIELD/22_ARP_SPA.json index 2dadd48f..1e7ae9dd 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/22_ARP_SPA.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/22_ARP_SPA.json @@ -56,12 +56,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='10.10.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -123,13 +123,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='10.10.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -227,12 +227,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='10.10.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -328,13 +328,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='10.10.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='10.10.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/23_ARP_TPA.json b/ryu/tests/switch/of13/action/25_SET_FIELD/23_ARP_TPA.json index 02133d0c..f7d09c95 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/23_ARP_TPA.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/23_ARP_TPA.json @@ -56,12 +56,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -123,13 +123,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -227,12 +227,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -328,13 +328,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/24_ARP_SHA.json b/ryu/tests/switch/of13/action/25_SET_FIELD/24_ARP_SHA.json index 7f5823df..97fc9c47 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/24_ARP_SHA.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/24_ARP_SHA.json @@ -56,12 +56,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -123,13 +123,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -227,12 +227,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -328,13 +328,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/25_ARP_THA.json b/ryu/tests/switch/of13/action/25_SET_FIELD/25_ARP_THA.json index f15d1a90..7c0dfc01 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/25_ARP_THA.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/25_ARP_THA.json @@ -56,12 +56,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -123,13 +123,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -227,12 +227,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -328,13 +328,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/34_MPLS_LABEL.json b/ryu/tests/switch/of13/action/25_SET_FIELD/34_MPLS_LABEL.json index c5c5184f..8f005821 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/34_MPLS_LABEL.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/34_MPLS_LABEL.json @@ -197,13 +197,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=203, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/35_MPLS_TC.json b/ryu/tests/switch/of13/action/25_SET_FIELD/35_MPLS_TC.json index f82dc305..2ed7a161 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/35_MPLS_TC.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/35_MPLS_TC.json @@ -197,13 +197,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=5, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/36_MPLS_BOS.json b/ryu/tests/switch/of13/action/25_SET_FIELD/36_MPLS_BOS.json index 344d5a0d..25e8233a 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/36_MPLS_BOS.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/36_MPLS_BOS.json @@ -197,13 +197,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=0, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/37_PBB_ISID.json b/ryu/tests/switch/of13/action/25_SET_FIELD/37_PBB_ISID.json index 5f680df8..92f19026 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/37_PBB_ISID.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/37_PBB_ISID.json @@ -216,8 +216,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", @@ -226,8 +225,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/38_TUNNEL_ID.json b/ryu/tests/switch/of13/action/25_SET_FIELD/38_TUNNEL_ID.json index d2559277..64e5fcbb 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/38_TUNNEL_ID.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/38_TUNNEL_ID.json @@ -267,12 +267,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/26_PUSH_PBB.json b/ryu/tests/switch/of13/action/26_PUSH_PBB.json index 9fa0e594..f98ab1b4 100644 --- a/ryu/tests/switch/of13/action/26_PUSH_PBB.json +++ b/ryu/tests/switch/of13/action/26_PUSH_PBB.json @@ -163,14 +163,14 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag()", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] diff --git a/ryu/tests/switch/of13/action/27_POP_PBB.json b/ryu/tests/switch/of13/action/27_POP_PBB.json index d856761b..5c545deb 100644 --- a/ryu/tests/switch/of13/action/27_POP_PBB.json +++ b/ryu/tests/switch/of13/action/27_POP_PBB.json @@ -168,15 +168,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] diff --git a/ryu/tests/switch/of13/match/00_IN_PORT.json b/ryu/tests/switch/of13/match/00_IN_PORT.json index 9eef9ffe..8c277c1f 100644 --- a/ryu/tests/switch/of13/match/00_IN_PORT.json +++ b/ryu/tests/switch/of13/match/00_IN_PORT.json @@ -348,12 +348,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -399,12 +399,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -449,7 +449,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/02_METADATA.json b/ryu/tests/switch/of13/match/02_METADATA.json index 30ce0763..766b9513 100644 --- a/ryu/tests/switch/of13/match/02_METADATA.json +++ b/ryu/tests/switch/of13/match/02_METADATA.json @@ -509,12 +509,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -583,12 +583,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -656,7 +656,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/02_METADATA_Mask.json b/ryu/tests/switch/of13/match/02_METADATA_Mask.json index 274bc308..3f6fedeb 100644 --- a/ryu/tests/switch/of13/match/02_METADATA_Mask.json +++ b/ryu/tests/switch/of13/match/02_METADATA_Mask.json @@ -516,12 +516,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -591,12 +591,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -665,7 +665,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/03_ETH_DST.json b/ryu/tests/switch/of13/match/03_ETH_DST.json index 84476157..6e898186 100644 --- a/ryu/tests/switch/of13/match/03_ETH_DST.json +++ b/ryu/tests/switch/of13/match/03_ETH_DST.json @@ -348,12 +348,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -399,12 +399,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -449,7 +449,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 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 d1957720..60f3d93f 100644 --- a/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json +++ b/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json @@ -355,12 +355,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -407,12 +407,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -458,7 +458,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/04_ETH_SRC.json b/ryu/tests/switch/of13/match/04_ETH_SRC.json index cf128ca0..7cfda44e 100644 --- a/ryu/tests/switch/of13/match/04_ETH_SRC.json +++ b/ryu/tests/switch/of13/match/04_ETH_SRC.json @@ -348,12 +348,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -399,12 +399,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -449,7 +449,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 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 dad2f1a3..d6e4847c 100644 --- a/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json @@ -355,12 +355,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -407,12 +407,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -458,7 +458,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/05_ETH_TYPE.json b/ryu/tests/switch/of13/match/05_ETH_TYPE.json index 8aa89ab0..9013b143 100644 --- a/ryu/tests/switch/of13/match/05_ETH_TYPE.json +++ b/ryu/tests/switch/of13/match/05_ETH_TYPE.json @@ -348,12 +348,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -399,12 +399,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -449,7 +449,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/06_VLAN_VID.json b/ryu/tests/switch/of13/match/06_VLAN_VID.json index 5ef10282..9c0ffd5e 100644 --- a/ryu/tests/switch/of13/match/06_VLAN_VID.json +++ b/ryu/tests/switch/of13/match/06_VLAN_VID.json @@ -359,13 +359,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -412,13 +412,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -464,7 +464,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json b/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json index 193afc7d..1fd7ba99 100644 --- a/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json +++ b/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json @@ -366,13 +366,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -420,13 +420,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -473,7 +473,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/07_VLAN_PCP.json b/ryu/tests/switch/of13/match/07_VLAN_PCP.json index 3cf79de0..4754cc40 100644 --- a/ryu/tests/switch/of13/match/07_VLAN_PCP.json +++ b/ryu/tests/switch/of13/match/07_VLAN_PCP.json @@ -408,13 +408,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -468,13 +468,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -527,7 +527,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/21_ARP_OP.json b/ryu/tests/switch/of13/match/21_ARP_OP.json index 61598718..880bf4b4 100644 --- a/ryu/tests/switch/of13/match/21_ARP_OP.json +++ b/ryu/tests/switch/of13/match/21_ARP_OP.json @@ -46,12 +46,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -103,12 +103,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -159,7 +159,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -214,13 +214,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -273,13 +273,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -331,7 +331,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -422,12 +422,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -516,12 +516,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -609,7 +609,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -698,13 +698,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -791,13 +789,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -883,8 +879,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/22_ARP_SPA.json b/ryu/tests/switch/of13/match/22_ARP_SPA.json index 5040f1cb..849b5dcf 100644 --- a/ryu/tests/switch/of13/match/22_ARP_SPA.json +++ b/ryu/tests/switch/of13/match/22_ARP_SPA.json @@ -46,12 +46,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -103,12 +103,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -159,7 +159,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -214,13 +214,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -273,13 +273,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -331,7 +331,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -422,12 +422,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -516,12 +516,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -609,7 +609,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -698,13 +698,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -791,13 +789,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -883,8 +879,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 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 8ff8d873..79f49cbe 100644 --- a/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json +++ b/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json @@ -47,12 +47,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -105,12 +105,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -162,7 +162,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -218,13 +218,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -278,13 +278,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -337,7 +337,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -429,12 +429,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -524,12 +524,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -618,7 +618,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -708,13 +708,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -802,13 +800,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -895,8 +891,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/23_ARP_TPA.json b/ryu/tests/switch/of13/match/23_ARP_TPA.json index b52c029c..c689c206 100644 --- a/ryu/tests/switch/of13/match/23_ARP_TPA.json +++ b/ryu/tests/switch/of13/match/23_ARP_TPA.json @@ -46,12 +46,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -103,12 +103,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -159,7 +159,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -214,13 +214,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -273,13 +273,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -331,7 +331,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -422,12 +422,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -516,12 +516,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -609,7 +609,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -698,13 +698,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -791,13 +789,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -883,8 +879,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 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 bbd758d2..1f9bc401 100644 --- a/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json +++ b/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json @@ -47,12 +47,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -105,12 +105,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -162,7 +162,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -218,13 +218,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -278,13 +278,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -337,7 +337,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -429,12 +429,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -524,12 +524,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -618,7 +618,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -708,13 +708,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -802,13 +800,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -895,8 +891,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/24_ARP_SHA.json b/ryu/tests/switch/of13/match/24_ARP_SHA.json index 637ec5e7..ccb7b117 100644 --- a/ryu/tests/switch/of13/match/24_ARP_SHA.json +++ b/ryu/tests/switch/of13/match/24_ARP_SHA.json @@ -46,12 +46,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -103,12 +103,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -159,7 +159,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -214,13 +214,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -273,13 +273,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -331,7 +331,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -422,12 +422,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -516,12 +516,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -609,7 +609,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -698,13 +698,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -791,13 +789,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -883,8 +879,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 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 5bfc3cde..9e16ac94 100644 --- a/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json +++ b/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json @@ -47,12 +47,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -105,12 +105,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -162,7 +162,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -218,13 +218,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -278,13 +278,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -337,7 +337,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -429,12 +429,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -524,12 +524,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -618,7 +618,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -708,13 +708,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -802,13 +800,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -895,8 +891,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/25_ARP_THA.json b/ryu/tests/switch/of13/match/25_ARP_THA.json index ee00d72f..6a86a853 100644 --- a/ryu/tests/switch/of13/match/25_ARP_THA.json +++ b/ryu/tests/switch/of13/match/25_ARP_THA.json @@ -46,12 +46,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -103,12 +103,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -159,7 +159,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -214,13 +214,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -273,13 +273,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -331,7 +331,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -422,12 +422,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -516,12 +516,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -609,7 +609,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -698,13 +698,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -791,13 +789,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -883,8 +879,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 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 cd00bd68..f6ba5087 100644 --- a/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json +++ b/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json @@ -47,12 +47,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -105,12 +105,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -162,7 +162,7 @@ "ingress":[ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 0 @@ -218,13 +218,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -278,13 +278,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -337,7 +337,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 @@ -429,12 +429,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -524,12 +524,12 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -618,7 +618,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 1 @@ -708,13 +708,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -802,13 +800,11 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=35047)", "itag(sid=100)", "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -895,8 +891,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/34_MPLS_LABEL.json b/ryu/tests/switch/of13/match/34_MPLS_LABEL.json index ee58c4f3..e78481f5 100644 --- a/ryu/tests/switch/of13/match/34_MPLS_LABEL.json +++ b/ryu/tests/switch/of13/match/34_MPLS_LABEL.json @@ -401,13 +401,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -460,13 +460,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -518,7 +518,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/35_MPLS_TC.json b/ryu/tests/switch/of13/match/35_MPLS_TC.json index 6cf4e214..1134faca 100644 --- a/ryu/tests/switch/of13/match/35_MPLS_TC.json +++ b/ryu/tests/switch/of13/match/35_MPLS_TC.json @@ -401,13 +401,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -460,13 +460,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -518,7 +518,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=1, label=203, exp=5, ttl=127)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/36_MPLS_BOS.json b/ryu/tests/switch/of13/match/36_MPLS_BOS.json index 123d22d6..4f238763 100644 --- a/ryu/tests/switch/of13/match/36_MPLS_BOS.json +++ b/ryu/tests/switch/of13/match/36_MPLS_BOS.json @@ -403,13 +403,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -462,13 +462,13 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 46))" ] } ] @@ -521,7 +521,7 @@ "mpls(bsb=0, label=203, exp=5, ttl=127)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 50))" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/37_PBB_ISID.json b/ryu/tests/switch/of13/match/37_PBB_ISID.json index de345d10..fd139813 100644 --- a/ryu/tests/switch/of13/match/37_PBB_ISID.json +++ b/ryu/tests/switch/of13/match/37_PBB_ISID.json @@ -444,8 +444,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", @@ -454,8 +453,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -511,8 +509,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", @@ -521,8 +518,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -577,8 +573,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json b/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json index c8d8f151..09389075 100644 --- a/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json +++ b/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json @@ -451,8 +451,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", @@ -461,8 +460,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -519,8 +517,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", @@ -529,8 +526,7 @@ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=3, cfi=0, vid=100, ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')" ] } ] @@ -586,8 +582,7 @@ "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=33024, vid=10)", "vlan(pcp=5, cfi=0, vid=203, ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "arp(dst_ip='10.10.20.20',dst_mac='ba:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')" ], "table-miss":[ 0 diff --git a/ryu/tests/switch/of13/match/38_TUNNEL_ID.json b/ryu/tests/switch/of13/match/38_TUNNEL_ID.json index 42b16f9c..1460a300 100644 --- a/ryu/tests/switch/of13/match/38_TUNNEL_ID.json +++ b/ryu/tests/switch/of13/match/38_TUNNEL_ID.json @@ -635,12 +635,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -727,12 +727,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -818,7 +818,7 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 1 diff --git a/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json b/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json index d5538d81..161be1b7 100644 --- a/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json +++ b/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json @@ -642,12 +642,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "egress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -735,12 +735,12 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "PACKET_IN":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ] } ] @@ -827,7 +827,7 @@ "ingress":[ "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", - "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" + "str(\"\\x00\" * (60 - 42))" ], "table-miss":[ 1 |