From bbea8c34959a22786edbc3ce8bbbf7d5a9aeb657 Mon Sep 17 00:00:00 2001 From: Itsuro Oda Date: Thu, 5 Jun 2014 14:32:13 +0900 Subject: [PATCH] Do not schedule network when creating reserved DHCP port If device_id is DEVICE_ID_RESERVED_DHCP_PORT, do not schedule network nor notify to dhcp-agent. Closes-Bug: #1327000 Change-Id: Idf88767596bf0fc31bf856a423d35cb1575b57f3 --- .../rpc/agentnotifiers/dhcp_rpc_agent_api.py | 7 +++++- .../agentnotifiers/test_dhcp_rpc_agent_api.py | 3 ++- .../unit/openvswitch/test_agent_scheduler.py | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py index 96c50bce91..a11533707f 100644 --- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py +++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py @@ -95,6 +95,9 @@ class DhcpAgentNotifyAPI(n_rpc.RpcProxy): 'payload': payload}) return enabled_agents + def _is_reserved_dhcp_port(self, port): + return port.get('device_id') == constants.DEVICE_ID_RESERVED_DHCP_PORT + def _notify_agents(self, context, method, payload, network_id): """Notify all the agents that are hosting the network.""" # fanout is required as we do not know who is "listening" @@ -115,7 +118,9 @@ class DhcpAgentNotifyAPI(n_rpc.RpcProxy): context, [network_id]) # schedule the network first, if needed - schedule_required = method == 'port_create_end' + schedule_required = ( + method == 'port_create_end' and + not self._is_reserved_dhcp_port(payload['port'])) if schedule_required: agents = self._schedule_network(admin_ctx, network, agents) diff --git a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py index 5d29f6cbd0..6df1bbf9c7 100644 --- a/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py +++ b/neutron/tests/unit/api/rpc/agentnotifiers/test_dhcp_rpc_agent_api.py @@ -124,8 +124,9 @@ class TestDhcpAgentNotifyAPI(base.BaseTestCase): agent.admin_state_up = True agent.heartbeat_timestamp = timeutils.utcnow() g.return_value = [agent] + dummy_payload = {'port': {}} self.notifier._notify_agents(mock.Mock(), method, - mock.ANY, 'foo_network_id') + dummy_payload, 'foo_network_id') self.assertEqual(expected_scheduling, f.call_count) self.assertEqual(expected_casts, self.mock_cast.call_count) diff --git a/neutron/tests/unit/openvswitch/test_agent_scheduler.py b/neutron/tests/unit/openvswitch/test_agent_scheduler.py index f094daabc9..62fdfe5574 100644 --- a/neutron/tests/unit/openvswitch/test_agent_scheduler.py +++ b/neutron/tests/unit/openvswitch/test_agent_scheduler.py @@ -1158,6 +1158,29 @@ class OvsDhcpAgentNotifierTestCase(test_l3_plugin.L3NatTestCaseMixin, for expected in expected_calls[DHCP_HOSTC]: self.assertIn(expected, self.dhcp_notifier_cast.call_args_list) + def _is_schedule_network_called(self, device_id): + plugin = manager.NeutronManager.get_plugin() + notifier = plugin.agent_notifiers[constants.AGENT_TYPE_DHCP] + with contextlib.nested( + self.subnet(), + mock.patch.object(plugin, + 'get_dhcp_agents_hosting_networks', + return_value=[]), + mock.patch.object(notifier, + '_schedule_network', + return_value=[]) + ) as (subnet, _, mock_sched): + with self.port(subnet=subnet, device_id=device_id): + return mock_sched.called + + def test_reserved_dhcp_port_creation(self): + device_id = constants.DEVICE_ID_RESERVED_DHCP_PORT + self.assertFalse(self._is_schedule_network_called(device_id)) + + def test_unreserved_dhcp_port_creation(self): + device_id = 'not_reserved' + self.assertTrue(self._is_schedule_network_called(device_id)) + class OvsL3AgentNotifierTestCase(test_l3_plugin.L3NatTestCaseMixin, test_agent_ext_plugin.AgentDBTestMixIn,