diff options
19 files changed, 64 insertions, 72 deletions
diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 5e1ab5ab4f..9a141767b9 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -80,14 +80,21 @@ class ContainerManager(object): # Set cpuset.cpus cgroup skip_cnt = kwargs['cpu_skip'] + smt_used = CpuUtils.is_smt_enabled(kwargs['node']['cpuinfo']) if not kwargs['cpu_shared']: skip_cnt += kwargs['i'] * kwargs['cpu_count'] self.engine.container.cpuset_cpus = \ CpuUtils.cpu_slice_of_list_per_node(node=kwargs['node'], cpu_node=kwargs['cpuset_mems'], skip_cnt=skip_cnt, - cpu_cnt=kwargs['cpu_count'], - smt_used=kwargs['smt_used']) + cpu_cnt=1, + smt_used=False) \ + + \ + CpuUtils.cpu_slice_of_list_per_node(node=kwargs['node'], + cpu_node=kwargs['cpuset_mems'], + skip_cnt=skip_cnt+1, + cpu_cnt=kwargs['cpu_count']-1, + smt_used=smt_used) # Store container instance self.containers[kwargs['name']] = self.engine.container @@ -340,6 +347,7 @@ class ContainerEngine(object): 'priority=1', config_file=SUPERVISOR_CONF)) self.execute('supervisorctl reload') + self.execute('supervisorctl restart vpp') def restart_vpp(self): """Restart VPP service inside a container.""" diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index c5223d5496..7286633676 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -68,9 +68,9 @@ class InterfaceUtil(object): if node['type'] == NodeType.DUT: if state == 'up': - state = 'admin-up' + state = 'admin-up link-up' elif state == 'down': - state = 'admin-down' + state = 'admin-down link-down' else: raise ValueError('Unexpected interface state: {}'.format(state)) VatExecutor.cmd_from_template(node, 'set_if_state.vat', @@ -170,7 +170,7 @@ class InterfaceUtil(object): InterfaceUtil.vpp_set_interfaces_mtu_on_node(node, mtu) @staticmethod - def vpp_node_interfaces_ready_wait(node, timeout=10): + def vpp_node_interfaces_ready_wait(node, timeout=30): """Wait until all interfaces with admin-up are in link-up state. :param node: Node to wait on. @@ -205,7 +205,7 @@ class InterfaceUtil(object): sleep(1) @staticmethod - def vpp_nodes_interfaces_ready_wait(nodes, timeout=10): + def vpp_nodes_interfaces_ready_wait(nodes, timeout=30): """Wait until all interfaces with admin-up are in link-up state for listed nodes. @@ -219,7 +219,7 @@ class InterfaceUtil(object): InterfaceUtil.vpp_node_interfaces_ready_wait(node, timeout) @staticmethod - def all_vpp_interfaces_ready_wait(nodes, timeout=10): + def all_vpp_interfaces_ready_wait(nodes, timeout=30): """Wait until all interfaces with admin-up are in link-up state for all nodes in the topology. diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 2e2eb84e2f..74b44b13c8 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -49,11 +49,11 @@ # library | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up | | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if1} -| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up +| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1} | up | | | VPP Set Interface MTU | ${nodes['${dut}']} | ${${dut}_if2} -| | | VPP Node Interfaces Ready Wait | ${nodes['${dut}']} +| | | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2} | up +| | All VPP Interfaces Ready Wait | ${nodes} | Initialize IPSec in 3-node circular topology | | [Documentation] @@ -997,6 +997,7 @@ | | ... | ${sock1} | ${sock2} | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} +| | All VPP Interfaces Ready Wait | ${nodes} | Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | [Documentation] diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 201cadcb73..8a56caacb4 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -34,7 +34,7 @@ | | | Run Keyword | ${group}.Construct containers | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | mnt=${mnt} | | | ... | image=${container_image} | cpu_count=${container_cpus} -| | | ... | cpu_skip=${skip_cpus} | smt_used=${False} | cpuset_mems=${cpu_node} +| | | ... | cpu_skip=${skip_cpus} | cpuset_mems=${cpu_node} | | | ... | cpu_shared=${False} | env=${env} | count=${container_count} | | | ... | install_dkms=${container_install_dkms} | | Append To List | ${container_groups} | ${group} @@ -56,7 +56,7 @@ | | | Run Keyword | ${group}.Construct container | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | | | ... | image=${container_image} | cpu_count=${1} | cpu_skip=${0} -| | | ... | smt_used=${False} | cpuset_mems=${cpu_node} | cpu_shared=${True} +| | | ... | cpuset_mems=${cpu_node} | cpu_shared=${True} | | | ... | publish=${publish} | command=${command} | | Append To List | ${container_groups} | ${group} @@ -76,8 +76,7 @@ | | | Run Keyword | ${group}.Construct container | | | ... | name=${dut}_${group} | node=${nodes['${dut}']} | image=${image} | | | ... | cpu_count=${1} | cpu_skip=${0} | cpuset_mems=${cpu_node} -| | | ... | smt_used=${False} | cpu_shared=${True} | publish=${publish} -| | | ... | env=${env} +| | | ... | cpu_shared=${True} | publish=${publish} | env=${env} | | Append To List | ${container_groups} | ${group} | Acquire all '${group}' containers diff --git a/resources/libraries/robot/tcp/tcp_setup.robot b/resources/libraries/robot/tcp/tcp_setup.robot index 42026a1e2c..d2bc41fce0 100644 --- a/resources/libraries/robot/tcp/tcp_setup.robot +++ b/resources/libraries/robot/tcp/tcp_setup.robot @@ -34,7 +34,7 @@ | | | Run keyword | ${dut}.Add Unix Nodaemon | | | Run keyword | ${dut}.Add DPDK Socketmem | 4096,4096 | | | Run keyword | ${dut}.Add DPDK Log Level | debug -| | | Run keyword | ${dut}.Add DPDK Uio Driver | ${uio_driver} +| | | Run keyword | ${dut}.Add DPDK Uio Driver | | | Run keyword | ${dut}.Add Heapsize | 4G | | | Run keyword | ${dut}.Add Plugin | disable | default | | | Run keyword | ${dut}.Add Plugin | enable | @{plugins_to_enable} @@ -73,4 +73,4 @@ | | Vpp Node Interfaces Ready Wait | ${dut1} | | Start HTTP server params | ${dut1} | ${prealloc_fifos} | ${fifo_size} | | ... | ${private_segment_size} -| | Sleep | 30
\ No newline at end of file +| | Sleep | 30 diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-mrr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-mrr.robot index d0c20df494..eda490cc51 100644 --- a/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-mrr.robot +++ b/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-mrr.robot @@ -72,8 +72,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 patch | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-ndrpdr.robot index b9b5061f16..3c48795551 100644 --- a/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-ndrpdr.robot +++ b/tests/vpp/perf/l2/25ge2p1xxv710-eth-l2patch-ndrpdr.robot @@ -78,8 +78,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 patch | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr.robot index c30879f467..b2fe16199a 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-mrr.robot @@ -73,8 +73,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | And Initialize L2 bridge domain in 2-node circular topology | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr.robot index 3abc0da69f..580d6daaf7 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr.robot @@ -78,8 +78,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | And Initialize L2 bridge domain in 2-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-mrr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-mrr.robot index d3336c8d01..c32b76b043 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-mrr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-mrr.robot @@ -72,8 +72,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 patch | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr.robot index 4fbb450b7e..9c9bbc1883 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2patch-ndrpdr.robot @@ -78,8 +78,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | When Initialize L2 patch | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-mrr.robot index 302d852c1c..645b01a6e6 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-mrr.robot @@ -72,8 +72,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | And Initialize L2 xconnect in 2-node circular topology | | Then Traffic should pass with maximum rate diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot index 8ac3c2baa7..62e723f194 100644 --- a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-eth-l2xcbase-ndrpdr.robot @@ -78,8 +78,6 @@ | | And Add PCI devices to all DUTs | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} -| | And Add DPDK dev default RXD to all DUTs | 2048 -| | And Add DPDK dev default TXD to all DUTs | 2048 | | And Apply startup configuration on all VPP DUTs | | And Initialize L2 xconnect in 2-node circular topology | | Then Find NDR and PDR intervals using optimized search diff --git a/topologies/available/lf_2n_skx_testbed21.yaml b/topologies/available/lf_2n_skx_testbed21.yaml index 317938d1e2..5eba0397e7 100644 --- a/topologies/available/lf_2n_skx_testbed21.yaml +++ b/topologies/available/lf_2n_skx_testbed21.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s4-t21-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:71" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s4-t21-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:72" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s4-t21-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:99" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s4-t21-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:9a" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s3-t21-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:89" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s3-t21-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:8a" diff --git a/topologies/available/lf_2n_skx_testbed22.yaml b/topologies/available/lf_2n_skx_testbed22.yaml index d2e49a1686..f048e52486 100644 --- a/topologies/available/lf_2n_skx_testbed22.yaml +++ b/topologies/available/lf_2n_skx_testbed22.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s6-t22-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:99" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s6-t22-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:9a" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s6-t22-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:99" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s6-t22-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:9a" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s5-t22-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:a9" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s5-t22-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:aa" diff --git a/topologies/available/lf_2n_skx_testbed23.yaml b/topologies/available/lf_2n_skx_testbed23.yaml index 892e9bf7f0..b62ccc9cf2 100644 --- a/topologies/available/lf_2n_skx_testbed23.yaml +++ b/topologies/available/lf_2n_skx_testbed23.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s8-t23-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:39" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s8-t23-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:3a" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s8-t23-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:21" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s8-t23-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:22" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s7-t23-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:31" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s7-t23-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:32" diff --git a/topologies/available/lf_2n_skx_testbed24.yaml b/topologies/available/lf_2n_skx_testbed24.yaml index e73f99db0e..78483c3676 100644 --- a/topologies/available/lf_2n_skx_testbed24.yaml +++ b/topologies/available/lf_2n_skx_testbed24.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s10-t24-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:89" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s10-t24-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:b1:8a" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s10-t24-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:41" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s10-t24-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:42" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s9-t24-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:81" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s9-t24-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:82" diff --git a/topologies/available/lf_3n_skx_testbed31.yaml b/topologies/available/lf_3n_skx_testbed31.yaml index c4a8ef1e60..3706a3baeb 100644 --- a/topologies/available/lf_3n_skx_testbed31.yaml +++ b/topologies/available/lf_3n_skx_testbed31.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:59" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:5a" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:31" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ad:32" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s11-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:39" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.120.1" driver: i40e link: link21 - model: Intel-XL710 + model: Intel-X710 port3: # s11-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:3a" @@ -179,7 +179,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port2: # s12-t31-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:aa:a9" @@ -187,7 +187,7 @@ nodes: ip4_address: "172.16.120.2" driver: i40e link: link21 - model: Intel-XL710 + model: Intel-X710 port3: # s12-t31-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:aa:aa" diff --git a/topologies/available/lf_3n_skx_testbed32.yaml b/topologies/available/lf_3n_skx_testbed32.yaml index 807a084a96..bfb38fa4a2 100644 --- a/topologies/available/lf_3n_skx_testbed32.yaml +++ b/topologies/available/lf_3n_skx_testbed32.yaml @@ -23,7 +23,7 @@ nodes: ip4_address: "172.16.10.2" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s13-t31-tg1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:09" @@ -31,7 +31,7 @@ nodes: ip4_address: "172.16.20.2" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port3: # s13-t31-tg1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:af:0a" @@ -71,7 +71,7 @@ nodes: ip4_address: "172.16.70.2" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port8: # s13-t31-tg1-c10/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:e1" @@ -79,7 +79,7 @@ nodes: ip4_address: "172.16.70.1" driver: i40e link: link7 - model: Intel-XL710 + model: Intel-X710 port9: # s13-t31-tg1-c10/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ab:e2" @@ -117,7 +117,7 @@ nodes: ip4_address: "172.16.10.1" driver: i40e link: link1 - model: Intel-XL710 + model: Intel-X710 port2: # s14-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:61" @@ -125,7 +125,7 @@ nodes: ip4_address: "172.16.120.1" driver: i40e link: link21 - model: Intel-XL710 + model: Intel-X710 port3: # s14-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:62" @@ -179,7 +179,7 @@ nodes: ip4_address: "172.16.20.1" driver: i40e link: link2 - model: Intel-XL710 + model: Intel-X710 port2: # s15-t32-sut1-c2/p2 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:c1" @@ -187,7 +187,7 @@ nodes: ip4_address: "172.16.120.2" driver: i40e link: link21 - model: Intel-XL710 + model: Intel-X710 port3: # s15-t32-sut1-c2/p3 - 10GE port1 on Intel NIC x710 4p10GE. mac_address: "3c:fd:fe:a8:ae:c2" |