Merge "[eventlet-removal] Patch unit tests for keepalived not. server"

neutron/tests/unit/agent/l3/test_dvr_local_router.py

@@ -25,6 +25,7 @@ from neutron.agent.l3 import dvr_edge_ha_router as dvr_edge_ha_rtr
 from neutron.agent.l3 import dvr_edge_router as dvr_edge_rtr
 from neutron.agent.l3 import dvr_fip_ns
 from neutron.agent.l3 import dvr_local_router as dvr_router
+from neutron.agent.l3 import ha as l3_ha
 from neutron.agent.l3 import link_local_allocator as lla
 from neutron.agent.l3 import router_info
 from neutron.agent.linux import interface
@@ -156,6 +157,9 @@ class TestDvrRouterOperations(base.BaseTestCase):
         self.mock_list_all = mock.patch(
             'neutron.agent.l3.namespace_manager.NamespaceManager'
             '.list_all', return_value={}).start()
+        self.mock_ka_notifications = mock.patch.object(
+            l3_ha.AgentMixin, '_start_keepalived_notifications_server')
+        self.mock_ka_notifications.start()
 
     def _create_router(self, router=None, **kwargs):
         agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)

neutron/tests/unit/agent/metadata/test_driver.py

@@ -24,6 +24,7 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 
 from neutron.agent.l3 import agent as l3_agent
+from neutron.agent.l3 import ha as l3_ha
 from neutron.agent.l3 import router_info
 from neutron.agent.linux import external_process as ep
 from neutron.agent.linux import ip_lib
@@ -115,6 +116,9 @@ class TestMetadataDriverProcess(base.BaseTestCase):
         self.mock_conf_obsolete = mock.patch.object(
             driver_base.HaproxyConfiguratorBase,
             'is_config_file_obsolete').start()
+        self.mock_ka_notifications = mock.patch.object(
+            l3_ha.AgentMixin, '_start_keepalived_notifications_server')
+        self.mock_ka_notifications.start()
 
     def test_after_router_updated_called_on_agent_process_update(self):
         with mock.patch.object(metadata_driver, 'after_router_updated') as f,\