Merge "l3 agent: stop expecting old server when fetching service plugins"
This commit is contained in:
commit
03c6735f2a
|
@ -220,15 +220,6 @@ class L3NATAgent(ha.AgentMixin,
|
|||
try:
|
||||
self.neutron_service_plugins = (
|
||||
self.plugin_rpc.get_service_plugin_list(self.context))
|
||||
except oslo_messaging.RemoteError as e:
|
||||
LOG.warning('l3-agent cannot check service plugins '
|
||||
'enabled at the neutron server when '
|
||||
'startup due to RPC error. It happens '
|
||||
'when the server does not support this '
|
||||
'RPC API. If the error is '
|
||||
'UnsupportedVersion you can ignore this '
|
||||
'warning. Detail message: %s', e)
|
||||
self.neutron_service_plugins = None
|
||||
except oslo_messaging.MessagingTimeout as e:
|
||||
LOG.warning('l3-agent cannot contact neutron server '
|
||||
'to retrieve service plugins enabled. '
|
||||
|
|
|
@ -2719,13 +2719,6 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
|
|||
self.assertEqual(service_plugins, agent.neutron_service_plugins)
|
||||
self.assertTrue(self.plugin_api.get_service_plugin_list.called)
|
||||
|
||||
def test_get_service_plugin_list_failed(self):
|
||||
raise_rpc = oslo_messaging.RemoteError()
|
||||
self.plugin_api.get_service_plugin_list.side_effect = raise_rpc
|
||||
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
|
||||
self.assertIsNone(agent.neutron_service_plugins)
|
||||
self.assertTrue(self.plugin_api.get_service_plugin_list.called)
|
||||
|
||||
def test_get_service_plugin_list_retried(self):
|
||||
raise_timeout = oslo_messaging.MessagingTimeout()
|
||||
# Raise a timeout the first 2 times it calls
|
||||
|
|
Loading…
Reference in New Issue