test/lib/gobgp,quagga: Adopt to Debian 9 based osrg/quagga:v1.0

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>

2 files changed, 5 insertions, 11 deletions

diff --git a/test/lib/gobgp.py b/test/lib/gobgp.py
index 1123d53a..dfdc6808 100644
--- a/test/lib/gobgp.py
+++ b/test/lib/gobgp.py
@@ -104,7 +104,7 @@ class GoBGPContainer(BGPContainer):
         if self.zapi_version == 2:
             daemon_bin = '/usr/lib/quagga/zebra'
         else:
-            daemon_bin = 'zebra -u root -g root'
+            daemon_bin = 'zebra'
         cmd = '{0} -f {1}/zebra.conf'.format(daemon_bin, self.QUAGGA_VOLUME)
         self.local(cmd, detach=True)
 
@@ -112,7 +112,7 @@ class GoBGPContainer(BGPContainer):
         if self.zapi_version == 2:
             daemon_bin = '/usr/lib/quagga/ospfd'
         else:
-            daemon_bin = 'ospfd -u root -g root'
+            daemon_bin = 'ospfd'
         cmd = '{0} -f {1}/ospfd.conf'.format(daemon_bin, self.QUAGGA_VOLUME)
         self.local(cmd, detach=True)
 
diff --git a/test/lib/quagga.py b/test/lib/quagga.py
index d37c2dbc..51433d30 100644
--- a/test/lib/quagga.py
+++ b/test/lib/quagga.py
@@ -375,20 +375,14 @@ class QuaggaOSPFContainer(OSPFContainer):
             f.writelines(str(c))
 
     def _start_zebra(self):
-        if self.zapi_vserion == 2:
-            # Do nothing. supervisord will automatically start Zebra daemon.
-            return
-
-        self.local(
-            '/usr/local/sbin/zebra '
-            '-u root -g root -f {0}/zebra.conf'.format(self.SHARED_VOLUME),
-            detach=True)
+        # Do nothing. supervisord will automatically start Zebra daemon.
+        return
 
     def _start_ospfd(self):
         if self.zapi_vserion == 2:
             ospfd_cmd = '/usr/lib/quagga/ospfd'
         else:
-            ospfd_cmd = '/usr/local/sbin/ospfd -u root -g root'
+            ospfd_cmd = 'ospfd'
         self.local(
             '{0} -f {1}/ospfd.conf'.format(ospfd_cmd, self.SHARED_VOLUME),
             detach=True)