FIX: Paths for new Docker images

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ia39ff6445e4029a78d008d5690661610a1e9ed50

diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py
index b02033e..50868cb 100644 (file)
--- a/resources/libraries/python/ContainerUtils.py
+++ b/resources/libraries/python/ContainerUtils.py
@@ -398,6 +398,7 @@ class ContainerEngine(object):
             self.execute('sleep 3; apt-get update')
             self.execute('apt-get install -y supervisor')
         self.execute('echo "{config}" > {config_file} && '
+                     'unlink /tmp/supervisor.sock && '
                      'supervisord -c {config_file}'.
                      format(
                          config='[unix_http_server]\n'
@@ -411,9 +412,9 @@ class ContainerEngine(object):
                          'pidfile = /tmp/supervisord.pid\n'
                          'identifier = supervisor\n'
                          'directory = /tmp\n'
-                         'logfile=/tmp/supervisord.log\n'
-                         'loglevel=debug\n'
-                         'nodaemon=false\n\n',
+                         'logfile = /tmp/supervisord.log\n'
+                         'loglevel = debug\n'
+                         'nodaemon = false\n\n',
                          config_file=SUPERVISOR_CONF))
 
     def start_vpp(self):
@@ -421,11 +422,11 @@ class ContainerEngine(object):
         self.execute('echo "{config}" >> {config_file}'.
                      format(
                          config='[program:vpp]\n'
-                         'command=/usr/bin/vpp -c /etc/vpp/startup.conf\n'
-                         'autostart=false\n'
-                         'autorestart=false\n'
-                         'redirect_stderr=true\n'
-                         'priority=1',
+                         'command = /usr/bin/vpp -c /etc/vpp/startup.conf\n'
+                         'autostart = false\n'
+                         'autorestart = false\n'
+                         'redirect_stderr = true\n'
+                         'priority = 1',
                          config_file=SUPERVISOR_CONF))
         self.execute('supervisorctl reload')
         self.execute('supervisorctl start vpp')

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 95b2301..9ae06c1 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -33,8 +33,7 @@ class DUTSetup(object):
         :type service: str
         """
         if DUTSetup.running_in_container(node):
-            command = ('echo $(< /var/log/supervisord.log);'
-                       'echo $(< /tmp/*supervisor*.log)')
+            command = ('echo $(< /tmp/*supervisor*.log)')
         else:
             command = ('journalctl --no-pager --unit={name} '
                        '--since="$(echo `systemctl show -p '