c0894f91dd
Based on the observation that a call to sync_routers can be slow
(10-15 seconds for one virtual router), and that profiling data show
that a significant amount of time is spent in function
_get_mtus_by_network_list, this change fixes incorrect the database
query for getting information about networks.
What changed:
- before: SQL query spent time O(#networks in database)
(select all exists networks from database)
- after : SQL query spent time O(#network_ids passed to the function)
(select only needed networks)
A basic test shows a drastic improvements, from 2 second to around
~0.2 second, in the processing of a _get_mtus_by_network_list call
with 300 networks in database.
Change-Id: Id50d1aaddd0d2a1110502de9c5b974063daa296a
Closes-Bug: #1748888
(cherry picked from commit d15244ab4f2562b46c5fbdb6ccebe18f66e5a579)
313 lines
14 KiB
Python
313 lines
14 KiB
Python
# Copyright 2015 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# 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 mock
|
|
from neutron_lib.callbacks import events
|
|
from neutron_lib.callbacks import registry
|
|
from neutron_lib.callbacks import resources
|
|
from neutron_lib import constants as n_const
|
|
from neutron_lib import exceptions as n_exc
|
|
from neutron_lib.plugins import directory
|
|
import testtools
|
|
|
|
from neutron.db import l3_db
|
|
from neutron.db.models import l3 as l3_models
|
|
from neutron.extensions import l3
|
|
from neutron.tests import base
|
|
|
|
|
|
class TestL3_NAT_dbonly_mixin(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(TestL3_NAT_dbonly_mixin, self).setUp()
|
|
self.db = l3_db.L3_NAT_dbonly_mixin()
|
|
|
|
def test__each_port_having_fixed_ips_none(self):
|
|
"""Be sure the method returns an empty list when None is passed"""
|
|
filtered = l3_db.L3_NAT_dbonly_mixin._each_port_having_fixed_ips(None)
|
|
self.assertEqual([], list(filtered))
|
|
|
|
def test__each_port_having_fixed_ips(self):
|
|
"""Basic test that ports without fixed ips are filtered out"""
|
|
ports = [{'id': 'a', 'fixed_ips': [mock.sentinel.fixedip]},
|
|
{'id': 'b'}]
|
|
filtered = l3_db.L3_NAT_dbonly_mixin._each_port_having_fixed_ips(ports)
|
|
ids = [p['id'] for p in filtered]
|
|
self.assertEqual(['a'], ids)
|
|
|
|
def test__get_subnets_by_network_no_query(self):
|
|
"""Basic test that no query is performed if no Ports are passed"""
|
|
context = mock.Mock()
|
|
with mock.patch.object(directory, 'get_plugin') as get_p:
|
|
self.db._get_subnets_by_network_list(context, [])
|
|
self.assertFalse(context.session.query.called)
|
|
self.assertFalse(get_p.called)
|
|
|
|
def test__get_subnets_by_network(self):
|
|
"""Basic test that the right query is called"""
|
|
context = mock.MagicMock()
|
|
query = context.session.query().outerjoin().filter()
|
|
query.__iter__.return_value = [(mock.sentinel.subnet_db,
|
|
mock.sentinel.address_scope_id)]
|
|
|
|
with mock.patch.object(directory, 'get_plugin') as get_p:
|
|
get_p()._make_subnet_dict.return_value = {
|
|
'network_id': mock.sentinel.network_id}
|
|
subnets = self.db._get_subnets_by_network_list(
|
|
context, [mock.sentinel.network_id])
|
|
self.assertEqual({
|
|
mock.sentinel.network_id: [{
|
|
'address_scope_id': mock.sentinel.address_scope_id,
|
|
'network_id': mock.sentinel.network_id}]}, subnets)
|
|
|
|
def test__get_mtus_by_network_list(self):
|
|
"""Basic test that the query get_networks is correctly"""
|
|
network = {'id': mock.sentinel.network_id,
|
|
'name': mock.sentinel.name,
|
|
'mtu': mock.sentinel.mtu}
|
|
with mock.patch.object(directory, 'get_plugin') as get_p:
|
|
get_p().get_networks.return_value = [network]
|
|
result = self.db._get_mtus_by_network_list(
|
|
mock.sentinel.context, [mock.sentinel.network_id])
|
|
get_p().get_networks.assert_called_once_with(
|
|
mock.sentinel.context,
|
|
filters={'id': [mock.sentinel.network_id]},
|
|
fields=['id', 'mtu'])
|
|
self.assertEqual({mock.sentinel.network_id: mock.sentinel.mtu},
|
|
result)
|
|
|
|
def test__populate_ports_for_subnets_none(self):
|
|
"""Basic test that the method runs correctly with no ports"""
|
|
ports = []
|
|
with mock.patch.object(directory, 'get_plugin') as get_p:
|
|
get_p().get_networks.return_value = []
|
|
self.db._populate_mtu_and_subnets_for_ports(mock.sentinel.context,
|
|
ports)
|
|
self.assertEqual([], ports)
|
|
|
|
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin,
|
|
'_get_subnets_by_network_list')
|
|
def test__populate_ports_for_subnets(self, get_subnets_by_network):
|
|
cidr = "2001:db8::/64"
|
|
subnet = {'id': mock.sentinel.subnet_id,
|
|
'cidr': cidr,
|
|
'gateway_ip': mock.sentinel.gateway_ip,
|
|
'dns_nameservers': mock.sentinel.dns_nameservers,
|
|
'ipv6_ra_mode': mock.sentinel.ipv6_ra_mode,
|
|
'subnetpool_id': mock.sentinel.subnetpool_id,
|
|
'address_scope_id': mock.sentinel.address_scope_id}
|
|
get_subnets_by_network.return_value = {'net_id': [subnet]}
|
|
|
|
ports = [{'network_id': 'net_id',
|
|
'id': 'port_id',
|
|
'fixed_ips': [{'subnet_id': mock.sentinel.subnet_id}]}]
|
|
with mock.patch.object(directory, 'get_plugin') as get_p:
|
|
get_p().get_networks.return_value = [{'id': 'net_id', 'mtu': 1446}]
|
|
self.db._populate_mtu_and_subnets_for_ports(mock.sentinel.context,
|
|
ports)
|
|
keys = ('id', 'cidr', 'gateway_ip', 'ipv6_ra_mode',
|
|
'subnetpool_id', 'dns_nameservers')
|
|
address_scopes = {4: None, 6: mock.sentinel.address_scope_id}
|
|
self.assertEqual([{'extra_subnets': [],
|
|
'fixed_ips': [{'subnet_id':
|
|
mock.sentinel.subnet_id,
|
|
'prefixlen': 64}],
|
|
'id': 'port_id',
|
|
'mtu': 1446,
|
|
'network_id': 'net_id',
|
|
'subnets': [{k: subnet[k] for k in keys}],
|
|
'address_scopes': address_scopes}], ports)
|
|
|
|
def test__get_sync_floating_ips_no_query(self):
|
|
"""Basic test that no query is performed if no router ids are passed"""
|
|
db = l3_db.L3_NAT_dbonly_mixin()
|
|
context = mock.Mock()
|
|
db._get_sync_floating_ips(context, [])
|
|
self.assertFalse(context.session.query.called)
|
|
|
|
@mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_make_floatingip_dict')
|
|
def test__make_floatingip_dict_with_scope(self, make_fip_dict):
|
|
db = l3_db.L3_NAT_dbonly_mixin()
|
|
make_fip_dict.return_value = {'id': mock.sentinel.fip_ip}
|
|
result = db._make_floatingip_dict_with_scope(
|
|
mock.sentinel.floating_ip_db, mock.sentinel.address_scope_id)
|
|
self.assertEqual({
|
|
'fixed_ip_address_scope': mock.sentinel.address_scope_id,
|
|
'id': mock.sentinel.fip_ip}, result)
|
|
|
|
def test__unique_floatingip_iterator(self):
|
|
query = mock.MagicMock()
|
|
query.order_by().__iter__.return_value = [
|
|
({'id': 'id1'}, 'scope1'),
|
|
({'id': 'id1'}, 'scope1'),
|
|
({'id': 'id2'}, 'scope2'),
|
|
({'id': 'id2'}, 'scope2'),
|
|
({'id': 'id2'}, 'scope2'),
|
|
({'id': 'id3'}, 'scope3')]
|
|
query.reset_mock()
|
|
result = list(
|
|
l3_db.L3_NAT_dbonly_mixin._unique_floatingip_iterator(query))
|
|
query.order_by.assert_called_once_with(l3_models.FloatingIP.id)
|
|
self.assertEqual([({'id': 'id1'}, 'scope1'),
|
|
({'id': 'id2'}, 'scope2'),
|
|
({'id': 'id3'}, 'scope3')], result)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_deletion_port_not_found(self, gp):
|
|
# port not found doesn't prevent
|
|
gp.return_value.get_port.side_effect = n_exc.PortNotFound(port_id='1')
|
|
self.db.prevent_l3_port_deletion(None, None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_device_owner_not_router(self, gp):
|
|
# ignores other device owners
|
|
gp.return_value.get_port.return_value = {'device_owner': 'cat'}
|
|
self.db.prevent_l3_port_deletion(None, None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_no_fixed_ips(self, gp):
|
|
# without fixed IPs is allowed
|
|
gp.return_value.get_port.return_value = {
|
|
'device_owner': n_const.DEVICE_OWNER_ROUTER_INTF, 'fixed_ips': [],
|
|
'id': 'f'
|
|
}
|
|
self.db.prevent_l3_port_deletion(None, None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_no_router(self, gp):
|
|
# without router is allowed
|
|
gp.return_value.get_port.return_value = {
|
|
'device_owner': n_const.DEVICE_OWNER_ROUTER_INTF,
|
|
'device_id': '44', 'id': 'f',
|
|
'fixed_ips': [{'ip_address': '1.1.1.1', 'subnet_id': '4'}]}
|
|
self.db.get_router = mock.Mock()
|
|
self.db.get_router.side_effect = l3.RouterNotFound(router_id='44')
|
|
self.db.prevent_l3_port_deletion(mock.Mock(), None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_existing_router(self, gp):
|
|
gp.return_value.get_port.return_value = {
|
|
'device_owner': n_const.DEVICE_OWNER_ROUTER_INTF,
|
|
'device_id': 'some_router', 'id': 'f',
|
|
'fixed_ips': [{'ip_address': '1.1.1.1', 'subnet_id': '4'}]}
|
|
self.db.get_router = mock.Mock()
|
|
with testtools.ExpectedException(n_exc.ServicePortInUse):
|
|
self.db.prevent_l3_port_deletion(mock.Mock(), None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_prevent_l3_port_existing_floating_ip(self, gp):
|
|
gp.return_value.get_port.return_value = {
|
|
'device_owner': n_const.DEVICE_OWNER_FLOATINGIP,
|
|
'device_id': 'some_flip', 'id': 'f',
|
|
'fixed_ips': [{'ip_address': '1.1.1.1', 'subnet_id': '4'}]}
|
|
self.db.get_floatingip = mock.Mock()
|
|
with testtools.ExpectedException(n_exc.ServicePortInUse):
|
|
self.db.prevent_l3_port_deletion(mock.Mock(), None)
|
|
|
|
@mock.patch.object(directory, 'get_plugin')
|
|
def test_subscribe_address_scope_of_subnetpool(self, gp):
|
|
l3_db.L3RpcNotifierMixin()
|
|
registry.notify(resources.SUBNETPOOL_ADDRESS_SCOPE,
|
|
events.AFTER_UPDATE, mock.ANY,
|
|
context=mock.MagicMock(),
|
|
subnetpool_id='fake_id')
|
|
self.assertTrue(gp.return_value.notify_routers_updated.called)
|
|
|
|
def test__check_and_get_fip_assoc_with_extra_association_no_change(self):
|
|
fip = {'extra_key': 'value'}
|
|
context = mock.MagicMock()
|
|
floatingip_db = l3_models.FloatingIP(
|
|
id='fake_fip_id',
|
|
floating_network_id='fake_floating_network_id',
|
|
floating_ip_address='8.8.8.8',
|
|
fixed_port_id='fake_fixed_port_id',
|
|
floating_port_id='fake_floating_port_id')
|
|
with mock.patch.object(
|
|
l3_db.L3_NAT_dbonly_mixin,
|
|
'_get_assoc_data',
|
|
return_value=('1', '2', '3')) as mock_get_assoc_data:
|
|
self.db._check_and_get_fip_assoc(context, fip, floatingip_db)
|
|
context.session.query.assert_not_called()
|
|
mock_get_assoc_data.assert_called_once_with(
|
|
mock.ANY, fip, floatingip_db)
|
|
|
|
def test__notify_attaching_interface(self):
|
|
with mock.patch.object(l3_db.registry, 'notify') as mock_notify:
|
|
context = mock.MagicMock()
|
|
router_id = 'router_id'
|
|
net_id = 'net_id'
|
|
router_db = mock.Mock()
|
|
router_db.id = router_id
|
|
port = {'network_id': net_id}
|
|
intf = {}
|
|
self.db._notify_attaching_interface(context, router_db, port, intf)
|
|
kwargs = {'context': context, 'router_id': router_id,
|
|
'network_id': net_id, 'interface_info': intf,
|
|
'router_db': router_db, 'port': port}
|
|
mock_notify.assert_called_once_with(
|
|
resources.ROUTER_INTERFACE, events.BEFORE_CREATE, self.db,
|
|
**kwargs)
|
|
|
|
|
|
class L3_NAT_db_mixin(base.BaseTestCase):
|
|
def setUp(self):
|
|
super(L3_NAT_db_mixin, self).setUp()
|
|
self.db = l3_db.L3_NAT_db_mixin()
|
|
|
|
def _test_create_router(self, external_gateway_info=None):
|
|
router_db = l3_models.Router(id='123')
|
|
router_dict = {'id': '123', 'tenant_id': '456',
|
|
'external_gateway_info': external_gateway_info}
|
|
# Need to use a copy here as the create_router method pops the gateway
|
|
# information
|
|
router_input = {'router': router_dict.copy()}
|
|
|
|
with mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_create_router_db',
|
|
return_value=router_db) as crd,\
|
|
mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_make_router_dict',
|
|
return_value=router_dict),\
|
|
mock.patch.object(l3_db.L3_NAT_dbonly_mixin,
|
|
'_update_router_gw_info') as urgi,\
|
|
mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_get_router',
|
|
return_value=router_db),\
|
|
mock.patch.object(l3_db.L3_NAT_db_mixin, 'notify_router_updated')\
|
|
as nru:
|
|
|
|
self.db.create_router(mock.Mock(), router_input)
|
|
self.assertTrue(crd.called)
|
|
if external_gateway_info:
|
|
self.assertTrue(urgi.called)
|
|
self.assertTrue(nru.called)
|
|
else:
|
|
self.assertFalse(urgi.called)
|
|
self.assertFalse(nru.called)
|
|
|
|
def test_create_router_no_gateway(self):
|
|
self._test_create_router()
|
|
|
|
def test_create_router_gateway(self):
|
|
ext_gateway_info = {'network_id': 'net-id', 'enable_snat': True,
|
|
'external_fixed_ips': [
|
|
{'subnet_id': 'subnet-id',
|
|
'ip_address': 'ip'}]}
|
|
self._test_create_router(ext_gateway_info)
|
|
|
|
def test_add_router_interface_no_interface_info(self):
|
|
router_db = l3_models.Router(id='123')
|
|
with mock.patch.object(l3_db.L3_NAT_dbonly_mixin, '_get_router',
|
|
return_value=router_db):
|
|
self.assertRaises(
|
|
n_exc.BadRequest,
|
|
self.db.add_router_interface, mock.Mock(), router_db.id)
|