X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FContainerUtils.py;h=4b891048fde38175a6125569ffc00c4091ace0bb;hb=73a01b1a7fc836c964627eea2c08106df0da5aee;hp=da9e93ae1031f1e81050ae844a56bf193155a5f5;hpb=1321245b83be3001a646fd9d1d96a5d37308cd9d;p=csit.git

diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py
index da9e93ae10..4b891048fd 100644
--- a/resources/libraries/python/ContainerUtils.py
+++ b/resources/libraries/python/ContainerUtils.py
@@ -156,6 +156,12 @@ class ContainerManager(object):
             self.engine.install_vpp()
             self.engine.restart_vpp()
 
+    def restart_vpp_in_all_containers(self):
+        """Restart VPP on all containers."""
+        for container in self.containers:
+            self.engine.container = self.containers[container]
+            self.engine.restart_vpp()
+
     def configure_vpp_in_all_containers(self, vat_template_file):
         """Configure VPP in all containers.
 
@@ -305,6 +311,7 @@ class ContainerEngine(object):
     def restart_vpp(self):
         """Restart VPP service inside a container."""
         self.execute('supervisorctl restart vpp')
+        self.execute('cat /tmp/supervisord.log')
 
     def create_vpp_startup_config(self,
                                   config_filename='/etc/vpp/startup.conf'):
@@ -627,6 +634,8 @@ class Docker(ContainerEngine):
 
         cpuset_mems = '--cpuset-mems={0}'.format(self.container.cpuset_mems)\
             if self.container.cpuset_mems is not None else ''
+        # Temporary workaround - disabling due to bug in memif
+        cpuset_mems = ''
 
         env = '{0}'.format(
             ' '.join('--env %s' % env for env in self.container.env))\