From 8ee7dd2da7c3d8db588ec03b4ee0df25a7b906a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= Date: Mon, 16 Oct 2017 07:49:10 +0000 Subject: [PATCH] Add setup_privsep in agent's main function As Neutron switched to use pyroute2 for managing namespaces in 4f627b4e8dfe699944a196fe90e0642cced6278f neutron-lbaas needs to setup privsep in agent to make possible manipulating with network namespaces. Change-Id: I084f8d54cc619a1c99658396d5cab036a2663413 Closes-Bug: #1723856 --- neutron_lbaas/agent/agent.py | 1 + neutron_lbaas/tests/unit/agent/test_agent.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/neutron_lbaas/agent/agent.py b/neutron_lbaas/agent/agent.py index a7ab45ab5..4d78f9185 100644 --- a/neutron_lbaas/agent/agent.py +++ b/neutron_lbaas/agent/agent.py @@ -57,6 +57,7 @@ def main(): common_config.init(sys.argv[1:]) config.setup_logging() + config.setup_privsep() mgr = manager.LbaasAgentManager(cfg.CONF) svc = LbaasAgentService( diff --git a/neutron_lbaas/tests/unit/agent/test_agent.py b/neutron_lbaas/tests/unit/agent/test_agent.py index 3ca01ff64..c70cfbac6 100644 --- a/neutron_lbaas/tests/unit/agent/test_agent.py +++ b/neutron_lbaas/tests/unit/agent/test_agent.py @@ -35,7 +35,9 @@ class TestLbaasService(base.BaseTestCase): def test_main(self): logging_str = 'neutron.conf.agent.common.setup_logging' + privsep_str = 'neutron.conf.agent.common.setup_privsep' with mock.patch(logging_str), \ + mock.patch(privsep_str), \ mock.patch.object(agent.service, 'launch') as mock_launch, \ mock.patch('sys.argv'), \ mock.patch.object(agent.manager, 'LbaasAgentManager'), \