From 283df174218fb02afdd83f7d704f6ac8cf35365c Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 17 Jan 2020 18:53:27 +0100 Subject: FIX: nfv_density - use correct osi_layer=L2 (so L2 spoofing check is switched off in case of avf driver) - add pci address information to eth interface in topology file - nfv_density chain_ipsec tests work only with DPDK in current implementation Change-Id: I233c6e5634a14581960c7459b87f11fcee8365bd Signed-off-by: Jan Gelety (cherry picked from commit f31b70ee422ed0dc4e5d9b60061a1c2cfc904684) --- .../libraries/bash/function/mrr-daily-3n-skx.txt | 64 +++++++++++----------- resources/libraries/python/InterfaceUtil.py | 10 ++-- 2 files changed, 38 insertions(+), 36 deletions(-) (limited to 'resources/libraries') diff --git a/resources/libraries/bash/function/mrr-daily-3n-skx.txt b/resources/libraries/bash/function/mrr-daily-3n-skx.txt index 127462682f..ce2f88ca1f 100644 --- a/resources/libraries/bash/function/mrr-daily-3n-skx.txt +++ b/resources/libraries/bash/function/mrr-daily-3n-skx.txt @@ -380,49 +380,49 @@ 4c AND 64b AND mrr AND xxv710 AND drv_vfio_pci AND eth-l2patch ## ./lb ## ./nfv_density/dcr_memif/chain -## ./nfv_density/dcr_memif/chain_ipsec +## ./nfv_density/dcr_memif/chain_ipsec - currently work only with DPDK ### intel-xxv710 -#### avf +#### dpdk-vfio-pci ##### ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm ##### ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm ##### ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm ##### ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm ##### ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm ##### ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm ##### ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm ##### ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm ##### ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm ##### ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -1c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -2c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm -4c AND imix AND mrr AND xxv710 AND drv_avf AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +1c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +2c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm +4c AND imix AND mrr AND xxv710 AND drv_vfio_pci AND ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm ## ./nfv_density/dcr_memif/pipeline ## ./nfv_density/vm_vhost/chain ## ./nfv_density/vm_vhost/chain_dot1qip4vxlan diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 552d0004ee..0f18f8f807 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1159,7 +1159,7 @@ class InterfaceUtil: :type ifc_name: str :type sw_if_index: int :type ifc_pfx: str - :type ifc_pfx: host_if_key + :type host_if_key: str """ if_key = Topology.add_new_port(node, ifc_pfx) @@ -1178,6 +1178,9 @@ class InterfaceUtil: node, host_if_key ) ) + Topology.update_interface_pci_address( + node, if_key, Topology.get_interface_pci_addr(node, host_if_key) + ) @staticmethod def vpp_create_avf_interface(node, if_key, num_rx_queues=None): @@ -1190,7 +1193,7 @@ class InterfaceUtil: :type node: dict :type if_key: str :type num_rx_queues: int - :returns: Interface key (name) in topology. + :returns: AVF interface key (name) in topology. :rtype: str :raises RuntimeError: If it is not possible to create AVF interface on the node. @@ -1216,9 +1219,8 @@ class InterfaceUtil: node, sw_if_index=sw_if_index, ifc_pfx=u"eth_avf", host_if_key=if_key ) - if_key = Topology.get_interface_by_sw_index(node, sw_if_index) - return if_key + return Topology.get_interface_by_sw_index(node, sw_if_index) @staticmethod def vpp_create_rdma_interface( -- cgit 1.2.3-korg