FIX: NF_density tests

[csit.git] / resources / libraries / python / ContainerUtils.py

diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py
index 6e413c6..b2d0296 100644 (file)
--- a/resources/libraries/python/ContainerUtils.py
+++ b/resources/libraries/python/ContainerUtils.py
@@ -368,7 +368,7 @@ class ContainerManager:
                 f"create interface memif id {i} socket-id 2 master\n"
                 f"set interface state memif2/{i} up\n"
                 f"set interface l2 bridge memif2/{i} 2\n"
-                f"set ip arp memif2/{i} {tg_if_ip4} {tg_if_mac} "
+                f"set ip neighbor memif2/{i} {tg_if_ip4} {tg_if_mac} "
                 f"static\n\n"
             )
 
@@ -564,12 +564,13 @@ class ContainerEngine:
             self.container.name,
             f"/tmp/vpp_sockets/{self.container.name}/stats.sock"
         )
+        self.verify_vpp()
+        self.adjust_privileges()
 
     def restart_vpp(self):
         """Restart VPP service inside a container."""
         self.execute(u"pkill vpp")
         self.start_vpp()
-        self.execute(u"cat /tmp/vppd.log")
 
     # TODO Rewrite to use the VPPUtil.py functionality and remove this.
     def verify_vpp(self, retries=120, retry_wait=1):
@@ -578,19 +579,25 @@ class ContainerEngine:
         :param retries: Check for VPP for this number of times Default: 120
         :param retry_wait: Wait for this number of seconds between retries.
         """
-        cmd = (u"vppctl show pci 2>&1 | "
-               u"fgrep -v 'Connection refused' | "
-               u"fgrep -v 'No such file or directory'")
-
         for _ in range(retries + 1):
             try:
-                self.execute(cmd)
+                self.execute(
+                    u"vppctl show pci 2>&1 | "
+                    u"fgrep -v 'Connection refused' | "
+                    u"fgrep -v 'No such file or directory'"
+                )
                 break
             except RuntimeError:
                 sleep(retry_wait)
         else:
-            msg = f"VPP did not come up in container: {self.container.name}"
-            raise RuntimeError(msg)
+            self.execute(u"cat /tmp/vppd.log")
+            raise RuntimeError(
+                f"VPP did not come up in container: {self.container.name}"
+            )
+
+    def adjust_privileges(self):
+        """Adjust privileges to control VPP without sudo."""
+        self.execute("chmod -R o+rwx /run/vpp")
 
     def create_base_vpp_startup_config(self, cpuset_cpus=None):
         """Create base startup configuration of VPP on container.