Disable keepalived process in keepalived func test

Previously, keepalived process itself was disabled that lead to
respawning of keepalived by KeepalivedManager. This patch disables
KeepalivedManager in cleanup thus no respawn happens.

Closes-Bug: #1466873
Change-Id: If5524116e5d4fc41600920d31481282c5b797f7b

diff --git a/neutron/tests/functional/agent/linux/test_keepalived.py b/neutron/tests/functional/agent/linux/test_keepalived.py
index 3df8ec7925c6724590d72fe2450957e19b956f5e..9c9da7098d6cb02879de669e3347fa283bc5e447 100644 (file)
--- a/neutron/tests/functional/agent/linux/test_keepalived.py
+++ b/neutron/tests/functional/agent/linux/test_keepalived.py
@@ -35,7 +35,7 @@ class KeepalivedManagerTestCase(base.BaseTestCase,
         self.manager = keepalived.KeepalivedManager(
             'router1', self.expected_config, self.process_monitor,
             conf_path=cfg.CONF.state_path)
-        self.addCleanup(self.manager.get_process().disable)
+        self.addCleanup(self.manager.disable)
 
     def test_keepalived_spawn(self):
         self.manager.spawn()