From: pmikus <peter.mikus@protonmail.ch>
Date: Fri, 12 May 2023 12:37:29 +0000 (+0000)
Subject: fix(core): Container entropy
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=f2a012b21d64319d666decc9f20a5c8f5007bc92

fix(core): Container entropy

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I45760143ae0ccb0cc0edf0931ad47f5cf48ec968
---

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_3nb_spr_testbed22.yaml
similarity index 100%
rename from topologies/available/lf_3na_spr_testbed22.yaml
rename to topologies/available/lf_3nb_spr_testbed22.yaml