From 2c4babd95c188b8b0038f6f39448cb469b9bc23a Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 5 May 2017 16:26:41 +0200 Subject: Func test reorg - decrease exec time per vpp patch - remove tests covered by make test - remove some negative tests Change-Id: I35d641562ee85888f7d1dd60dd892689b1e9c52d Signed-off-by: Jan Gelety Signed-off-by: Maciek Konstantynowicz --- .../eth2p-ethip4-ip4base-ip4dhcpclient-func.robot | 10 +- .../eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot | 2 +- .../eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot | 2 +- tests/func/gre/eth2p-ethip4gre-ip4base-func.robot | 2 +- .../iacl/eth2p-eth-l2xcbase-iaclbase-func.robot | 2 +- .../iacl/eth2p-ethip4-ip4base-iaclbase-func.robot | 2 +- .../ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot | 2 +- .../ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot | 2 +- .../ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot | 2 +- .../ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot | 2 +- tests/func/ipv4/eth2p-ethip4-ip4base-func.robot | 17 +- tests/func/ipv6/eth2p-ethip6-ip6base-func.robot | 17 +- .../func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot | 2 +- .../func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot | 2 +- tests/func/l2xc/eth2p-eth-l2xcbase-func.robot | 2 +- ...sectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 2 +- .../eth2p-ethip4ipsectptlispgpe-ip4base-func.robot | 2 +- ...sectptlispgpe-ip6base-eth-2vhost-1vm-func.robot | 2 +- .../eth2p-ethip4ipsectptlispgpe-ip6base-func.robot | 2 +- ...h2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot | 2 +- ...sectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 2 +- .../eth2p-ethip6ipsectptlispgpe-ip4base-func.robot | 2 +- ...sectptlispgpe-ip6base-eth-2vhost-1vm-func.robot | 2 +- .../eth2p-ethip6ipsectptlispgpe-ip6base-func.robot | 2 +- ...ethip6ip4-ip4base--ip6base-swiremape-func.robot | 2 +- .../eth2p-ethip4-ip4base-ip4ipfixbase-func.robot | 1 + .../eth2p-ethip4-ip4base-ip4ipfixscale-func.robot | 1 + .../eth2p-ethip6-ip6base-ip6ipfixbase-func.robot | 1 + .../eth2p-ethip6-ip6base-ip6ipfixscale-func.robot | 1 + ...-l2bdbase-vhost-client-reconnect-2vm-func.robot | 231 +++++++++++++++++++++ ...l2bdbase-vhost-clinent-reconnect-2vm-func.robot | 231 --------------------- ...ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot | 2 +- ...p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot | 2 +- ...2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot | 2 +- .../eth2p-dot1ad-l2xcbase-vlantrans22-func.robot | 2 +- ...q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot | 2 +- ...p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot | 2 +- ...h2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot | 2 +- .../eth2p-dot1q-l2xcbase-vlantrans11-func.robot | 2 +- tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot | 2 +- tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot | 2 +- 41 files changed, 288 insertions(+), 286 deletions(-) create mode 100644 tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot delete mode 100644 tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-clinent-reconnect-2vm-func.robot (limited to 'tests') diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot index 5507c956d5..5730e0e6b8 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot @@ -31,7 +31,7 @@ | ${lease_time}= | ${15} *** Test Cases *** -| VPP sends a DHCP DISCOVER +| TC01: VPP sends a DHCP DISCOVER | | [Documentation] | Configure DHCPv4 client on interface to TG without | | ... | hostname and check if DHCPv4 DISCOVER message contains all | | ... | required fields with expected values. @@ -43,7 +43,7 @@ | | Then Check DHCP DISCOVER header | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} -| VPP sends a DHCPv4 DISCOVER with hostname +| TC02: VPP sends a DHCPv4 DISCOVER with hostname | | [Documentation] | Configure DHCPv4 client on interface to TG with hostname | | ... | and check if DHCPv4 DISCOVER message contains all required | | ... | fields with expected values. @@ -56,7 +56,7 @@ | | Then Check DHCP DISCOVER header | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname} -| VPP sends DHCPv4 REQUEST after OFFER +| TC03: VPP sends DHCPv4 REQUEST after OFFER | | [Documentation] | Configure DHCPv4 client on interface to TG and check if | | ... | DHCPv4 REQUEST message contains all required fields. | | ... @@ -70,7 +70,7 @@ | | ... | ${tg_to_dut_if1_mac} | ${server_ip} | | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} -| VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID +| TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID | | [ Tags ] | EXPECTED_FAILING | | [Documentation] | Configure DHCPv4 client on interface to TG. If server | | ... | sends DHCPv4 OFFER with different XID as in DHCPv4 @@ -88,7 +88,7 @@ | | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} | | ... | offer_xid=${own_xid} -| VPP honors DHCPv4 lease time +| TC05: VPP honors DHCPv4 lease time | | [Documentation] | Send IP configuration to the VPP client via DHCPv4. | | ... | Address is checked with ICMP echo request and there should | | ... | be no reply for echo request when lease has expired. diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot index e503c7fe0f..531ed88aa5 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/dhcp_proxy.robot | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *DHCPv4 proxy test cases* diff --git a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot index 724150f929..6fede3e41c 100644 --- a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/dhcp_proxy.robot | Resource | resources/libraries/robot/ipv6.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *DHCPv6 proxy test cases* diff --git a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot index 7087e31326..2a8b5df299 100644 --- a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot +++ b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot @@ -19,7 +19,7 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace -| Force Tags | VM_ENV | HW_ENV +| Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *GREoIPv4 test cases* diff --git a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot index 1914130bac..bdf3b5f6e5 100644 --- a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot @@ -20,7 +20,7 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *Ingress ACL test cases* diff --git a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot index ff55d94374..26df7a8480 100644 --- a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot @@ -22,7 +22,7 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *IPv4 routing with ingress ACL test cases* diff --git a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot index e7c2967cf9..2db3899ae8 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/ipsec.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| ... | VM_ENV | HW_ENV +| ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH | Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} diff --git a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot index ca7f1b38fb..31cc3a65b7 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/ipsec.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| ... | VM_ENV | HW_ENV +| ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH | Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot index 60b71fe9d5..0165931990 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/ipsec.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| ... | VM_ENV | HW_ENV +| ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH | Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot index 517c01b665..5f2e0413b0 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot @@ -15,7 +15,7 @@ | Resource | resources/libraries/robot/ipsec.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| ... | VM_ENV | HW_ENV +| ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH | Test Setup | Run Keywords | Func Test Setup | ... | AND | Setup Topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot index 158dd896f1..71b3da4092 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/default.robot | Resource | resources/libraries/robot/interfaces.robot | Resource | resources/libraries/robot/ipv4.robot -| Force Tags | HW_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords | ... | Setup all DUTs before test | AND | ... | Setup all TGs before traffic script | AND @@ -47,7 +47,7 @@ | | [Documentation] | | ... | Make TG send ICMPv4 Echo Req to DUT ingress interface. Make TG\ | | ... | verify ICMP Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV +| | [Tags] | VM_ENV | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -56,10 +56,10 @@ | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 | TC02: DUT routes IPv4 to its egress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv4 Echo Req towards DUT1 egress interface\ | | ... | connected to DUT2. Make TG verify ICMPv4 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -68,10 +68,10 @@ | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 | TC03: DUT1 routes IPv4 to DUT2 ingress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv4 Echo Req towards DUT2 ingress interface\ | | ... | connected to DUT1. Make TG verify ICMPv4 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -80,10 +80,10 @@ | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 | TC04: DUT1 routes IPv4 to DUT2 egress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv4 Echo Req towards DUT2 egress interface\ | | ... | connected to TG. Make TG verify ICMPv4 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -92,10 +92,10 @@ | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 | TC05: DUT1 and DUT2 route IPv4 between TG interfaces +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv4 Echo Req between its interfaces across DUT1\ | | ... | and DUT2. Make TG verify ICMPv4 Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Compute Path | | ${src_port} | ${src_node}= | First Interface @@ -104,11 +104,11 @@ | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 | TC06: DUT replies to ICMPv4 Echo Reqs with size 64B-to-1500B-incr-1B +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | TC07: DUT replies to ICMPv4 Echo Reqs with size 1500B-to-9000B-incr-10B @@ -116,7 +116,6 @@ | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} @@ -133,7 +132,7 @@ | | ... | 1452 | ${end_size} | 10 | TC08: DUT replies to ARP request +| | [Tags] | VM_ENV | SKIP_VPP_PATCH | | [Documentation] | | ... | Make TG send ARP Request to DUT and verify ARP Reply is correct.\ -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Send ARP request and validate response | ${nodes['TG']} | ${nodes['DUT1']} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot index 4eed078f4a..d08c291f4f 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/counters.robot | Resource | resources/libraries/robot/default.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} -| Force Tags | HW_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords | ... | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} | AND | ... | Vpp nodes ra suppress link layer | ${nodes} | AND @@ -45,18 +45,18 @@ *** Test Cases *** | TC01: DUT replies to ICMPv6 Echo Req to its ingress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req to DUT ingress interface. Make TG\ | | ... | verify ICMPv6 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 icmp echo | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} | TC02: DUT replies to ICMPv6 Echo Req pkt with size 64B-to-1500B-incr-1B +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr} | TC03: DUT replies to ICMPv6 Echo Req pkt with size 1500B-to-9000B-incr-10B @@ -64,7 +64,6 @@ | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv6 Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} @@ -81,41 +80,41 @@ | | ... | 1452 | ${end_size} | 10 | ${nodes_ipv6_addr} | TC04: DUT routes to its egress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT1 egress interface\ | | ... | connected to DUT2. Make TG verify ICMPv6 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} | | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC05: DUT1 routes to DUT2 ingress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 ingress interface\ | | ... | connected to DUT1. Make TG verify ICMPv6 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC06: DUT1 routes to DUT2 egress interface +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 egress interface\ | | ... | connected to TG. Make TG verify ICMPv6 Echo Reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 tg to dut2 egress via dut1 | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC07: DUT1 and DUT2 route between TG interfaces +| | [Tags] | VM_ENV | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req between its interfaces across DUT1\ | | ... | and DUT2. Make TG verify ICMPv6 Echo Replies are correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 tg to tg routed | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | | ... | ${nodes_ipv6_addr} | TC08: DUT replies to IPv6 Neighbor Solicitation +| | [Tags] | VM_ENV | | [Documentation] | | ... | On DUT configure interface IPv6 address in the main routing\ | | ... | domain. Make TG send Neighbor Solicitation message on the link | | ... | to DUT and verify DUT Neighbor Advertisement reply is correct. -| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | | Ipv6 neighbor solicitation | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot index a0336e5cc8..160bf57ef4 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV +| Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2 bridge-domain test cases* diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot index 271852e7e6..a369d8e642 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/testing_path.robot | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV +| Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2 bridge-domain test cases* diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot index aa25225f44..9aa606a0c9 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot @@ -21,7 +21,7 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2 cross-connect test cases* diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index e3f94250a2..74d25e8d02 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -33,7 +33,7 @@ # Import configuration and test data: | Variables | resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py | ... -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index c6cd734fe6..b78dacbefa 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -33,7 +33,7 @@ # Import configuration and test data: | Variables | resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py | ... -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index 386e7e7efb..cc79d239e6 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index 76d64e4824..e0b73c7185 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index f62b62f2fc..16a10139f0 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 49b0481425..9a1800b608 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot index 7960345965..150a6fee92 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot @@ -35,7 +35,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index 36f8458e24..c470b3c38e 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Run Keywords | Func Test Setup | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot index aee2dfaadb..8475a68363 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot @@ -36,7 +36,7 @@ | Resource | resources/libraries/robot/bridge_domain.robot # Import configuration and test data: | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... | Test Setup | Run Keywords | Func Test Setup | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot index ed98967f4a..2773980807 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot @@ -21,7 +21,7 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Variables | resources/test_data/softwire/map_e_domains.py | ${5} -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *Test for Basic mapping rule for MAP-E*\ diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot index c0d975afbc..3313f3e399 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot @@ -165,6 +165,7 @@ | | ... | ${tg_to_dut1} | ${dut1_to_tg} | ${tg_to_dut1_ip} | ${dut2_to_dut1_ip} | TC05: DUT reports packet flow for traffic by source and destination port +| | [Tags] | SKIP_VPP_PATCH | | [Documentation] | | ... | [Top] TG-DUT1-DUT2-TG. [Cfg] On DUT1 configure IPFIX with TG interface | | ... | address as collector and add classify session with TG source address diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot index 30509b20c7..ef2cdf3997 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot @@ -22,6 +22,7 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING +| ... | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *IPFIX ipv4 test cases* diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot index 8451eb6940..7e92174ac7 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot @@ -157,6 +157,7 @@ | | ... | ${dut2_to_dut1_ip} | TC04: DUT reports packet flow for traffic by source and destination port +| | [Tags] | SKIP_VPP_PATCH | | [Documentation] | | ... | [Top] TG-DUT1-DUT2-TG. [Cfg] On DUT1 configure IPFIX with TG interface | | ... | address as collector and add classify session with TG source address diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot index 125e8b92af..e3a0bc1f4a 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot @@ -23,6 +23,7 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING +| ... | SKIP_VPP_PATCH # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown diff --git a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot new file mode 100644 index 0000000000..c235212048 --- /dev/null +++ b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot @@ -0,0 +1,231 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/bridge_domain.robot +| Resource | resources/libraries/robot/testing_path.robot +| Resource | resources/libraries/robot/qemu.robot +| Resource | resources/libraries/robot/vxlan.robot +| Library | resources.libraries.python.Trace +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV +| Test Setup | Func Test Setup +| Test Teardown | Run Keywords +| ... | resources.libraries.python.QemuUtils.Qemu Kill All | ${dut_node} | AND +| ... | Func Test Teardown +| Documentation | *Vhost-User Interface Traffic Tests* +| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links +| ... | between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-VXLAN-ETH-IP on TG-DUT link. +| ... | ETH-IP on VirtualEthernet-VM interface. +| ... | *[Cfg] DUT configuration:* On DUT is running 2 VM with 2 vhost-user +| ... | interface on each VM. DUT is configured with VXLAN and vhost-user +| ... | interfaces in bridge-domain (L2BD). +| ... | *[Cfg] VM configuration:* VM has both vhost-user interfaces added into +| ... | Linux Bridge. +| ... | *[Ver] TG verification:* +| ... | VXLAN packet is send to DUT where is decapsulated and send bridged to +| ... | vhost-user inteface. VM forwards frame to its second interface and VPP +| ... | encapsulates it to another VXLAN tunnel. Packets +| ... | are sent and received by TG on link to DUT. + +*** Variables *** +| ${tg_if1_ip}= | 192.168.0.1 +| ${dut_if1_ip}= | 192.168.0.2 +| ${prefix_length}= | ${24} + +| ${sock_vm1_1}= | /tmp/sock1 +| ${sock_vm1_2}= | /tmp/sock2 +| ${sock_vm2_1}= | /tmp/sock3 +| ${sock_vm2_2}= | /tmp/sock4 + +*** Test Cases *** +| TC01: Qemu reconnects to VPPs vhost-user when Qemu is killed and restarted +| | Given Path for 2-node testing is set +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Interfaces in 2-node path are up +| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} +| | ... | ${prefix_length} +| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} +| | ... | ${tg_to_dut_if1_mac} +| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | And Set Interface State | ${dut_node} | ${vxlan1} | up +| | And Set Interface State | ${dut_node} | ${vxlan2} | up +| | And Set Interface State | ${dut_node} | ${vxlan3} | up +| | And Set Interface State | ${dut_node} | ${vxlan4} | up +| | ${vhost_if1}= | And Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock_vm1_1} +| | ${vhost_if2}= | And Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock_vm1_2} +| | ${vhost_if3}= | And Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock_vm2_1} +| | ${vhost_if4}= | And Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock_vm2_2} +| | And Set Interface State | ${dut_node} | ${vhost_if1} | up +| | And Set Interface State | ${dut_node} | ${vhost_if2} | up +| | And Set Interface State | ${dut_node} | ${vhost_if3} | up +| | And Set Interface State | ${dut_node} | ${vhost_if4} | up +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} +| | ... | ${vhost_if1} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} +| | ... | ${vhost_if2} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} +| | ... | ${vhost_if3} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} +| | ... | ${vhost_if4} +| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | ... | ${1} +| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | ... | ${2} +| | And Check traffic through VM +| | When Run keyword | qemu-1.Qemu Kill +| | ${vm1}= | And Run Keyword | qemu-1.Qemu Start +| | ${vhost_int_1}= | And Get Vhost User If Name By Sock | ${vm1} +| | ... | ${sock_vm1_1} +| | ${vhost_int_2}= | And Get Vhost User If Name By Sock | ${vm1} +| | ... | ${sock_vm1_2} +| | And Linux Add Bridge | ${vm1} | br0 | ${vhost_int_1} | ${vhost_int_2} +| | And Set Interface State | ${vm1} | ${vhost_int_1} | up | if_type=name +| | And Set Interface State | ${vm1} | ${vhost_int_2} | up | if_type=name +| | Then Check traffic through VM + + +| TC02: VPP reconnects to Qemu vhost-user when VPP is restarted and reconfigured +| | [Tags] | EXPECTED_FAILING +| | [Documentation] +| | ... | *Failing:* Qemu doesn't support reconnect prior to version 2.7. +| | Given Path for 2-node testing is set +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Interfaces in 2-node path are up +| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} +| | ... | ${prefix_length} +| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} +| | ... | ${tg_to_dut_if1_mac} +| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | And Set Interface State | ${dut_node} | ${vxlan1} | up +| | And Set Interface State | ${dut_node} | ${vxlan2} | up +| | And Set Interface State | ${dut_node} | ${vxlan3} | up +| | And Set Interface State | ${dut_node} | ${vxlan4} | up +| | ${vhost_if1}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm1_1} +| | ${vhost_if2}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm1_2} +| | ${vhost_if3}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm2_1} +| | ${vhost_if4}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm2_2} +| | And Set Interface State | ${dut_node} | ${vhost_if1} | up +| | And Set Interface State | ${dut_node} | ${vhost_if2} | up +| | And Set Interface State | ${dut_node} | ${vhost_if3} | up +| | And Set Interface State | ${dut_node} | ${vhost_if4} | up +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} +| | ... | ${vhost_if1} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} +| | ... | ${vhost_if2} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} +| | ... | ${vhost_if3} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} +| | ... | ${vhost_if4} +| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | ... | ${1} +| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | ... | ${2} +| | And Check traffic through VM +| | And Check VPP PID in Teardown +| | When Setup All Duts ${nodes} +| | And Save VPP PIDs +| | And Interfaces in 2-node path are up +| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} +| | ... | ${prefix_length} +| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} +| | ... | ${tg_to_dut_if1_mac} +| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} +| | And Set Interface State | ${dut_node} | ${vxlan1} | up +| | And Set Interface State | ${dut_node} | ${vxlan2} | up +| | And Set Interface State | ${dut_node} | ${vxlan3} | up +| | And Set Interface State | ${dut_node} | ${vxlan4} | up +| | ${vhost_if1}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm1_1} +| | ${vhost_if2}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm1_2} +| | ${vhost_if3}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm2_1} +| | ${vhost_if4}= | And Vpp Create Vhost User Interface | ${dut_node} +| | ... | ${sock_vm2_2} +| | And Set Interface State | ${dut_node} | ${vhost_if1} | up +| | And Set Interface State | ${dut_node} | ${vhost_if2} | up +| | And Set Interface State | ${dut_node} | ${vhost_if3} | up +| | And Set Interface State | ${dut_node} | ${vhost_if4} | up +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} +| | ... | ${vhost_if1} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} +| | ... | ${vhost_if2} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} +| | ... | ${vhost_if3} +| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} +| | ... | ${vhost_if4} +| | Then Check traffic through VM + + +*** Keywords *** +| Setup QEMU Vhost and Run VM +| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_id} +| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} +| | ... | WITH NAME | qemu-${qemu_id} +| | ${q_add_vhost}= | Replace Variables | qemu-${qemu_id}.Qemu Add Vhost User If +| | ${q_set_node}= | Replace Variables | qemu-${qemu_id}.Qemu Set Node +| | ${q_start}= | Replace Variables | qemu-${qemu_id}.Qemu Start +| | Run keyword | ${q_set_node} | ${dut_node} +| | Run keyword | ${q_add_vhost} | ${sock1} +| | Run keyword | ${q_add_vhost} | ${sock2} +| | ${vm}= | Run keyword | ${q_start} +| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} +| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} +| | Linux Add Bridge | ${vm} | br0 | ${vhost1} | ${vhost2} +| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name +| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name +| | Set Test Variable | ${qemu-${qemu_id}} | ${vm} + +| Check traffic through VM +| | [Documentation] | Send VXLAN traffic through both configured VMs. +| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} +| | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${101} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${102} +| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} +| | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${103} +| | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${104} diff --git a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-clinent-reconnect-2vm-func.robot b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-clinent-reconnect-2vm-func.robot deleted file mode 100644 index 84c3da8a50..0000000000 --- a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-clinent-reconnect-2vm-func.robot +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -*** Settings *** -| Resource | resources/libraries/robot/default.robot -| Resource | resources/libraries/robot/bridge_domain.robot -| Resource | resources/libraries/robot/testing_path.robot -| Resource | resources/libraries/robot/qemu.robot -| Resource | resources/libraries/robot/vxlan.robot -| Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 2_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords -| ... | resources.libraries.python.QemuUtils.Qemu Kill All | ${dut_node} | AND -| ... | Func Test Teardown -| Documentation | *Vhost-User Interface Traffic Tests* -| ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links -| ... | between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-VXLAN-ETH-IP on TG-DUT link. -| ... | ETH-IP on VirtualEthernet-VM interface. -| ... | *[Cfg] DUT configuration:* On DUT is running 2 VM with 2 vhost-user -| ... | interface on each VM. DUT is configured with VXLAN and vhost-user -| ... | interfaces in bridge-domain (L2BD). -| ... | *[Cfg] VM configuration:* VM has both vhost-user interfaces added into -| ... | Linux Bridge. -| ... | *[Ver] TG verification:* -| ... | VXLAN packet is send to DUT where is decapsulated and send bridged to -| ... | vhost-user inteface. VM forwards frame to its second interface and VPP -| ... | encapsulates it to another VXLAN tunnel. Packets -| ... | are sent and received by TG on link to DUT. - -*** Variables *** -| ${tg_if1_ip}= | 192.168.0.1 -| ${dut_if1_ip}= | 192.168.0.2 -| ${prefix_length}= | ${24} - -| ${sock_vm1_1}= | /tmp/sock1 -| ${sock_vm1_2}= | /tmp/sock2 -| ${sock_vm2_1}= | /tmp/sock3 -| ${sock_vm2_2}= | /tmp/sock4 - -*** Test Cases *** -| TC01: Qemu reconnects to VPPs vhost-user when Qemu is killed and restarted -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} -| | ... | ${prefix_length} -| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} -| | ... | ${tg_to_dut_if1_mac} -| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | And Set Interface State | ${dut_node} | ${vxlan1} | up -| | And Set Interface State | ${dut_node} | ${vxlan2} | up -| | And Set Interface State | ${dut_node} | ${vxlan3} | up -| | And Set Interface State | ${dut_node} | ${vxlan4} | up -| | ${vhost_if1}= | And Vpp Create Vhost User Interface -| | ... | ${dut_node} | ${sock_vm1_1} -| | ${vhost_if2}= | And Vpp Create Vhost User Interface -| | ... | ${dut_node} | ${sock_vm1_2} -| | ${vhost_if3}= | And Vpp Create Vhost User Interface -| | ... | ${dut_node} | ${sock_vm2_1} -| | ${vhost_if4}= | And Vpp Create Vhost User Interface -| | ... | ${dut_node} | ${sock_vm2_2} -| | And Set Interface State | ${dut_node} | ${vhost_if1} | up -| | And Set Interface State | ${dut_node} | ${vhost_if2} | up -| | And Set Interface State | ${dut_node} | ${vhost_if3} | up -| | And Set Interface State | ${dut_node} | ${vhost_if4} | up -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} -| | ... | ${vhost_if1} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} -| | ... | ${vhost_if2} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} -| | ... | ${vhost_if3} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} -| | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} -| | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} -| | ... | ${2} -| | And Check traffic through VM -| | When Run keyword | qemu-1.Qemu Kill -| | ${vm1}= | And Run Keyword | qemu-1.Qemu Start -| | ${vhost_int_1}= | And Get Vhost User If Name By Sock | ${vm1} -| | ... | ${sock_vm1_1} -| | ${vhost_int_2}= | And Get Vhost User If Name By Sock | ${vm1} -| | ... | ${sock_vm1_2} -| | And Linux Add Bridge | ${vm1} | br0 | ${vhost_int_1} | ${vhost_int_2} -| | And Set Interface State | ${vm1} | ${vhost_int_1} | up | if_type=name -| | And Set Interface State | ${vm1} | ${vhost_int_2} | up | if_type=name -| | Then Check traffic through VM - - -| TC02: VPP reconnects to Qemu vhost-user when VPP is restarted and reconfigured -| | [Tags] | EXPECTED_FAILING -| | [Documentation] -| | ... | *Failing:* Qemu doesn't support reconnect prior to version 2.7. -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} -| | ... | ${prefix_length} -| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} -| | ... | ${tg_to_dut_if1_mac} -| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | And Set Interface State | ${dut_node} | ${vxlan1} | up -| | And Set Interface State | ${dut_node} | ${vxlan2} | up -| | And Set Interface State | ${dut_node} | ${vxlan3} | up -| | And Set Interface State | ${dut_node} | ${vxlan4} | up -| | ${vhost_if1}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm1_1} -| | ${vhost_if2}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm1_2} -| | ${vhost_if3}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm2_1} -| | ${vhost_if4}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm2_2} -| | And Set Interface State | ${dut_node} | ${vhost_if1} | up -| | And Set Interface State | ${dut_node} | ${vhost_if2} | up -| | And Set Interface State | ${dut_node} | ${vhost_if3} | up -| | And Set Interface State | ${dut_node} | ${vhost_if4} | up -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} -| | ... | ${vhost_if1} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} -| | ... | ${vhost_if2} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} -| | ... | ${vhost_if3} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} -| | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} -| | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} -| | ... | ${2} -| | And Check traffic through VM -| | And Check VPP PID in Teardown -| | When Setup All Duts ${nodes} -| | And Save VPP PIDs -| | And Interfaces in 2-node path are up -| | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} -| | ... | ${prefix_length} -| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} -| | ... | ${tg_to_dut_if1_mac} -| | ${vxlan1}= | And Create VXLAN interface | ${dut_node} | ${101} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan2}= | And Create VXLAN interface | ${dut_node} | ${102} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan3}= | And Create VXLAN interface | ${dut_node} | ${103} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | ${vxlan4}= | And Create VXLAN interface | ${dut_node} | ${104} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} -| | And Set Interface State | ${dut_node} | ${vxlan1} | up -| | And Set Interface State | ${dut_node} | ${vxlan2} | up -| | And Set Interface State | ${dut_node} | ${vxlan3} | up -| | And Set Interface State | ${dut_node} | ${vxlan4} | up -| | ${vhost_if1}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm1_1} -| | ${vhost_if2}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm1_2} -| | ${vhost_if3}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm2_1} -| | ${vhost_if4}= | And Vpp Create Vhost User Interface | ${dut_node} -| | ... | ${sock_vm2_2} -| | And Set Interface State | ${dut_node} | ${vhost_if1} | up -| | And Set Interface State | ${dut_node} | ${vhost_if2} | up -| | And Set Interface State | ${dut_node} | ${vhost_if3} | up -| | And Set Interface State | ${dut_node} | ${vhost_if4} | up -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${101} | ${vxlan1} -| | ... | ${vhost_if1} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${102} | ${vxlan2} -| | ... | ${vhost_if2} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${103} | ${vxlan3} -| | ... | ${vhost_if3} -| | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} -| | ... | ${vhost_if4} -| | Then Check traffic through VM - - -*** Keywords *** -| Setup QEMU Vhost and Run VM -| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_id} -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} -| | ... | WITH NAME | qemu-${qemu_id} -| | ${q_add_vhost}= | Replace Variables | qemu-${qemu_id}.Qemu Add Vhost User If -| | ${q_set_node}= | Replace Variables | qemu-${qemu_id}.Qemu Set Node -| | ${q_start}= | Replace Variables | qemu-${qemu_id}.Qemu Start -| | Run keyword | ${q_set_node} | ${dut_node} -| | Run keyword | ${q_add_vhost} | ${sock1} -| | Run keyword | ${q_add_vhost} | ${sock2} -| | ${vm}= | Run keyword | ${qemu_start} -| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} -| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} -| | Linux Add Bridge | ${vm} | br0 | ${vhost1} | ${vhost2} -| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name -| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name -| | Set Test Variable | ${qemu-${qemu_id}} | ${vm} - -| Check traffic through VM -| | [Documentation] | Send VXLAN traffic through both configured VMs. -| | Send VXLAN receive VXLAN Packet | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} -| | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${101} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${102} -| | Send VXLAN receive VXLAN Packet | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} -| | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${103} -| | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${104} diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot index 73836c38f0..c48d2ca45c 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2BD with VLAN tag rewrite test cases - transalte-2-1* diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot index 0e2749c5c9..bf65f87acb 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-1* diff --git a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot index 4efa90d419..48edbd54f9 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2BD with VLAN tag rewrite test cases - translate-2-2* diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot index 49368ea003..b96f291b97 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-2* diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot index 3867baa5b4..6f61c7880b 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-2* diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot index 98f43799c0..c886247fba 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-2* diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot index a0c245e51d..c122dbdbcb 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-1* diff --git a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot index 91869ba073..cccd89edea 100644 --- a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot @@ -17,7 +17,7 @@ | Resource | resources/libraries/robot/tagging.robot | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace -| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-1* diff --git a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot index f2413ff612..d34eff2537 100644 --- a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot @@ -21,7 +21,7 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *Vpn routed forwarding - baseline IPv4* diff --git a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot index acbf7ea543..eda02a7161 100644 --- a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot @@ -21,7 +21,7 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH | Test Setup | Func Test Setup | Test Teardown | Func Test Teardown | Documentation | *Vpn routed forwarding - baseline IPv6* -- cgit 1.2.3-korg