From fe1975eb1ac994df1bd759deda7154bb7dd9d7a7 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 18 Mar 2019 13:30:11 +0100 Subject: CSIT-1468: InterfaceUtil migration from VAT to PAPI Change-Id: I0062710d58996be767a852dc00545fedd60a5c72 Signed-off-by: Jan Gelety --- tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot | 1 + tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot | 1 + .../device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot | 1 + tests/vpp/func/interfaces/api-crud-tap-func.robot | 4 ++-- .../vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot | 3 +++ .../ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot | 3 +++ .../ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 4 ++-- 7 files changed, 13 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot index 22bb4c3b4f..7c9c302da6 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot @@ -63,6 +63,7 @@ | | ... | ${tg_to_dut_if1} | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if1_mac} | | ... | ${hops} +| | Get interface Ipv4 addresses | ${nodes['DUT1']} | ${dut_to_tg_if1} | tc02-eth2p-ethicmpv4-ip4base-device_echo-req-to-dut-egress-interface | | [Documentation] diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot index 9993c922f5..eca76cb2e3 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot @@ -64,6 +64,7 @@ | | ... | ${tg_to_dut_if1} | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if1_mac} | | ... | ${hops} +| | Get interface Ipv6 addresses | ${nodes['DUT1']} | ${dut_to_tg_if1} | tc02-eth2p-ethicmpv6-ip6base-device_echo-req-to-dut-egress-interface | | [Documentation] diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot index b182b0198f..fb59971d70 100644 --- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot @@ -71,6 +71,7 @@ | | ... | ${sock2} | | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | And Get Vhost dump | ${dut_node} | tc02-eth2p-ethip6-l2xcbase-eth-2vhost-1vm-device | | [Documentation] diff --git a/tests/vpp/func/interfaces/api-crud-tap-func.robot b/tests/vpp/func/interfaces/api-crud-tap-func.robot index e0df1f2cb1..53c9038507 100644 --- a/tests/vpp/func/interfaces/api-crud-tap-func.robot +++ b/tests/vpp/func/interfaces/api-crud-tap-func.robot @@ -24,7 +24,7 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | ... -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_TEST +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | ... | Test Setup | Set up TAP functional test | ... @@ -66,5 +66,5 @@ | | And Check Tap Present | ${dut_node} | ${tap_int2} | | When Delete Tap Interface | ${dut_node} | ${int2} | | Then Run Keyword And Expect Error -| | ... | ValueError: No JSON object could be decoded +| | ... | Tap interface :${tap_int2} does not exist | | ... | Check Tap Present | ${dut_node} | ${tap_int2} diff --git a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot index aa88be5731..f76ff689f5 100644 --- a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot +++ b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot @@ -64,3 +64,6 @@ | | And Configure L2XC | ${dut2_node} | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} +| | And Get VXLAN dump | ${dut1_node} +| | And Get VXLAN dump | ${dut1_node} | interface=vxlan_tunnel0 +| | And Get VXLAN dump | ${dut2_node} | interface=${dut2s_vxlan} diff --git a/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot index 74463c22c5..2d9ee14038 100644 --- a/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot +++ b/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot @@ -77,3 +77,6 @@ | | ... | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} +| | And Get VXLAN dump | ${dut1_node} +| | And Get VXLAN dump | ${dut1_node} | interface=vxlan_tunnel0 +| | And Get VXLAN dump | ${dut2_node} | interface=${dut2s_vxlan} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 203c25d018..d9a0c3d729 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -129,9 +129,9 @@ | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ${lisp1_if_idx}= | resources.libraries.python.InterfaceUtil.Get Sw If Index -| | ... | ${dut1_node} | lisp_gpe0 +| | ... | ${dut1_node} | lisp_gpe0.0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.Get Sw If Index -| | ... | ${dut2_node} | lisp_gpe0 +| | ... | ${dut2_node} | lisp_gpe0.0 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} -- cgit 1.2.3-korg