From 8fef592605b149fb207b6617678c721ab8453c94 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 13 Aug 2019 22:57:07 +0200 Subject: [PATCH] FIX: Remove eth_avf and portX_vifY interfaces from topo in TC/TS tear down Change-Id: I90901c4ab14dfa76dc3e1f786a4b986479e0ba47 Signed-off-by: Jan Gelety --- resources/libraries/python/InterfaceUtil.py | 6 ++--- resources/libraries/python/topology.py | 31 +++++++++++++++++++++- .../libraries/robot/shared/suite_teardown.robot | 6 +++++ .../eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot | 1 + .../ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot | 2 +- ...0ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot | 2 +- ...10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot | 2 +- .../10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot | 2 +- ...n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot | 2 +- ...0ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot | 2 +- ...10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot | 2 +- ...-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot | 2 +- ...10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot | 2 +- .../l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot | 2 +- .../l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot | 2 +- ...1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot | 2 +- ...10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot | 2 +- .../2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot | 2 +- .../2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot | 2 +- 19 files changed, 55 insertions(+), 19 deletions(-) diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 1f79d7e679..11ddf7f913 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1455,12 +1455,12 @@ class InterfaceUtil(object): @staticmethod def init_avf_interface(node, ifc_key, numvfs=1, osi_layer='L2'): - """Init PCI device by creating VFs and bind them to vfio-pci for AVF + """Init PCI device by creating VIFs and bind them to vfio-pci for AVF driver testing on DUT. :param node: DUT node. :param ifc_key: Interface key from topology file. - :param numvfs: Number of VFs to initialize, 0 - disable the VFs. + :param numvfs: Number of VIFs to initialize, 0 - disable the VIFs. :param osi_layer: OSI Layer type to initialize TG with. Default value "L2" sets linux interface spoof off. :type node: dict @@ -1518,7 +1518,7 @@ class InterfaceUtil(object): DUTSetup.pci_vf_driver_bind(node, pf_pci_addr, vf_id, uio_driver) # Add newly created ports into topology file - vf_ifc_name = '{pf_if_key}_vf'.format(pf_if_key=ifc_key) + vf_ifc_name = '{pf_if_key}_vif'.format(pf_if_key=ifc_key) vf_pci_addr = DUTSetup.get_virtfn_pci_addr(node, pf_pci_addr, vf_id) vf_ifc_key = Topology.add_new_port(node, vf_ifc_name) Topology.update_interface_name(node, vf_ifc_key, diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index 698c97b426..1e5ce4bd62 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -13,6 +13,8 @@ """Defines nodes and topology structure.""" +import re + from collections import Counter from yaml import load @@ -59,6 +61,7 @@ class NodeSubTypeTG(object): # IxNetwork IXNET = 'IXNET' + DICT__nodes = load_topo_from_yaml() @@ -139,13 +142,39 @@ class Topology(object): """ port_types = ('subinterface', 'vlan_subif', 'memif', 'tap', 'vhost', 'loopback', 'gre_tunnel', 'vxlan_tunnel', 'eth_bond', - 'avf') + 'eth_avf') for node_data in nodes.values(): if node_data['type'] == NodeType.DUT: for ptype in port_types: Topology.remove_all_ports(node_data, ptype) + @staticmethod + def remove_all_vif_ports(node): + """Remove all Virtual Interfaces on DUT node. + + :param node: Node to remove VIF ports on. + :type node: dict + :returns: Nothing + """ + reg_ex = re.compile(r'port\d+_vif\d+') + for if_key in list(node['interfaces']): + if re.match(reg_ex, if_key): + node['interfaces'].pop(if_key) + + @staticmethod + def remove_all_added_vif_ports_on_all_duts_from_topology(nodes): + """Remove all added Virtual Interfaces on all DUT nodes in + the topology. + + :param nodes: Nodes in the topology. + :type nodes: dict + :returns: Nothing + """ + for node_data in nodes.values(): + if node_data['type'] == NodeType.DUT: + Topology.remove_all_vif_ports(node_data) + @staticmethod def update_interface_sw_if_index(node, iface_key, sw_if_index): """Update sw_if_index on the interface from the node. diff --git a/resources/libraries/robot/shared/suite_teardown.robot b/resources/libraries/robot/shared/suite_teardown.robot index e5db4f05d8..a6c021e355 100644 --- a/resources/libraries/robot/shared/suite_teardown.robot +++ b/resources/libraries/robot/shared/suite_teardown.robot @@ -45,3 +45,9 @@ | | :FOR | ${dut} | IN | @{duts} | | | Cleanup DPDK Environment | | | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2} + +| Additional Suite Tear Down Action For vifs +| | [Documentation] +| | ... | Additional teardown for suites which uses Virtual Interfaces. +| | ... +| | Remove All Added VIF Ports On All DUTs From Topology | ${nodes} diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot index b75b89c879..9d79d80a0a 100644 --- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot @@ -18,6 +18,7 @@ | ... | NIC_Virtual | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | avf | scapy +| Suite Teardown | Tear down suite | vifs | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot index 7be6e27fc5..bd92299d81 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-eth-ip4base-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | IP4BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot index 658e2a3d5e..ae3297f241 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_200K | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot index 75132729c9..c0cfe85513 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_20K | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot index c111b6a9cc..8264fdd986 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_2M | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot index b38437aec4..cc3a5f74b4 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | IP4BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot index c5dd1d39d0..bbdcf11453 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale200k-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_200k | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot index 35aefc0efc..47ce853c29 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale20k-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_20k | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot index 066f145223..6d4f7d1773 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | IP4FWD | SCALE | FIB_2M | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot index c49a478694..f94caf3378 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot index 52c8edf4fb..0e40fce2c1 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2PATCH | BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot index 558694a671..af329fb4af 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot index bcf5764c21..b582bcaf9e 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot index 4865f69308..92361082dd 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot index 165e816cb6..a208e5b2cc 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2PATCH | BASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot index ac55264e74..8d8594ab77 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot @@ -18,7 +18,7 @@ | ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | DRV_AVF | ... | Suite Setup | Setup suite single link | performance_avf -| Suite Teardown | Tear down suite | performance +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test | Test Teardown | Tear down test | performance | ... -- 2.16.6