From a1b8a770c1f78d346fc33ddadbe5746d5ecdcee8 Mon Sep 17 00:00:00 2001 From: sridhargaddam Date: Wed, 1 Apr 2015 12:01:03 +0000 Subject: [PATCH] Some cleanup in L3 HA code This patch addresses the following. 1. removes the un-used variables. 2. process_monitor (argument to KeepalivedManager) is changed to a non-default parameter as its used in spawn, disable methods. Change-Id: I8b130b21965ed3387e994818be947eb95d73a423 --- neutron/agent/l3/ha.py | 1 - neutron/agent/l3/ha_router.py | 4 ++-- neutron/agent/linux/keepalived.py | 5 ++--- neutron/tests/functional/agent/linux/test_keepalived.py | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/neutron/agent/l3/ha.py b/neutron/agent/l3/ha.py index a51001a65d0..e83ea141d5b 100644 --- a/neutron/agent/l3/ha.py +++ b/neutron/agent/l3/ha.py @@ -27,7 +27,6 @@ from neutron.notifiers import batch_notifier LOG = logging.getLogger(__name__) -HA_DEV_PREFIX = 'ha-' KEEPALIVED_STATE_CHANGE_SERVER_BACKLOG = 4096 OPTS = [ diff --git a/neutron/agent/l3/ha_router.py b/neutron/agent/l3/ha_router.py index 4b88a3e2a81..4f62e3442a5 100644 --- a/neutron/agent/l3/ha_router.py +++ b/neutron/agent/l3/ha_router.py @@ -92,9 +92,9 @@ class HaRouter(router.RouterInfo): self.keepalived_manager = keepalived.KeepalivedManager( self.router['id'], keepalived.KeepalivedConf(), + process_monitor, conf_path=self.agent_conf.ha_confs_path, - namespace=self.ns_name, - process_monitor=process_monitor) + namespace=self.ns_name) config = self.keepalived_manager.config diff --git a/neutron/agent/linux/keepalived.py b/neutron/agent/linux/keepalived.py index 58d5120ed53..0bd1b12bc10 100644 --- a/neutron/agent/linux/keepalived.py +++ b/neutron/agent/linux/keepalived.py @@ -290,14 +290,13 @@ class KeepalivedManager(object): """ - def __init__(self, resource_id, config, conf_path='/tmp', - namespace=None, process_monitor=None): + def __init__(self, resource_id, config, process_monitor, conf_path='/tmp', + namespace=None): self.resource_id = resource_id self.config = config self.namespace = namespace self.process_monitor = process_monitor self.conf_path = conf_path - self.process = None def get_conf_dir(self): confs_dir = os.path.abspath(os.path.normpath(self.conf_path)) diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py index f0fe113e61f..3df8ec7925c 100644 --- a/neutron/tests/functional/agent/linux/test_keepalived.py +++ b/neutron/tests/functional/agent/linux/test_keepalived.py @@ -33,8 +33,8 @@ class KeepalivedManagerTestCase(base.BaseTestCase, self.process_monitor = external_process.ProcessMonitor(cfg.CONF, 'router') self.manager = keepalived.KeepalivedManager( - 'router1', self.expected_config, conf_path=cfg.CONF.state_path, - process_monitor=self.process_monitor) + 'router1', self.expected_config, self.process_monitor, + conf_path=cfg.CONF.state_path) self.addCleanup(self.manager.get_process().disable) def test_keepalived_spawn(self):