diff options
| author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2017-09-08 11:13:41 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-09-14 14:58:33 +0900 |
| commit | ea2067ac1cee866b8be8a5082239cc5cbcefdc9c (patch) | |
| tree | 59e8c7028b49d123bebe346926b876b0be6c2e1c /test/lib | |
| parent | 8dd72278af9b80607964ca39decd48c9b02eece2 (diff) | |
test/lib/gobgp,quagga: Adopt to Debian 9 based osrg/quagga:v1.0
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/gobgp.py | 4 | ||||
| -rw-r--r-- | test/lib/quagga.py | 12 |
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) |