6161ea4d53
The security groups RPC handler calls get_port_from_device individually for each device in a list it receives. Each one of these results in a separate SQL query for the security groups and port details. This becomes very inefficient as the number of devices on a single node increases. This patch adds logic to the RPC handler to see if the core plugin has a method to lookup all of the device IDs at once. If so, it uses that method, otherwise it continues as normal. The ML2 plugin is modified to include the batch function, which uses one SQL query regardless of the number of devices. Closes-Bug: #1374556 Change-Id: I15d19c22e8c44577db190309b6636a3251a9c66a
153 lines
6.7 KiB
Python
153 lines
6.7 KiB
Python
# Copyright (c) 2013 OpenStack Foundation
|
|
# Copyright 2013, Nachi Ueno, NTT MCL, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import contextlib
|
|
import math
|
|
import mock
|
|
|
|
from neutron.api.v2 import attributes
|
|
from neutron.common import constants as const
|
|
from neutron.extensions import securitygroup as ext_sg
|
|
from neutron import manager
|
|
from neutron.tests.unit import test_api_v2
|
|
from neutron.tests.unit import test_extension_security_group as test_sg
|
|
from neutron.tests.unit import test_security_groups_rpc as test_sg_rpc
|
|
|
|
PLUGIN_NAME = 'neutron.plugins.ml2.plugin.Ml2Plugin'
|
|
NOTIFIER = 'neutron.plugins.ml2.rpc.AgentNotifierApi'
|
|
|
|
|
|
class Ml2SecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
|
|
_plugin_name = PLUGIN_NAME
|
|
|
|
def setUp(self, plugin=None):
|
|
test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
|
|
notifier_p = mock.patch(NOTIFIER)
|
|
notifier_cls = notifier_p.start()
|
|
self.notifier = mock.Mock()
|
|
notifier_cls.return_value = self.notifier
|
|
self._attribute_map_bk_ = {}
|
|
for item in attributes.RESOURCE_ATTRIBUTE_MAP:
|
|
self._attribute_map_bk_[item] = (attributes.
|
|
RESOURCE_ATTRIBUTE_MAP[item].
|
|
copy())
|
|
super(Ml2SecurityGroupsTestCase, self).setUp(PLUGIN_NAME)
|
|
|
|
def tearDown(self):
|
|
super(Ml2SecurityGroupsTestCase, self).tearDown()
|
|
attributes.RESOURCE_ATTRIBUTE_MAP = self._attribute_map_bk_
|
|
|
|
|
|
class TestMl2SecurityGroups(Ml2SecurityGroupsTestCase,
|
|
test_sg.TestSecurityGroups,
|
|
test_sg_rpc.SGNotificationTestMixin):
|
|
def setUp(self):
|
|
super(TestMl2SecurityGroups, self).setUp()
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
plugin.start_rpc_listeners()
|
|
|
|
def _make_port_with_new_sec_group(self, net_id):
|
|
sg = self._make_security_group(self.fmt, 'name', 'desc')
|
|
port = self._make_port(
|
|
self.fmt, net_id, security_groups=[sg['security_group']['id']])
|
|
return port['port']
|
|
|
|
def test_security_group_get_ports_from_devices(self):
|
|
with self.network() as n:
|
|
with self.subnet(n):
|
|
port1 = self._make_port_with_new_sec_group(n['network']['id'])
|
|
port2 = self._make_port_with_new_sec_group(n['network']['id'])
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
# should match full ID and starting chars
|
|
ports = plugin.get_ports_from_devices(
|
|
[port1['id'], port2['id'][0:8]])
|
|
self.assertEqual(2, len(ports))
|
|
for port_dict in ports:
|
|
p = port1 if port1['id'] == port_dict['id'] else port2
|
|
self.assertEqual(p['id'], port_dict['id'])
|
|
self.assertEqual(p['security_groups'],
|
|
port_dict[ext_sg.SECURITYGROUPS])
|
|
self.assertEqual([], port_dict['security_group_rules'])
|
|
self.assertEqual([p['fixed_ips'][0]['ip_address']],
|
|
port_dict['fixed_ips'])
|
|
self._delete('ports', p['id'])
|
|
|
|
def test_security_group_get_ports_from_devices_with_bad_id(self):
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
ports = plugin.get_ports_from_devices(['bad_device_id'])
|
|
self.assertFalse(ports)
|
|
|
|
def test_security_group_no_db_calls_with_no_ports(self):
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
with mock.patch(
|
|
'neutron.plugins.ml2.db.get_sg_ids_grouped_by_port'
|
|
) as get_mock:
|
|
self.assertFalse(plugin.get_ports_from_devices([]))
|
|
self.assertFalse(get_mock.called)
|
|
|
|
def test_large_port_count_broken_into_parts(self):
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
max_ports_per_query = 5
|
|
ports_to_query = 73
|
|
for max_ports_per_query in (1, 2, 5, 7, 9, 31):
|
|
with contextlib.nested(
|
|
mock.patch('neutron.plugins.ml2.db.MAX_PORTS_PER_QUERY',
|
|
new=max_ports_per_query),
|
|
mock.patch('neutron.plugins.ml2.db.get_sg_ids_grouped_by_port',
|
|
return_value={}),
|
|
) as (max_mock, get_mock):
|
|
plugin.get_ports_from_devices(
|
|
['%s%s' % (const.TAP_DEVICE_PREFIX, i)
|
|
for i in range(ports_to_query)])
|
|
all_call_args = map(lambda x: x[1][0], get_mock.mock_calls)
|
|
last_call_args = all_call_args.pop()
|
|
# all but last should be getting MAX_PORTS_PER_QUERY ports
|
|
self.assertTrue(
|
|
all(map(lambda x: len(x) == max_ports_per_query,
|
|
all_call_args))
|
|
)
|
|
remaining = ports_to_query % max_ports_per_query
|
|
if remaining:
|
|
self.assertEqual(remaining, len(last_call_args))
|
|
# should be broken into ceil(total/MAX_PORTS_PER_QUERY) calls
|
|
self.assertEqual(
|
|
math.ceil(ports_to_query / float(max_ports_per_query)),
|
|
get_mock.call_count
|
|
)
|
|
|
|
def test_full_uuids_skip_port_id_lookup(self):
|
|
plugin = manager.NeutronManager.get_plugin()
|
|
# when full UUIDs are provided, the _or statement should only
|
|
# have one matching 'IN' critiera for all of the IDs
|
|
with contextlib.nested(
|
|
mock.patch('neutron.plugins.ml2.db.or_'),
|
|
mock.patch('neutron.plugins.ml2.db.db_api.get_session')
|
|
) as (or_mock, sess_mock):
|
|
fmock = sess_mock.query.return_value.outerjoin.return_value.filter
|
|
# return no ports to exit the method early since we are mocking
|
|
# the query
|
|
fmock.return_value.all.return_value = []
|
|
plugin.get_ports_from_devices([test_api_v2._uuid(),
|
|
test_api_v2._uuid()])
|
|
# the or_ function should only have one argument
|
|
or_mock.assert_called_once_with(mock.ANY)
|
|
|
|
|
|
class TestMl2SGServerRpcCallBack(
|
|
Ml2SecurityGroupsTestCase,
|
|
test_sg_rpc.SGServerRpcCallBackTestCase):
|
|
pass
|