From f2a012b21d64319d666decc9f20a5c8f5007bc92 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 12 May 2023 12:37:29 +0000 Subject: fix(core): Container entropy Signed-off-by: pmikus Change-Id: I45760143ae0ccb0cc0edf0931ad47f5cf48ec968 --- resources/libraries/python/ContainerUtils.py | 8 +- resources/libraries/robot/shared/container.robot | 3 +- topologies/available/lf_3na_spr_testbed22.yaml | 132 ----------------------- topologies/available/lf_3nb_spr_testbed22.yaml | 132 +++++++++++++++++++++++ 4 files changed, 136 insertions(+), 139 deletions(-) delete mode 100644 topologies/available/lf_3na_spr_testbed22.yaml create mode 100644 topologies/available/lf_3nb_spr_testbed22.yaml diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index dc3d3d0028..158eb4bc48 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -205,8 +205,8 @@ class ContainerManager: dut_cnt = len( Counter( [ - self.containers[container].node[u"host"] - for container in self.containers + f"{container.node['host']}{container.node['port']}" + for container in self.containers.values() ] ) ) @@ -581,8 +581,7 @@ class ContainerEngine: def start_vpp(self, verify=True): """Start VPP inside a container.""" self.execute( - u"setsid /usr/bin/vpp -c /etc/vpp/startup.conf " - u">/tmp/vppd.log 2>&1 < /dev/null &") + u"/usr/bin/vpp -c /etc/vpp/startup.conf") topo_instance = BuiltIn().get_library_instance( u"resources.libraries.python.topology.Topology" @@ -694,7 +693,6 @@ class ContainerEngine: vpp_config = VppConfigGenerator() vpp_config.set_node(self.container.node) vpp_config.add_unix_cli_listen() - vpp_config.add_unix_nodaemon() vpp_config.add_unix_exec(u"/tmp/running.exec") vpp_config.add_socksvr(socket=Constants.SOCKSVR_PATH) if cpuset_cpus: diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index ed695af541..253f1f063f 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -84,10 +84,9 @@ | | ... | ${nf_dtc} | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive -| | ${dut1_uuid_length} = | Get Length | ${DUT1_UUID} | | ${in_container}= | Running in Container | ${nodes['${dut}']} | | ${root}= | Run Keyword If | ${in_container} -| | ... | Get Docker Mergeddir | ${nodes['DUT1']} +| | ... | Get Docker Mergeddir | ${nodes['${dut}']} | | ... | ELSE | Set Variable | ${EMPTY} | | ${node_arch}= | Get Node Arch | ${nodes['${dut}']} | | ${name}= | Set Variable | ${dut}_${container_group}${nf_id}${DUT1_UUID} diff --git a/topologies/available/lf_3na_spr_testbed22.yaml b/topologies/available/lf_3na_spr_testbed22.yaml deleted file mode 100644 index 1f411ceace..0000000000 --- a/topologies/available/lf_3na_spr_testbed22.yaml +++ /dev/null @@ -1,132 +0,0 @@ ---- -metadata: - version: 0.1 - schema: - - resources/topology_schemas/3_node_topology.sch.yaml - - resources/topology_schemas/topology.sch.yaml - tags: [hw, 3-node] - -nodes: - TG: - type: TG - subtype: TREX - host: "10.30.51.55" - arch: x86_64 - port: 6001 - username: testuser - password: Csit1234 - interfaces: - port1: - # s55-t22-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e7:00" - pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.1" - driver: ice - link: link1 - model: Intel-E810CQ - port2: - # s55-t22-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e7:04" - pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.1" - driver: ice - link: link3 - model: Intel-E810CQ - port3: - # s55-t22-tg1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:45:50" - pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.1" - driver: ice - link: link4 - model: Intel-E810XXV - port4: - # s55-t22-tg1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:45:51" - pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.1" - driver: ice - link: link6 - model: Intel-E810XXV - DUT1: - type: DUT - host: "10.30.51.54" - arch: x86_64 - port: 6001 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # s54-t22-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e5:c0" - pci_address: "0000:2a:00.0" - ip4_address: "172.16.30.2" - driver: ice - link: link2 - model: Intel-E810CQ - port2: - # s54-t22-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e5:c4" - pci_address: "0000:2c:00.0" - ip4_address: "172.16.40.2" - driver: ice - link: link3 - model: Intel-E810CQ - port3: - # s54-t22-sut1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:45:4c" - pci_address: "0000:3d:00.0" - ip4_address: "172.16.10.2" - driver: ice - link: link4 - model: Intel-E810XXV - port4: - # s54-t22-sut1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:45:4d" - pci_address: "0000:3d:00.1" - ip4_address: "172.16.20.2" - driver: ice - link: link5 - model: Intel-E810XXV - DUT2: - type: DUT - host: "10.30.51.54" - arch: x86_64 - port: 6002 - username: testuser - password: Csit1234 - uio_driver: vfio-pci - interfaces: - port1: - # s54-t22-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e5:98" - pci_address: "0000:ab:00.0" - ip4_address: "172.16.30.3" - driver: ice - link: link2 - model: Intel-E810CQ - port2: - # s54-t22-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. - mac_address: "40:a6:b7:9e:e5:9c" - pci_address: "0000:ad:00.0" - ip4_address: "172.16.40.3" - driver: ice - link: link1 - model: Intel-E810CQ - port3: - # s54-t22-sut1-c7/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:4a:80" - pci_address: "0000:bd:00.0" - ip4_address: "172.16.10.3" - driver: ice - link: link6 - model: Intel-E810XXV - port4: - # s54-t22-sut1-c7/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. - mac_address: "50:7c:6f:48:4a:81" - pci_address: "0000:bd:00.1" - ip4_address: "172.16.20.3" - driver: ice - link: link5 - model: Intel-E810XXV \ No newline at end of file diff --git a/topologies/available/lf_3nb_spr_testbed22.yaml b/topologies/available/lf_3nb_spr_testbed22.yaml new file mode 100644 index 0000000000..1f411ceace --- /dev/null +++ b/topologies/available/lf_3nb_spr_testbed22.yaml @@ -0,0 +1,132 @@ +--- +metadata: + version: 0.1 + schema: + - resources/topology_schemas/3_node_topology.sch.yaml + - resources/topology_schemas/topology.sch.yaml + tags: [hw, 3-node] + +nodes: + TG: + type: TG + subtype: TREX + host: "10.30.51.55" + arch: x86_64 + port: 6001 + username: testuser + password: Csit1234 + interfaces: + port1: + # s55-t22-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e7:00" + pci_address: "0000:2a:00.0" + ip4_address: "172.16.30.1" + driver: ice + link: link1 + model: Intel-E810CQ + port2: + # s55-t22-tg1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e7:04" + pci_address: "0000:2c:00.0" + ip4_address: "172.16.40.1" + driver: ice + link: link3 + model: Intel-E810CQ + port3: + # s55-t22-tg1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:45:50" + pci_address: "0000:3d:00.0" + ip4_address: "172.16.10.1" + driver: ice + link: link4 + model: Intel-E810XXV + port4: + # s55-t22-tg1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:45:51" + pci_address: "0000:3d:00.1" + ip4_address: "172.16.20.1" + driver: ice + link: link6 + model: Intel-E810XXV + DUT1: + type: DUT + host: "10.30.51.54" + arch: x86_64 + port: 6001 + username: testuser + password: Csit1234 + uio_driver: vfio-pci + interfaces: + port1: + # s54-t22-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e5:c0" + pci_address: "0000:2a:00.0" + ip4_address: "172.16.30.2" + driver: ice + link: link2 + model: Intel-E810CQ + port2: + # s54-t22-sut1-c4/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e5:c4" + pci_address: "0000:2c:00.0" + ip4_address: "172.16.40.2" + driver: ice + link: link3 + model: Intel-E810CQ + port3: + # s54-t22-sut1-c2/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:45:4c" + pci_address: "0000:3d:00.0" + ip4_address: "172.16.10.2" + driver: ice + link: link4 + model: Intel-E810XXV + port4: + # s54-t22-sut1-c2/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:45:4d" + pci_address: "0000:3d:00.1" + ip4_address: "172.16.20.2" + driver: ice + link: link5 + model: Intel-E810XXV + DUT2: + type: DUT + host: "10.30.51.54" + arch: x86_64 + port: 6002 + username: testuser + password: Csit1234 + uio_driver: vfio-pci + interfaces: + port1: + # s54-t22-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e5:98" + pci_address: "0000:ab:00.0" + ip4_address: "172.16.30.3" + driver: ice + link: link2 + model: Intel-E810CQ + port2: + # s54-t22-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE. + mac_address: "40:a6:b7:9e:e5:9c" + pci_address: "0000:ad:00.0" + ip4_address: "172.16.40.3" + driver: ice + link: link1 + model: Intel-E810CQ + port3: + # s54-t22-sut1-c7/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:4a:80" + pci_address: "0000:bd:00.0" + ip4_address: "172.16.10.3" + driver: ice + link: link6 + model: Intel-E810XXV + port4: + # s54-t22-sut1-c7/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE. + mac_address: "50:7c:6f:48:4a:81" + pci_address: "0000:bd:00.1" + ip4_address: "172.16.20.3" + driver: ice + link: link5 + model: Intel-E810XXV \ No newline at end of file -- cgit 1.2.3-korg