diff options
author | Yuichi Ito <ito.yuichi0@gmail.com> | 2014-04-24 10:45:08 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-04-24 23:09:34 +0900 |
commit | 0f8407a9ce96e0f07f9660dd1e4e99e3dd2ec580 (patch) | |
tree | 87e460e4d20c0bcc312582d5684f904b0d845a9e | |
parent | 4a38237357beffbde391975fa6c3b1167e03bc00 (diff) |
sw test tool: Fix MAC addresses used in tests
IEEE 802.3-2012 (3.2.3 Address fields) says:
b) The first bit (LSB) shall be used in the Destination Address field as an address type designation bit
to identify the Destination Address either as an individual or as a group address. If this bit is 0, it
shall indicate that the address field contains an individual address. If this bit is 1, it shall indicate that
the address field contains a group address that identifies none, one or more, or all of the stations
connected to the LAN. In the Source Address field, the first bit is reserved and set to 0.
c) The second bit shall be used to distinguish between locally or globally administered addresses. For
globally administered (or U, universal) addresses, the bit is set to 0. If an address is to be assigned
locally, this bit shall be set to 1. Note that for the broadcast address, this bit is also a 1.
This patch fixes MAC addresses used in tests as follows:
- set the first bit to 0
- set the second bit to 1
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>
138 files changed, 2481 insertions, 2481 deletions
diff --git a/ryu/tests/switch/of13/action/00_OUTPUT.json b/ryu/tests/switch/of13/action/00_OUTPUT.json index abd30c02..8f786682 100644 --- a/ryu/tests/switch/of13/action/00_OUTPUT.json +++ b/ryu/tests/switch/of13/action/00_OUTPUT.json @@ -26,13 +26,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -67,13 +67,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -107,13 +107,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/11_COPY_TTL_OUT.json b/ryu/tests/switch/of13/action/11_COPY_TTL_OUT.json index 5d9c8c62..9783ddbb 100644 --- a/ryu/tests/switch/of13/action/11_COPY_TTL_OUT.json +++ b/ryu/tests/switch/of13/action/11_COPY_TTL_OUT.json @@ -41,14 +41,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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=32)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -98,14 +98,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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=32)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", diff --git a/ryu/tests/switch/of13/action/12_COPY_TTL_IN.json b/ryu/tests/switch/of13/action/12_COPY_TTL_IN.json index 0de32fa5..f9f0b583 100644 --- a/ryu/tests/switch/of13/action/12_COPY_TTL_IN.json +++ b/ryu/tests/switch/of13/action/12_COPY_TTL_IN.json @@ -41,14 +41,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -98,14 +98,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", 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 2c9ab8f5..f6658072 100644 --- a/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json +++ b/ryu/tests/switch/of13/action/15_SET_MPLS_TTL.json @@ -43,14 +43,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -102,14 +102,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -161,15 +161,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 87a156d8..7c88f450 100644 --- a/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json +++ b/ryu/tests/switch/of13/action/16_DEC_MPLS_TTL.json @@ -41,14 +41,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -98,14 +98,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -155,15 +155,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } diff --git a/ryu/tests/switch/of13/action/17_PUSH_VLAN.json b/ryu/tests/switch/of13/action/17_PUSH_VLAN.json index 0c431a1c..0af57611 100644 --- a/ryu/tests/switch/of13/action/17_PUSH_VLAN.json +++ b/ryu/tests/switch/of13/action/17_PUSH_VLAN.json @@ -43,13 +43,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -101,13 +101,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=33024)", "vlan(ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -159,14 +159,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 c8687bea..62daffe3 100644 --- a/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json +++ b/ryu/tests/switch/of13/action/17_PUSH_VLAN_multiple.json @@ -43,14 +43,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -103,14 +103,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -163,16 +163,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } diff --git a/ryu/tests/switch/of13/action/18_POP_VLAN.json b/ryu/tests/switch/of13/action/18_POP_VLAN.json index 721d36e5..a9b8430d 100644 --- a/ryu/tests/switch/of13/action/18_POP_VLAN.json +++ b/ryu/tests/switch/of13/action/18_POP_VLAN.json @@ -48,14 +48,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -111,14 +111,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -174,14 +174,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/19_PUSH_MPLS.json b/ryu/tests/switch/of13/action/19_PUSH_MPLS.json index dfa06ec2..64b8028c 100644 --- a/ryu/tests/switch/of13/action/19_PUSH_MPLS.json +++ b/ryu/tests/switch/of13/action/19_PUSH_MPLS.json @@ -43,13 +43,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(ttl=64)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -101,13 +101,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34887)", "mpls(ttl=64)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -159,14 +159,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 1ccac325..95910621 100644 --- a/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json +++ b/ryu/tests/switch/of13/action/19_PUSH_MPLS_multiple.json @@ -43,14 +43,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -103,14 +103,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -163,16 +163,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } diff --git a/ryu/tests/switch/of13/action/20_POP_MPLS.json b/ryu/tests/switch/of13/action/20_POP_MPLS.json index c60bd5f9..c8ec8752 100644 --- a/ryu/tests/switch/of13/action/20_POP_MPLS.json +++ b/ryu/tests/switch/of13/action/20_POP_MPLS.json @@ -43,14 +43,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -101,14 +101,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -159,14 +159,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv4.json b/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv4.json index fdd4ef3d..7a540e4a 100644 --- a/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv4.json +++ b/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv4.json @@ -43,13 +43,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -100,14 +100,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -195,14 +195,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -287,15 +287,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv6.json b/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv6.json index a9a89fd3..dd0bfd37 100644 --- a/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv6.json +++ b/ryu/tests/switch/of13/action/23_SET_NW_TTL_IPv6.json @@ -43,13 +43,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -100,14 +100,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -195,14 +195,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -287,15 +287,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=32, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv4.json b/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv4.json index 8dbea903..28d4ef58 100644 --- a/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv4.json +++ b/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv4.json @@ -41,13 +41,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=63)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -96,14 +96,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=63)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -189,14 +189,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=63)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -279,15 +279,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=63)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv6.json b/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv6.json index aceca3b3..86650270 100644 --- a/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv6.json +++ b/ryu/tests/switch/of13/action/24_DEC_NW_TTL_IPv6.json @@ -41,13 +41,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=63, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -96,14 +96,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=63, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -189,14 +189,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=63, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -279,15 +279,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=63, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" 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 ca13af94..c193dd93 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 @@ -1,7 +1,7 @@ [ "action: set_field: 03_ETH_DST", { - "description": "ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_dst,output:2'", + "description": "ethernet(dst='22:22:22:22:22:22')/ipv4/tcp-->'eth_dst=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->eth_dst,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -27,7 +27,7 @@ "field":{ "OXMTlv":{ "field":"eth_dst", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -48,13 +48,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -63,7 +63,7 @@ ] }, { - "description": "ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_dst,output:2'", + "description": "ethernet(dst='22:22:22:22:22:22')/ipv6/tcp-->'eth_dst=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->eth_dst,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -89,7 +89,7 @@ "field":{ "OXMTlv":{ "field":"eth_dst", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -110,13 +110,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -125,7 +125,7 @@ ] }, { - "description": "ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_dst,output:2'", + "description": "ethernet(dst='22:22:22:22:22:22')/arp-->'eth_dst=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->eth_dst,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -151,7 +151,7 @@ "field":{ "OXMTlv":{ "field":"eth_dst", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -172,13 +172,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='11: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='11:11:11:11:11:11')", + "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'" ] } 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 80459947..bd77a138 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 @@ -1,7 +1,7 @@ [ "action: set_field: 04_ETH_SRC", { - "description": "ethernet(src='22:22:22:22:22:22')/ipv4/tcp-->'eth_src=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_src,output:2'", + "description": "ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->eth_src,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -12,7 +12,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -48,7 +48,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -63,7 +63,7 @@ ] }, { - "description": "ethernet(src='22:22:22:22:22:22')/ipv6/tcp-->'eth_src=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_src,output:2'", + "description": "ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->eth_src,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -74,7 +74,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -110,7 +110,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -125,7 +125,7 @@ ] }, { - "description": "ethernet(src='22:22:22:22:22:22')/arp-->'eth_src=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->eth_src,output:2'", + "description": "ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->eth_src,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -136,7 +136,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -172,13 +172,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 53260f22..bdaca944 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 @@ -48,13 +48,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34888)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34888)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -110,13 +110,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34888)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34888)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -172,13 +172,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } 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 284c271d..389426e9 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 @@ -48,14 +48,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -112,14 +112,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -176,15 +176,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 61709c66..888503da 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 @@ -54,14 +54,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -124,14 +124,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -194,15 +194,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv4.json index 77e0e16a..a4bf2bfd 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv4.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=64, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=64, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=64, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=64, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv6.json index 2af20ad0..46ec48a4 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/08_IP_DSCP_IPv6.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv4.json index 9165e02b..68ccb592 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv4.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=33, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=33, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=33, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=33, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv6.json index 8526d13b..5b9e48f3 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/09_IP_ECN_IPv6.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=33)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=33)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=33)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=33)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv4.json index 538b5c7d..9d885168 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv4.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv6.json index b306f8d7..466ed507 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/10_IP_PROTO_IPv6.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/11_IPV4_SRC.json b/ryu/tests/switch/of13/action/25_SET_FIELD/11_IPV4_SRC.json index 61ce4cd2..a9e1d71e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/11_IPV4_SRC.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/11_IPV4_SRC.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='10.10.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='10.10.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='10.10.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='10.10.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/12_IPV4_DST.json b/ryu/tests/switch/of13/action/25_SET_FIELD/12_IPV4_DST.json index 391b0704..9c084ae9 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/12_IPV4_DST.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/12_IPV4_DST.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='10.10.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='10.10.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='10.10.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='10.10.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv4.json index 77f510df..f6cb679e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv4.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv6.json index 7e6ffdc1..4863f9b5 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/13_TCP_SRC_IPv6.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv4.json index 4802d39c..0f954ef8 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv4.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv6.json index 8d7f74fd..fc8704ba 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/14_TCP_DST_IPv6.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=6789, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv4.json index fb8533f3..7a654351 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv4.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=12345)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv6.json index bfe40f2c..183c958e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/15_UDP_SRC_IPv6.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=12345)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv4.json index f81bf579..3aec5174 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv4.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=6789, src_port=11111)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv6.json index a5b1ffc6..1d11978d 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/16_UDP_DST_IPv6.json @@ -60,13 +60,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -134,14 +134,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=6789, src_port=11111)", @@ -246,14 +246,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -355,15 +355,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=6789, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv4.json index 2d845ae4..0875888f 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv4.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv6.json index a5fa71d4..7b0f9a7e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/17_SCTP_SRC_IPv6.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=12345)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv4.json b/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv4.json index c6881d98..50a7d4c6 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv4.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv4.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv6.json b/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv6.json index 55443b48..8716f57c 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv6.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/18_SCTP_DST_IPv6.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=6789, src_port=11111)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/19_ICMPV4_TYPE.json b/ryu/tests/switch/of13/action/25_SET_FIELD/19_ICMPV4_TYPE.json index 74dc184f..469716a6 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/19_ICMPV4_TYPE.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/19_ICMPV4_TYPE.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=0)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=0)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=0)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=0)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/20_ICMPV4_CODE.json b/ryu/tests/switch/of13/action/25_SET_FIELD/20_ICMPV4_CODE.json index 7cfa2388..3b525e0e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/20_ICMPV4_CODE.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/20_ICMPV4_CODE.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=10,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=10,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=10,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=10,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] 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 0e854a04..823b1fad 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 @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -120,15 +120,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "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'" ] } @@ -224,14 +224,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -325,15 +325,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } 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 9457c29e..2dadd48f 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 @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -120,15 +120,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "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'" ] } @@ -224,14 +224,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -325,15 +325,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } 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 2a5bcc13..02133d0c 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 @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -120,15 +120,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "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'" ] } @@ -224,14 +224,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -325,15 +325,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } 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 0af4ed37..7f5823df 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 @@ -1,7 +1,7 @@ [ "action: set_field: 24_ARP_SHA", { - "description": "ethernet/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", + "description": "ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -54,12 +54,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", + "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'" ] @@ -67,7 +67,7 @@ ] }, { - "description": "ethernet/vlan/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", + "description": "ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -84,7 +84,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -120,13 +120,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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'" @@ -135,7 +135,7 @@ ] }, { - "description": "ethernet/mpls/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", + "description": "ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -188,7 +188,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -224,13 +224,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", + "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'" ] @@ -238,7 +238,7 @@ ] }, { - "description": "ethernet/itag/ethernet/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", + "description": "ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->arp_sha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -289,7 +289,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -325,14 +325,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", + "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'" ] 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 08c32c41..f15d1a90 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 @@ -1,7 +1,7 @@ [ "action: set_field: 25_ARP_THA", { - "description": "ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->arp_tha,output:2'", + "description": "ethernet/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->arp_tha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -33,7 +33,7 @@ "field":{ "OXMTlv":{ "field":"arp_tha", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -54,20 +54,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description": "ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->arp_tha,output:2'", + "description": "ethernet/vlan/arp(dst_mac='22:22:22:22:22:22')-->'arp_tha=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->arp_tha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -99,7 +99,7 @@ "field":{ "OXMTlv":{ "field":"arp_tha", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -120,22 +120,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description": "ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->arp_tha,output:2'", + "description": "ethernet/mpls/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_mpls:0x0800,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->arp_tha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -203,7 +203,7 @@ "field":{ "OXMTlv":{ "field":"arp_tha", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -224,21 +224,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description": "ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=set_field:bb:bb:bb:bb:bb:bb->arp_tha,output:2'", + "description": "ethernet/itag/ethernet/arp(dst_mac='22:22:22:22:22:22')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=set_field:ba:bb:bb:bb:bb:bb->arp_tha,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -304,7 +304,7 @@ "field":{ "OXMTlv":{ "field":"arp_tha", - "value":"bb:bb:bb:bb:bb:bb" + "value":"ba:bb:bb:bb:bb:bb" } } } @@ -325,15 +325,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2054)", - "arp(dst_ip='192.168.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=1, src_ip='192.168.10.10',src_mac='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/26_IPV6_SRC.json b/ryu/tests/switch/of13/action/25_SET_FIELD/26_IPV6_SRC.json index e52842d3..9f73b0bf 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/26_IPV6_SRC.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/26_IPV6_SRC.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='a0::a0', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='a0::a0', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='a0::a0', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='a0::a0', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/27_IPV6_DST.json b/ryu/tests/switch/of13/action/25_SET_FIELD/27_IPV6_DST.json index 033f4393..2d5aafda 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/27_IPV6_DST.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/27_IPV6_DST.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/28_IPV6_FLABEL.json b/ryu/tests/switch/of13/action/25_SET_FIELD/28_IPV6_FLABEL.json index 418a88ee..36aa5452 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/28_IPV6_FLABEL.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/28_IPV6_FLABEL.json @@ -54,13 +54,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=203, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -122,14 +122,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=203, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -228,14 +228,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=203, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -331,15 +331,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=203, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/29_ICMPV6_TYPE.json b/ryu/tests/switch/of13/action/25_SET_FIELD/29_ICMPV6_TYPE.json index 338a7de4..60f8da4f 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/29_ICMPV6_TYPE.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/29_ICMPV6_TYPE.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=135)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=135)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=135)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=135)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/30_ICMPV6_CODE.json b/ryu/tests/switch/of13/action/25_SET_FIELD/30_ICMPV6_CODE.json index 44d3165c..7fee676c 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/30_ICMPV6_CODE.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/30_ICMPV6_CODE.json @@ -60,12 +60,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=1,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -132,13 +132,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=1,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" @@ -242,13 +242,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=1,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -349,14 +349,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=1,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/31_IPV6_ND_TARGET.json b/ryu/tests/switch/of13/action/25_SET_FIELD/31_IPV6_ND_TARGET.json index dba07617..521c98d6 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/31_IPV6_ND_TARGET.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/31_IPV6_ND_TARGET.json @@ -66,14 +66,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='a0::a0'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='a0::a0'),type_=135)" ] } ] @@ -144,16 +144,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='a0::a0'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='a0::a0'),type_=135)" ] } ] @@ -260,15 +260,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='a0::a0'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='a0::a0'),type_=135)" ] } ] @@ -373,16 +373,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='a0::a0'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='a0::a0'),type_=135)" ] } ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/32_IPV6_ND_SLL.json b/ryu/tests/switch/of13/action/25_SET_FIELD/32_IPV6_ND_SLL.json index a2651b4b..9577cf6e 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/32_IPV6_ND_SLL.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/32_IPV6_ND_SLL.json @@ -1,7 +1,7 @@ [ "action: set_field: 32_IPV6_ND_SLL", { - "description": "ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", + "description": "ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -30,7 +30,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -66,12 +66,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=135)" ] @@ -79,7 +79,7 @@ ] }, { - "description": "ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:111:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", + "description": "ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=12:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -108,7 +108,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -144,13 +144,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=135)" @@ -159,7 +159,7 @@ ] }, { - "description": "ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", + "description": "ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -224,7 +224,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -260,13 +260,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=135)" ] @@ -274,7 +274,7 @@ ] }, { - "description": "ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", + "description": "ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_sll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -337,7 +337,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -373,14 +373,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=135)" ] diff --git a/ryu/tests/switch/of13/action/25_SET_FIELD/33_IPV6_ND_TLL.json b/ryu/tests/switch/of13/action/25_SET_FIELD/33_IPV6_ND_TLL.json index 7351dabf..4985fe0c 100644 --- a/ryu/tests/switch/of13/action/25_SET_FIELD/33_IPV6_ND_TLL.json +++ b/ryu/tests/switch/of13/action/25_SET_FIELD/33_IPV6_ND_TLL.json @@ -1,7 +1,7 @@ [ "action: set_field: 33_IPV6_ND_TLL", { - "description": "ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", + "description": "ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -30,7 +30,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -66,12 +66,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=136)" ] @@ -79,7 +79,7 @@ ] }, { - "description": "ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:111:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", + "description": "ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -108,7 +108,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -144,13 +144,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=136)" @@ -159,7 +159,7 @@ ] }, { - "description": "ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", + "description": "ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -224,7 +224,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -260,13 +260,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=136)" ] @@ -274,7 +274,7 @@ ] }, { - "description": "ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", + "description": "ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=set_field:aa:aa:aa:aa:aa:aa->ipv6_nd_tll,output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -337,7 +337,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -373,14 +373,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='20::20'),type_=136)" ] 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 d4cd3011..c5c5184f 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 @@ -54,14 +54,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -124,14 +124,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -194,15 +194,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 a2ac51a1..f82dc305 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 @@ -54,14 +54,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -124,14 +124,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -194,15 +194,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 791bc31d..344d5a0d 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 @@ -54,14 +54,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -124,14 +124,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -194,15 +194,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 31a9d09a..5f680df8 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 @@ -54,10 +54,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -65,10 +65,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -132,10 +132,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -143,10 +143,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -210,23 +210,23 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } 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 a0ee50bc..d2559277 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 @@ -79,13 +79,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -172,13 +172,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -265,13 +265,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/26_PUSH_PBB.json b/ryu/tests/switch/of13/action/26_PUSH_PBB.json index 0dfe7bbc..9fa0e594 100644 --- a/ryu/tests/switch/of13/action/26_PUSH_PBB.json +++ b/ryu/tests/switch/of13/action/26_PUSH_PBB.json @@ -43,15 +43,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -102,15 +102,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,15 +161,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/26_PUSH_PBB_multiple.json b/ryu/tests/switch/of13/action/26_PUSH_PBB_multiple.json index f4c5faca..1a110d09 100644 --- a/ryu/tests/switch/of13/action/26_PUSH_PBB_multiple.json +++ b/ryu/tests/switch/of13/action/26_PUSH_PBB_multiple.json @@ -48,17 +48,17 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -114,17 +114,17 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -180,17 +180,17 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ] } diff --git a/ryu/tests/switch/of13/action/27_POP_PBB.json b/ryu/tests/switch/of13/action/27_POP_PBB.json index 14216c1a..d856761b 100644 --- a/ryu/tests/switch/of13/action/27_POP_PBB.json +++ b/ryu/tests/switch/of13/action/27_POP_PBB.json @@ -41,9 +41,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -51,7 +51,7 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -102,9 +102,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -112,7 +112,7 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -163,19 +163,19 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } diff --git a/ryu/tests/switch/of13/match/00_IN_PORT.json b/ryu/tests/switch/of13/match/00_IN_PORT.json index 29c790db..9eef9ffe 100644 --- a/ryu/tests/switch/of13/match/00_IN_PORT.json +++ b/ryu/tests/switch/of13/match/00_IN_PORT.json @@ -38,13 +38,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -91,13 +91,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -143,7 +143,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -192,13 +192,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -245,13 +245,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -297,7 +297,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -346,13 +346,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -397,13 +397,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -447,8 +447,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/02_METADATA.json b/ryu/tests/switch/of13/match/02_METADATA.json index af59632d..30ce0763 100644 --- a/ryu/tests/switch/of13/match/02_METADATA.json +++ b/ryu/tests/switch/of13/match/02_METADATA.json @@ -61,13 +61,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -137,13 +137,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -212,7 +212,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -284,13 +284,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -360,13 +360,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -435,7 +435,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -507,13 +507,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -581,13 +581,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -654,8 +654,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/02_METADATA_Mask.json b/ryu/tests/switch/of13/match/02_METADATA_Mask.json index 385df50e..274bc308 100644 --- a/ryu/tests/switch/of13/match/02_METADATA_Mask.json +++ b/ryu/tests/switch/of13/match/02_METADATA_Mask.json @@ -62,13 +62,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -139,13 +139,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -215,7 +215,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -288,13 +288,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -365,13 +365,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -441,7 +441,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -514,13 +514,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -589,13 +589,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -663,8 +663,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/03_ETH_DST.json b/ryu/tests/switch/of13/match/03_ETH_DST.json index dfebee55..84476157 100644 --- a/ryu/tests/switch/of13/match/03_ETH_DST.json +++ b/ryu/tests/switch/of13/match/03_ETH_DST.json @@ -38,13 +38,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -91,13 +91,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -106,7 +106,7 @@ ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -143,7 +143,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -192,13 +192,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -245,13 +245,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -260,7 +260,7 @@ ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -297,7 +297,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -346,13 +346,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -397,20 +397,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -447,8 +447,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 33f27577..d1957720 100644 --- a/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json +++ b/ryu/tests/switch/of13/match/03_ETH_DST_Mask.json @@ -39,13 +39,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -93,13 +93,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -108,7 +108,7 @@ ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv4/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -146,7 +146,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -196,13 +196,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -250,13 +250,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -265,7 +265,7 @@ ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/ipv6/tcp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -303,7 +303,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -353,13 +353,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -405,20 +405,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet(dst='bb:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", + "description":"ethernet(dst='ba:bb:bb:bb:bb:bb')/arp-->'eth_dst=22:22:22:22:22:00(mask=0xffffffffff00),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -456,8 +456,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/04_ETH_SRC.json b/ryu/tests/switch/of13/match/04_ETH_SRC.json index 4deb6b2e..cf128ca0 100644 --- a/ryu/tests/switch/of13/match/04_ETH_SRC.json +++ b/ryu/tests/switch/of13/match/04_ETH_SRC.json @@ -1,7 +1,7 @@ [ "match: 04_ETH_SRC", { - "description":"ethernet(src='11:11:11:11:11:11')/ipv4/tcp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -12,7 +12,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -38,13 +38,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -53,7 +53,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv4/tcp-->'eth_src=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -64,7 +64,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -91,13 +91,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -106,7 +106,7 @@ ] }, { - "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv4/tcp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv4/tcp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -117,7 +117,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -143,7 +143,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -155,7 +155,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv6/tcp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -166,7 +166,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -192,13 +192,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -207,7 +207,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv6/tcp-->'eth_src=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -218,7 +218,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -245,13 +245,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -260,7 +260,7 @@ ] }, { - "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv6/tcp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/ipv6/tcp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -271,7 +271,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -297,7 +297,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -309,7 +309,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/arp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -320,7 +320,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -346,20 +346,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/arp-->'eth_src=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -370,7 +370,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -397,20 +397,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/arp-->'eth_src=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet(src='aa:aa:aa:aa:aa:aa')/arp-->'eth_src=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -421,7 +421,7 @@ { "OXMTlv":{ "field":"eth_src", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -447,8 +447,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 276b8853..dad2f1a3 100644 --- a/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/04_ETH_SRC_Mask.json @@ -1,7 +1,7 @@ [ "match: 04_ETH_SRC (Mask)", { - "description":"ethernet(src='11:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -39,13 +39,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -54,7 +54,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv4/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -93,13 +93,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -146,7 +146,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -158,7 +158,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -196,13 +196,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -211,7 +211,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/ipv6/tcp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -250,13 +250,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -303,7 +303,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -315,7 +315,7 @@ ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", + "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -353,20 +353,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet(src='11:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", + "description":"ethernet(src='12:11:11:11:11:11')/arp-->'eth_src=00:11:11:11:11:11(mask=0x00ffffffffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -405,13 +405,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -456,8 +456,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/05_ETH_TYPE.json b/ryu/tests/switch/of13/match/05_ETH_TYPE.json index 17efc19a..8aa89ab0 100644 --- a/ryu/tests/switch/of13/match/05_ETH_TYPE.json +++ b/ryu/tests/switch/of13/match/05_ETH_TYPE.json @@ -38,13 +38,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -91,13 +91,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -143,7 +143,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -192,13 +192,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -245,13 +245,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -297,7 +297,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -346,13 +346,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -397,13 +397,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -447,8 +447,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/06_VLAN_VID.json b/ryu/tests/switch/of13/match/06_VLAN_VID.json index bb6f9a41..5ef10282 100644 --- a/ryu/tests/switch/of13/match/06_VLAN_VID.json +++ b/ryu/tests/switch/of13/match/06_VLAN_VID.json @@ -38,14 +38,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -93,14 +93,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -147,7 +147,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -197,14 +197,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -252,14 +252,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -306,7 +306,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -356,15 +356,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -409,15 +409,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -461,9 +461,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 8a4e6047..193afc7d 100644 --- a/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json +++ b/ryu/tests/switch/of13/match/06_VLAN_VID_Mask.json @@ -39,14 +39,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -95,14 +95,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -150,7 +150,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -201,14 +201,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -257,14 +257,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -312,7 +312,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -363,15 +363,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -417,15 +417,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -470,9 +470,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/07_VLAN_PCP.json b/ryu/tests/switch/of13/match/07_VLAN_PCP.json index 35f1357b..3cf79de0 100644 --- a/ryu/tests/switch/of13/match/07_VLAN_PCP.json +++ b/ryu/tests/switch/of13/match/07_VLAN_PCP.json @@ -45,14 +45,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -107,14 +107,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -168,7 +168,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -225,14 +225,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -287,14 +287,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -348,7 +348,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -405,15 +405,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -465,15 +465,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -524,9 +524,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/08_IP_DSCP_IPv4.json b/ryu/tests/switch/of13/match/08_IP_DSCP_IPv4.json index 20d18895..fcb5770f 100644 --- a/ryu/tests/switch/of13/match/08_IP_DSCP_IPv4.json +++ b/ryu/tests/switch/of13/match/08_IP_DSCP_IPv4.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/08_IP_DSCP_IPv6.json b/ryu/tests/switch/of13/match/08_IP_DSCP_IPv6.json index 05c1ba8f..65a120f8 100644 --- a/ryu/tests/switch/of13/match/08_IP_DSCP_IPv6.json +++ b/ryu/tests/switch/of13/match/08_IP_DSCP_IPv6.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/09_IP_ECN_IPv4.json b/ryu/tests/switch/of13/match/09_IP_ECN_IPv4.json index d04f8267..03f10f8d 100644 --- a/ryu/tests/switch/of13/match/09_IP_ECN_IPv4.json +++ b/ryu/tests/switch/of13/match/09_IP_ECN_IPv4.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -104,13 +104,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -162,7 +162,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -217,14 +217,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -278,14 +278,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -338,7 +338,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -430,14 +430,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -526,14 +526,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -621,7 +621,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -711,15 +711,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -806,15 +806,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -900,9 +900,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/09_IP_ECN_IPv6.json b/ryu/tests/switch/of13/match/09_IP_ECN_IPv6.json index 647c710b..694457cb 100644 --- a/ryu/tests/switch/of13/match/09_IP_ECN_IPv6.json +++ b/ryu/tests/switch/of13/match/09_IP_ECN_IPv6.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/10_IP_PROTO_IPv4.json b/ryu/tests/switch/of13/match/10_IP_PROTO_IPv4.json index 2c54eacc..c64f6527 100644 --- a/ryu/tests/switch/of13/match/10_IP_PROTO_IPv4.json +++ b/ryu/tests/switch/of13/match/10_IP_PROTO_IPv4.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/10_IP_PROTO_IPv6.json b/ryu/tests/switch/of13/match/10_IP_PROTO_IPv6.json index 7de65e01..f3013263 100644 --- a/ryu/tests/switch/of13/match/10_IP_PROTO_IPv6.json +++ b/ryu/tests/switch/of13/match/10_IP_PROTO_IPv6.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/11_IPV4_SRC.json b/ryu/tests/switch/of13/match/11_IPV4_SRC.json index f3879274..f1c528fe 100644 --- a/ryu/tests/switch/of13/match/11_IPV4_SRC.json +++ b/ryu/tests/switch/of13/match/11_IPV4_SRC.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json b/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json index 63c86edb..b5d11dad 100644 --- a/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/11_IPV4_SRC_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -105,13 +105,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -164,7 +164,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -220,14 +220,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -343,7 +343,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -436,14 +436,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -533,14 +533,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -629,7 +629,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -720,15 +720,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -816,15 +816,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -911,9 +911,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/12_IPV4_DST.json b/ryu/tests/switch/of13/match/12_IPV4_DST.json index ff69201c..70b9dbfb 100644 --- a/ryu/tests/switch/of13/match/12_IPV4_DST.json +++ b/ryu/tests/switch/of13/match/12_IPV4_DST.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json b/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json index 277e56e3..696786fb 100644 --- a/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json +++ b/ryu/tests/switch/of13/match/12_IPV4_DST_Mask.json @@ -46,13 +46,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -106,13 +106,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -165,7 +165,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -221,14 +221,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -283,14 +283,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -344,7 +344,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -437,14 +437,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -534,14 +534,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -630,7 +630,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -721,15 +721,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -817,15 +817,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -912,9 +912,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/13_TCP_SRC_IPv4.json b/ryu/tests/switch/of13/match/13_TCP_SRC_IPv4.json index 4bf4bea0..7527c29a 100644 --- a/ryu/tests/switch/of13/match/13_TCP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/match/13_TCP_SRC_IPv4.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/13_TCP_SRC_IPv6.json b/ryu/tests/switch/of13/match/13_TCP_SRC_IPv6.json index 61d88b3f..b7fa7d28 100644 --- a/ryu/tests/switch/of13/match/13_TCP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/match/13_TCP_SRC_IPv6.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/14_TCP_DST_IPv4.json b/ryu/tests/switch/of13/match/14_TCP_DST_IPv4.json index 17a9b854..25e8f384 100644 --- a/ryu/tests/switch/of13/match/14_TCP_DST_IPv4.json +++ b/ryu/tests/switch/of13/match/14_TCP_DST_IPv4.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/14_TCP_DST_IPv6.json b/ryu/tests/switch/of13/match/14_TCP_DST_IPv6.json index 3404fce6..0f4f6a96 100644 --- a/ryu/tests/switch/of13/match/14_TCP_DST_IPv6.json +++ b/ryu/tests/switch/of13/match/14_TCP_DST_IPv6.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/15_UDP_SRC_IPv4.json b/ryu/tests/switch/of13/match/15_UDP_SRC_IPv4.json index 65bc26b8..f4d39205 100644 --- a/ryu/tests/switch/of13/match/15_UDP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/match/15_UDP_SRC_IPv4.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/15_UDP_SRC_IPv6.json b/ryu/tests/switch/of13/match/15_UDP_SRC_IPv6.json index d1d6baea..d92c9a10 100644 --- a/ryu/tests/switch/of13/match/15_UDP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/match/15_UDP_SRC_IPv6.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/16_UDP_DST_IPv4.json b/ryu/tests/switch/of13/match/16_UDP_DST_IPv4.json index b8eb719d..f763f899 100644 --- a/ryu/tests/switch/of13/match/16_UDP_DST_IPv4.json +++ b/ryu/tests/switch/of13/match/16_UDP_DST_IPv4.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=17, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=17, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/16_UDP_DST_IPv6.json b/ryu/tests/switch/of13/match/16_UDP_DST_IPv6.json index 401d2204..492d8fed 100644 --- a/ryu/tests/switch/of13/match/16_UDP_DST_IPv6.json +++ b/ryu/tests/switch/of13/match/16_UDP_DST_IPv6.json @@ -50,13 +50,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -115,13 +115,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -179,7 +179,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -240,14 +240,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", @@ -307,14 +307,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", @@ -373,7 +373,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", @@ -471,14 +471,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -573,14 +573,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -674,7 +674,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", @@ -770,15 +770,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -871,15 +871,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=17, hop_limit=64, traffic_class=32)", "udp(dst_port=2222, src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -971,9 +971,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=17, hop_limit=127, traffic_class=65)", "udp(dst_port=6789, src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv4.json b/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv4.json index 029c4592..0f41f1af 100644 --- a/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv4.json +++ b/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv4.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], diff --git a/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv6.json b/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv6.json index ed2e3c86..adb61343 100644 --- a/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv6.json +++ b/ryu/tests/switch/of13/match/17_SCTP_SRC_IPv6.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], diff --git a/ryu/tests/switch/of13/match/18_SCTP_DST_IPv4.json b/ryu/tests/switch/of13/match/18_SCTP_DST_IPv4.json index c3dba667..664b76cb 100644 --- a/ryu/tests/switch/of13/match/18_SCTP_DST_IPv4.json +++ b/ryu/tests/switch/of13/match/18_SCTP_DST_IPv4.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=132, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=132, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], diff --git a/ryu/tests/switch/of13/match/18_SCTP_DST_IPv6.json b/ryu/tests/switch/of13/match/18_SCTP_DST_IPv6.json index 7ebb345d..fdcc8b10 100644 --- a/ryu/tests/switch/of13/match/18_SCTP_DST_IPv6.json +++ b/ryu/tests/switch/of13/match/18_SCTP_DST_IPv6.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=132, hop_limit=64, traffic_class=32)", "sctp(chunks=[chunk_data(payload_data='0123456789abcdefghijklmnopqrstuvwxyz')], dst_port=2222, src_port=11111)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=132, hop_limit=127, traffic_class=65)", "sctp(chunks=[chunk_data(payload_data='abcdefghijklmnopqrstuvwxyz0123456789')], dst_port=6789, src_port=12345)" ], diff --git a/ryu/tests/switch/of13/match/19_ICMPV4_TYPE.json b/ryu/tests/switch/of13/match/19_ICMPV4_TYPE.json index 93a9c4f1..f078d595 100644 --- a/ryu/tests/switch/of13/match/19_ICMPV4_TYPE.json +++ b/ryu/tests/switch/of13/match/19_ICMPV4_TYPE.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" ], diff --git a/ryu/tests/switch/of13/match/20_ICMPV4_CODE.json b/ryu/tests/switch/of13/match/20_ICMPV4_CODE.json index b7730153..4133ce43 100644 --- a/ryu/tests/switch/of13/match/20_ICMPV4_CODE.json +++ b/ryu/tests/switch/of13/match/20_ICMPV4_CODE.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=1, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "icmp(code=0,csum=0,data=echo(data='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKL'),type_=8)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2048)", "ipv4(tos=65, proto=1, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "icmp(code=1,csum=0,data=dest_unreach(data='\\xd3]\\xb7\\xe3\\x9e\\xbb\\xf3\\xd6\\x9bq\\xd7\\x9f\\x82\\x18\\xa3\\x92Y\\xa7\\xa2\\x9a\\xab\\xb2\\xdb\\xaf\\xc3\\x1c\\xb3\\x00\\x10\\x83\\x10Q\\x87 \\x92\\x8b'),type_=3)" ], diff --git a/ryu/tests/switch/of13/match/21_ARP_OP.json b/ryu/tests/switch/of13/match/21_ARP_OP.json index 75ffbcc3..61598718 100644 --- a/ryu/tests/switch/of13/match/21_ARP_OP.json +++ b/ryu/tests/switch/of13/match/21_ARP_OP.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -101,13 +101,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -157,8 +157,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -211,15 +211,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -270,15 +270,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -328,9 +328,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -419,14 +419,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -513,14 +513,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -606,9 +606,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -695,15 +695,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -788,15 +788,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -880,10 +880,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/22_ARP_SPA.json b/ryu/tests/switch/of13/match/22_ARP_SPA.json index 673a966a..5040f1cb 100644 --- a/ryu/tests/switch/of13/match/22_ARP_SPA.json +++ b/ryu/tests/switch/of13/match/22_ARP_SPA.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -101,13 +101,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -157,8 +157,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -211,15 +211,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -270,15 +270,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -328,9 +328,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -419,14 +419,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -513,14 +513,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -606,9 +606,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -695,15 +695,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -788,15 +788,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -880,10 +880,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 1f1de2af..8ff8d873 100644 --- a/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json +++ b/ryu/tests/switch/of13/match/22_ARP_SPA_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -160,8 +160,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -215,15 +215,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -275,15 +275,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -334,9 +334,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -426,14 +426,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -521,14 +521,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -615,9 +615,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -705,15 +705,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -799,15 +799,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -892,10 +892,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/23_ARP_TPA.json b/ryu/tests/switch/of13/match/23_ARP_TPA.json index 5d833e4b..b52c029c 100644 --- a/ryu/tests/switch/of13/match/23_ARP_TPA.json +++ b/ryu/tests/switch/of13/match/23_ARP_TPA.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -101,13 +101,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -157,8 +157,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -211,15 +211,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -270,15 +270,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -328,9 +328,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -419,14 +419,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -513,14 +513,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -606,9 +606,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -695,15 +695,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -788,15 +788,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -880,10 +880,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 94cb830c..bbd758d2 100644 --- a/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json +++ b/ryu/tests/switch/of13/match/23_ARP_TPA_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -160,8 +160,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -215,15 +215,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -275,15 +275,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -334,9 +334,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -426,14 +426,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -521,14 +521,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -615,9 +615,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -705,15 +705,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -799,15 +799,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -892,10 +892,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/24_ARP_SHA.json b/ryu/tests/switch/of13/match/24_ARP_SHA.json index 41d5184b..637ec5e7 100644 --- a/ryu/tests/switch/of13/match/24_ARP_SHA.json +++ b/ryu/tests/switch/of13/match/24_ARP_SHA.json @@ -1,7 +1,7 @@ [ "match: 24_ARP_SHA", { - "description":"ethernet/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -18,7 +18,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -44,20 +44,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -74,7 +74,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -101,20 +101,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -131,7 +131,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -157,8 +157,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -168,7 +168,7 @@ ] }, { - "description":"ethernet/vlan/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -185,7 +185,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -211,22 +211,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -243,7 +243,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -270,22 +270,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -302,7 +302,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -328,9 +328,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -340,7 +340,7 @@ ] }, { - "description":"ethernet/mpls/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -393,7 +393,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -419,21 +419,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -486,7 +486,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -513,21 +513,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -580,7 +580,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -606,9 +606,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -618,7 +618,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -669,7 +669,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -695,22 +695,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -761,7 +761,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -788,22 +788,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:11:11:11,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -854,7 +854,7 @@ { "OXMTlv":{ "field":"arp_sha", - "value":"11:11:11:11:11:11" + "value":"12:11:11:11:11:11" } } ] @@ -880,10 +880,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 8c24dbfe..5bfc3cde 100644 --- a/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json +++ b/ryu/tests/switch/of13/match/24_ARP_SHA_Mask.json @@ -1,7 +1,7 @@ [ "match: 24_ARP_SHA (Mask)", { - "description":"ethernet/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -19,7 +19,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -45,20 +45,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", + "description":"ethernet/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -76,7 +76,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -103,20 +103,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -134,7 +134,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -160,8 +160,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -171,7 +171,7 @@ ] }, { - "description":"ethernet/vlan/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -189,7 +189,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -215,22 +215,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(src_mac='11:11:11:11:11:11')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", + "description":"ethernet/vlan/arp(src_mac='12:11:11:11:11:11')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -248,7 +248,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -275,22 +275,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/vlan/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -308,7 +308,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -334,9 +334,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -346,7 +346,7 @@ ] }, { - "description":"ethernet/mpls/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -400,7 +400,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -426,21 +426,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", + "description":"ethernet/mpls/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -494,7 +494,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -521,21 +521,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/mpls/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -589,7 +589,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -615,9 +615,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -627,7 +627,7 @@ ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -679,7 +679,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -705,22 +705,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='11:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/arp(src_mac='12:11:11:11:11:11')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -772,7 +772,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -799,22 +799,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=11:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(src_mac='aa:aa:aa:aa:aa:aa')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_sha=12:11:11:00:11:11(mask=0xffffff00ffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -866,7 +866,7 @@ "OXMTlv":{ "field":"arp_sha", "mask":281474959998975, - "value":"11:11:11:00:11:11" + "value":"12:11:11:00:11:11" } } ] @@ -892,10 +892,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/25_ARP_THA.json b/ryu/tests/switch/of13/match/25_ARP_THA.json index d73a03e9..ee00d72f 100644 --- a/ryu/tests/switch/of13/match/25_ARP_THA.json +++ b/ryu/tests/switch/of13/match/25_ARP_THA.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -101,20 +101,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'arp_tha=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -157,8 +157,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -211,15 +211,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -270,22 +270,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'arp_tha=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet/vlan/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -328,9 +328,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -419,14 +419,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -513,21 +513,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet/mpls/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -606,9 +606,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -695,15 +695,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -788,22 +788,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=output:2'", + "description":"ethernet/itag/ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -880,10 +880,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 90b40ca9..cd00bd68 100644 --- a/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json +++ b/ryu/tests/switch/of13/match/25_ARP_THA_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -103,20 +103,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", + "description":"ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -160,8 +160,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -215,15 +215,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -275,22 +275,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } ] }, { - "description":"ethernet/vlan/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", + "description":"ethernet/vlan/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -334,9 +334,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -426,14 +426,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -521,21 +521,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/mpls/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", + "description":"ethernet/mpls/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_mpls:0x0806,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -615,9 +615,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ @@ -705,15 +705,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -799,22 +799,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } ] }, { - "description":"ethernet/itag/ethernet/arp(dst_mac='bb:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", + "description":"ethernet/itag/ethernet/arp(dst_mac='ba:bb:bb:bb:bb:bb')-->'actions=pop_pbb,goto_table:1','table_id:1,arp_tha=22:22:00:22:22:22(mask=0xffff00ffffff),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -892,10 +892,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=2054)", - "arp(dst_ip='10.10.20.20',dst_mac='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/26_IPV6_SRC.json b/ryu/tests/switch/of13/match/26_IPV6_SRC.json index 0ca25f77..c68c77e2 100644 --- a/ryu/tests/switch/of13/match/26_IPV6_SRC.json +++ b/ryu/tests/switch/of13/match/26_IPV6_SRC.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json b/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json index e54c1eef..46b0a0de 100644 --- a/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json +++ b/ryu/tests/switch/of13/match/26_IPV6_SRC_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -105,13 +105,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -164,7 +164,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -220,14 +220,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -343,7 +343,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -436,14 +436,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -533,14 +533,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -629,7 +629,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -720,15 +720,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -816,15 +816,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -911,9 +911,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/27_IPV6_DST.json b/ryu/tests/switch/of13/match/27_IPV6_DST.json index acbe370b..cd2fd1cc 100644 --- a/ryu/tests/switch/of13/match/27_IPV6_DST.json +++ b/ryu/tests/switch/of13/match/27_IPV6_DST.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json b/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json index 8eddbbb9..cceea8ee 100644 --- a/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json +++ b/ryu/tests/switch/of13/match/27_IPV6_DST_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -105,13 +105,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -164,7 +164,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -220,14 +220,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -343,7 +343,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -436,14 +436,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -533,14 +533,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -629,7 +629,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -720,15 +720,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -816,15 +816,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -911,9 +911,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/28_IPV6_FLABEL.json b/ryu/tests/switch/of13/match/28_IPV6_FLABEL.json index 3ead1035..7999e750 100644 --- a/ryu/tests/switch/of13/match/28_IPV6_FLABEL.json +++ b/ryu/tests/switch/of13/match/28_IPV6_FLABEL.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/29_ICMPV6_TYPE.json b/ryu/tests/switch/of13/match/29_ICMPV6_TYPE.json index e364fc1c..03cc87b8 100644 --- a/ryu/tests/switch/of13/match/29_ICMPV6_TYPE.json +++ b/ryu/tests/switch/of13/match/29_ICMPV6_TYPE.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" ], diff --git a/ryu/tests/switch/of13/match/30_ICMPV6_CODE.json b/ryu/tests/switch/of13/match/30_ICMPV6_CODE.json index e3152f7c..e5843658 100644 --- a/ryu/tests/switch/of13/match/30_ICMPV6_CODE.json +++ b/ryu/tests/switch/of13/match/30_ICMPV6_CODE.json @@ -50,12 +50,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -113,12 +113,12 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -175,7 +175,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" ], @@ -235,13 +235,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" @@ -300,13 +300,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" @@ -364,7 +364,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" @@ -461,13 +461,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -561,13 +561,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -660,7 +660,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" @@ -755,14 +755,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -854,14 +854,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", "icmpv6(code=0,data=echo(data='\\x00\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f !\"#$%&\\'()*+,-./0123'),type_=128)" ] @@ -952,9 +952,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=1,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='a0::a0'),type_=135)" ], diff --git a/ryu/tests/switch/of13/match/31_IPV6_ND_TARGET.json b/ryu/tests/switch/of13/match/31_IPV6_ND_TARGET.json index 059b3b74..72d59e1b 100644 --- a/ryu/tests/switch/of13/match/31_IPV6_ND_TARGET.json +++ b/ryu/tests/switch/of13/match/31_IPV6_ND_TARGET.json @@ -56,14 +56,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -125,14 +125,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -193,7 +193,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" ], @@ -259,16 +259,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -330,16 +330,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -400,7 +400,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" @@ -503,15 +503,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -609,15 +609,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -714,7 +714,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" @@ -815,16 +815,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -920,16 +920,16 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='12:11:11:11:11:11'),dst='20::20'),type_=135)" ] } ] @@ -1024,9 +1024,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" ], diff --git a/ryu/tests/switch/of13/match/32_IPV6_ND_SLL.json b/ryu/tests/switch/of13/match/32_IPV6_ND_SLL.json index 9dd7ce41..0d130ba1 100644 --- a/ryu/tests/switch/of13/match/32_IPV6_ND_SLL.json +++ b/ryu/tests/switch/of13/match/32_IPV6_ND_SLL.json @@ -1,7 +1,7 @@ [ "match: 32_IPV6_ND_SLL", { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -30,7 +30,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -56,20 +56,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -98,7 +98,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -125,20 +125,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -167,7 +167,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -193,7 +193,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" ], @@ -204,7 +204,7 @@ ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -233,7 +233,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -259,22 +259,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -303,7 +303,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -330,22 +330,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -374,7 +374,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -400,7 +400,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" @@ -412,7 +412,7 @@ ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -477,7 +477,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -503,21 +503,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -582,7 +582,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -609,21 +609,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -688,7 +688,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -714,7 +714,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" @@ -726,7 +726,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -789,7 +789,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -815,22 +815,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -893,7 +893,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -920,22 +920,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=135)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=135)" ] } ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_sll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -998,7 +998,7 @@ { "OXMTlv":{ "field":"ipv6_nd_sll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -1024,9 +1024,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_sla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=135)" ], diff --git a/ryu/tests/switch/of13/match/33_IPV6_ND_TLL.json b/ryu/tests/switch/of13/match/33_IPV6_ND_TLL.json index cf656c34..b6cb2c61 100644 --- a/ryu/tests/switch/of13/match/33_IPV6_ND_TLL.json +++ b/ryu/tests/switch/of13/match/33_IPV6_ND_TLL.json @@ -1,7 +1,7 @@ [ "match: 33_IPV6_ND_TLL", { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -30,7 +30,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -56,20 +56,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -98,7 +98,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -125,20 +125,20 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -167,7 +167,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -193,7 +193,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=136)" ], @@ -204,7 +204,7 @@ ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -233,7 +233,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -259,22 +259,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -303,7 +303,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -330,22 +330,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/vlan/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -374,7 +374,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -400,7 +400,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=136)" @@ -412,7 +412,7 @@ ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -477,7 +477,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -503,21 +503,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -582,7 +582,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -609,21 +609,21 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/mpls/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_mpls:0x86dd,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -688,7 +688,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -714,7 +714,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=136)" @@ -726,7 +726,7 @@ ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -789,7 +789,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -815,22 +815,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:CONTROLLER'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:CONTROLLER'", "prerequisite":[ { "OFPFlowMod":{ @@ -893,7 +893,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -920,22 +920,22 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=58, hop_limit=64, traffic_class=32)", - "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='11:11:11:11:11:11'),dst='20::20'),type_=136)" + "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='22:22:22:22:22:22'),dst='20::20'),type_=136)" ] } ] }, { - "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=11:11:11:11:11:11,actions=output:2'", + "description":"ethernet/itag/ethernet/ipv6/icmpv6(data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa')))-->'actions=pop_pbb,goto_table:1','table_id:1,ipv6_nd_tll=22:22:22:22:22:22,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -998,7 +998,7 @@ { "OXMTlv":{ "field":"ipv6_nd_tll", - "value":"11:11:11:11:11:11" + "value":"22:22:22:22:22:22" } } ] @@ -1024,9 +1024,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=58, hop_limit=127, traffic_class=65)", "icmpv6(code=0,data=nd_neighbor(option=nd_option_tla(hw_src='aa:aa:aa:aa:aa:aa'),dst='b0::b0'),type_=136)" ], diff --git a/ryu/tests/switch/of13/match/34_MPLS_LABEL.json b/ryu/tests/switch/of13/match/34_MPLS_LABEL.json index 142fe489..ee58c4f3 100644 --- a/ryu/tests/switch/of13/match/34_MPLS_LABEL.json +++ b/ryu/tests/switch/of13/match/34_MPLS_LABEL.json @@ -44,14 +44,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -105,14 +105,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -165,7 +165,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -221,14 +221,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -342,7 +342,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -398,15 +398,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -457,15 +457,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -515,9 +515,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/35_MPLS_TC.json b/ryu/tests/switch/of13/match/35_MPLS_TC.json index ea0c89a6..6cf4e214 100644 --- a/ryu/tests/switch/of13/match/35_MPLS_TC.json +++ b/ryu/tests/switch/of13/match/35_MPLS_TC.json @@ -44,14 +44,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -105,14 +105,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -165,7 +165,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -221,14 +221,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -342,7 +342,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -398,15 +398,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -457,15 +457,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -515,9 +515,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/36_MPLS_BOS.json b/ryu/tests/switch/of13/match/36_MPLS_BOS.json index cfe5a128..123d22d6 100644 --- a/ryu/tests/switch/of13/match/36_MPLS_BOS.json +++ b/ryu/tests/switch/of13/match/36_MPLS_BOS.json @@ -44,14 +44,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -105,14 +105,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -165,7 +165,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=0, label=203, exp=5, ttl=127)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", @@ -222,14 +222,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -283,14 +283,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -343,7 +343,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "mpls(bsb=0, label=203, exp=5, ttl=127)", "mpls(bsb=1, label=100, exp=3, ttl=64)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", @@ -400,15 +400,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -459,15 +459,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -517,10 +517,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/37_PBB_ISID.json b/ryu/tests/switch/of13/match/37_PBB_ISID.json index b2c85e7a..de345d10 100644 --- a/ryu/tests/switch/of13/match/37_PBB_ISID.json +++ b/ryu/tests/switch/of13/match/37_PBB_ISID.json @@ -44,10 +44,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -55,10 +55,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -113,10 +113,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -124,10 +124,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -181,10 +181,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", @@ -241,10 +241,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -252,10 +252,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -310,10 +310,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -321,10 +321,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -378,10 +378,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", @@ -438,23 +438,23 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -505,23 +505,23 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -571,13 +571,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ 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 f403f8df..c8d8f151 100644 --- a/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json +++ b/ryu/tests/switch/of13/match/37_PBB_ISID_Mask.json @@ -45,10 +45,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -56,10 +56,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -115,10 +115,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -126,10 +126,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", @@ -184,10 +184,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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=2048)", "ipv4(tos=65, proto=6, src='10.10.10.10', dst='10.10.20.20', ttl=127)", @@ -245,10 +245,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -256,10 +256,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -315,10 +315,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -326,10 +326,10 @@ "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", @@ -384,10 +384,10 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127, traffic_class=65)", @@ -445,23 +445,23 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -513,23 +513,23 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=100)", - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34984)", + "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='11:11:11:11:11:11')", + "arp(dst_ip='192.168.20.20',dst_mac='22:22:22:22:22:22', opcode=1, src_ip='192.168.10.10',src_mac='12:11:11:11:11:11')", "'\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00'" ] } @@ -580,13 +580,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", "svlan(ethertype=35047, vid=10)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34984)", + "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='bb:bb:bb:bb:bb:bb', opcode=2, src_ip='10.10.10.10',src_mac='aa:aa:aa:aa:aa:aa')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/38_TUNNEL_ID.json b/ryu/tests/switch/of13/match/38_TUNNEL_ID.json index 3f3c9533..42b16f9c 100644 --- a/ryu/tests/switch/of13/match/38_TUNNEL_ID.json +++ b/ryu/tests/switch/of13/match/38_TUNNEL_ID.json @@ -79,13 +79,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -173,13 +173,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -266,7 +266,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -356,13 +356,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -450,13 +450,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -543,7 +543,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -633,13 +633,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -725,13 +725,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -816,8 +816,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "table-miss":[ 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 90196f82..d5538d81 100644 --- a/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json +++ b/ryu/tests/switch/of13/match/38_TUNNEL_ID_Mask.json @@ -80,13 +80,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -175,13 +175,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -269,7 +269,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(tos=32, proto=6, src='192.168.10.10', dst='192.168.20.20', ttl=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -360,13 +360,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -455,13 +455,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -549,7 +549,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20', flow_label=100, src='10::10', nxt=6, hop_limit=64, traffic_class=32)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -640,13 +640,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -733,13 +733,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ] } @@ -825,8 +825,8 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11: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='11:11:11:11:11:11')", + "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'" ], "table-miss":[ diff --git a/ryu/tests/switch/of13/match/39_IPV6_EXTHDR.json b/ryu/tests/switch/of13/match/39_IPV6_EXTHDR.json index 70eab776..44360b10 100644 --- a/ryu/tests/switch/of13/match/39_IPV6_EXTHDR.json +++ b/ryu/tests/switch/of13/match/39_IPV6_EXTHDR.json @@ -44,13 +44,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -103,13 +103,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -161,7 +161,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -216,14 +216,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -277,14 +277,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -337,7 +337,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -429,14 +429,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -525,14 +525,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -620,7 +620,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -710,15 +710,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -805,15 +805,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -899,9 +899,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/match/39_IPV6_EXTHDR_Mask.json b/ryu/tests/switch/of13/match/39_IPV6_EXTHDR_Mask.json index e5be38bd..636bd6ff 100644 --- a/ryu/tests/switch/of13/match/39_IPV6_EXTHDR_Mask.json +++ b/ryu/tests/switch/of13/match/39_IPV6_EXTHDR_Mask.json @@ -45,13 +45,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -105,13 +105,13 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -164,7 +164,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -220,14 +220,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -282,14 +282,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=33024)", + "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=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", @@ -343,7 +343,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=33024)", + "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=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -436,14 +436,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -533,14 +533,14 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34887)", + "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)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -629,7 +629,7 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34887)", + "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)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", @@ -720,15 +720,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "egress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -816,15 +816,15 @@ "tests":[ { "ingress":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=35047)", + "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='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" ], "PACKET_IN":[ - "ethernet(dst='22:22:22:22:22:22', src='11:11:11:11:11:11', ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(dst='20::20',ext_hdrs=[hop_opts(nxt=51), auth(nxt=6)],flow_label=100, src='10::10', nxt=0, hop_limit=64)", "tcp(dst_port=2222, option='\\x00\\x00\\x00\\x00', src_port=11111)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" @@ -911,9 +911,9 @@ "tests":[ { "ingress":[ - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=35047)", "itag(sid=203)", - "ethernet(dst='bb:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", + "ethernet(dst='ba:bb:bb:bb:bb:bb', src='aa:aa:aa:aa:aa:aa', ethertype=34525)", "ipv6(dst='b0::b0', flow_label=203, src='a0::a0', nxt=6, hop_limit=127)", "tcp(dst_port=6789, option='\\x11\\x11\\x11\\x11', src_port=12345)", "'\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\t\\n\\x0b\\x0c\\r\\x0e\\x0f\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f'" diff --git a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_00_1M.json b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_00_1M.json index 0fdbeaef..004beb95 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_00_1M.json +++ b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_00_1M.json @@ -56,7 +56,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -141,7 +141,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -226,8 +226,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":175, diff --git a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_01_10M.json b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_01_10M.json index a3e55f9b..e6239023 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_01_10M.json +++ b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_01_10M.json @@ -56,7 +56,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -141,7 +141,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -226,8 +226,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":1750, diff --git a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_02_100M.json b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_02_100M.json index 9c1e7e1d..718027f5 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_02_100M.json +++ b/ryu/tests/switch/of13/meter/01_DROP_00_KBPS_02_100M.json @@ -56,7 +56,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -141,7 +141,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -226,8 +226,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":17500, diff --git a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_00_100.json b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_00_100.json index 7cec0e62..9947d0bc 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_00_100.json +++ b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_00_100.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -143,7 +143,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -229,8 +229,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":200, diff --git a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_01_1000.json b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_01_1000.json index f4651ee7..4eabee07 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_01_1000.json +++ b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_01_1000.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -143,7 +143,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -229,8 +229,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":2000, diff --git a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_02_10000.json b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_02_10000.json index 36dabb70..70a2cc1f 100644 --- a/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_02_10000.json +++ b/ryu/tests/switch/of13/meter/01_DROP_01_PKTPS_02_10000.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -143,7 +143,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -229,8 +229,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":20000, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json index afd10b69..6e0a417a 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_00_1M.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -180,7 +180,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -303,8 +303,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":175, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json index c2c2f673..8516e8fc 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_01_10M.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -180,7 +180,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -303,8 +303,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":1750, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json index e1747326..77656d90 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_00_KBPS_02_100M.json @@ -57,7 +57,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -180,7 +180,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -303,8 +303,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":17500, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json index 12a2daaa..bc54f3bc 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_00_100.json @@ -58,7 +58,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -182,7 +182,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -306,8 +306,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":200, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json index 6a9b1b12..07e4b461 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_01_1000.json @@ -58,7 +58,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -182,7 +182,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -306,8 +306,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":2000, diff --git a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json index 9435d4f3..0f1eb6b8 100644 --- a/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json +++ b/ryu/tests/switch/of13/meter/02_DSCP_REMARK_01_PKTPS_02_10000.json @@ -58,7 +58,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2048)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2048)", "ipv4(proto=6, tos=96)", "tcp()", "str(\"\\x11\" * (1500 - 54))" @@ -182,7 +182,7 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=34525)", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=34525)", "ipv6(nxt=6, traffic_class=96)", "tcp()", "str(\"\\x11\" * (1500 - 74))" @@ -306,8 +306,8 @@ "ingress":{ "packets":{ "data":[ - "ethernet(ethertype=2054)", - "arp()", + "ethernet(dst='22:22:22:22:22:22', src='12:11:11:11:11:11', ethertype=2054)", + "arp(dst_mac='22:22:22:22:22:22', src_mac='12:11:11:11:11:11')", "str(\"\\x11\" * (1500 - 42))" ], "pktps":20000, |