b75a28c178
This patch removes the Neutron capability of creating database tables from sqlalchemy models for all those model classes for which a table is not found in the database schema. Migrations should be the official and only solution for creating and managing the Neutron db schema. This patch also adapts unit tests in order to ensure test schemas are still correctly created. DocImpact Update deployment documentation accordingly. Closes-Bug: #1207402 Change-Id: Ie4ee5507888ecad5f6dc32ce7a029c43014687a2 Co-Authored-By: Henry Gessau <gessau@cisco.com>
392 lines
17 KiB
Python
392 lines
17 KiB
Python
# Copyright 2012, 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 mock
|
|
from oslo.config import cfg
|
|
import testtools
|
|
|
|
from neutron.common import exceptions as exc
|
|
from neutron.common import topics
|
|
from neutron import context
|
|
from neutron.db import db_base_plugin_v2
|
|
from neutron.db import models_v2
|
|
from neutron.extensions import flavor as ext_flavor
|
|
from neutron.openstack.common import uuidutils
|
|
from neutron.plugins.metaplugin import meta_neutron_plugin
|
|
from neutron.tests.unit import testlib_api
|
|
|
|
CONF_FILE = ""
|
|
META_PATH = "neutron.plugins.metaplugin"
|
|
FAKE_PATH = "neutron.tests.unit.metaplugin"
|
|
PROXY_PATH = "%s.proxy_neutron_plugin.ProxyPluginV2" % META_PATH
|
|
PLUGIN_LIST = """
|
|
fake1:%s.fake_plugin.Fake1,fake2:%s.fake_plugin.Fake2,proxy:%s
|
|
""".strip() % (FAKE_PATH, FAKE_PATH, PROXY_PATH)
|
|
L3_PLUGIN_LIST = """
|
|
fake1:%s.fake_plugin.Fake1,fake2:%s.fake_plugin.Fake2
|
|
""".strip() % (FAKE_PATH, FAKE_PATH)
|
|
|
|
|
|
def setup_metaplugin_conf(has_l3=True):
|
|
cfg.CONF.set_override('auth_url', 'http://localhost:35357/v2.0',
|
|
'PROXY')
|
|
cfg.CONF.set_override('auth_region', 'RegionOne', 'PROXY')
|
|
cfg.CONF.set_override('admin_user', 'neutron', 'PROXY')
|
|
cfg.CONF.set_override('admin_password', 'password', 'PROXY')
|
|
cfg.CONF.set_override('admin_tenant_name', 'service', 'PROXY')
|
|
cfg.CONF.set_override('plugin_list', PLUGIN_LIST, 'META')
|
|
if has_l3:
|
|
cfg.CONF.set_override('l3_plugin_list', L3_PLUGIN_LIST, 'META')
|
|
else:
|
|
cfg.CONF.set_override('l3_plugin_list', "", 'META')
|
|
cfg.CONF.set_override('default_flavor', 'fake2', 'META')
|
|
cfg.CONF.set_override('default_l3_flavor', 'fake1', 'META')
|
|
cfg.CONF.set_override('base_mac', "12:34:56:78:90:ab")
|
|
#TODO(nati) remove this after subnet quota change is merged
|
|
cfg.CONF.set_override('max_dns_nameservers', 10)
|
|
|
|
|
|
# Hooks registered by metaplugin must not exist for other plugins UT.
|
|
# So hooks must be unregistered (overwrite to None in fact).
|
|
def unregister_meta_hooks():
|
|
db_base_plugin_v2.NeutronDbPluginV2.register_model_query_hook(
|
|
models_v2.Network, 'metaplugin_net', None, None, None)
|
|
db_base_plugin_v2.NeutronDbPluginV2.register_model_query_hook(
|
|
models_v2.Port, 'metaplugin_port', None, None, None)
|
|
|
|
|
|
class MetaNeutronPluginV2Test(testlib_api.SqlTestCase):
|
|
"""Class conisting of MetaNeutronPluginV2 unit tests."""
|
|
|
|
has_l3 = True
|
|
|
|
def setUp(self):
|
|
super(MetaNeutronPluginV2Test, self).setUp()
|
|
self.fake_tenant_id = uuidutils.generate_uuid()
|
|
self.context = context.get_admin_context()
|
|
|
|
self.addCleanup(unregister_meta_hooks)
|
|
|
|
setup_metaplugin_conf(self.has_l3)
|
|
|
|
self.client_cls_p = mock.patch('neutronclient.v2_0.client.Client')
|
|
client_cls = self.client_cls_p.start()
|
|
self.client_inst = mock.Mock()
|
|
client_cls.return_value = self.client_inst
|
|
self.client_inst.create_network.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.create_port.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.create_subnet.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.update_network.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.update_port.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.update_subnet.return_value = \
|
|
{'id': 'fake_id'}
|
|
self.client_inst.delete_network.return_value = True
|
|
self.client_inst.delete_port.return_value = True
|
|
self.client_inst.delete_subnet.return_value = True
|
|
plugin = (meta_neutron_plugin.MetaPluginV2.__module__ + '.'
|
|
+ meta_neutron_plugin.MetaPluginV2.__name__)
|
|
self.setup_coreplugin(plugin)
|
|
self.plugin = meta_neutron_plugin.MetaPluginV2(configfile=None)
|
|
|
|
def _fake_network(self, flavor):
|
|
data = {'network': {'name': flavor,
|
|
'admin_state_up': True,
|
|
'shared': False,
|
|
'router:external': [],
|
|
'tenant_id': self.fake_tenant_id,
|
|
ext_flavor.FLAVOR_NETWORK: flavor}}
|
|
return data
|
|
|
|
def _fake_port(self, net_id):
|
|
return {'port': {'name': net_id,
|
|
'network_id': net_id,
|
|
'admin_state_up': True,
|
|
'device_id': 'bad_device_id',
|
|
'device_owner': 'bad_device_owner',
|
|
'admin_state_up': True,
|
|
'host_routes': [],
|
|
'fixed_ips': [],
|
|
'mac_address':
|
|
self.plugin._generate_mac(self.context, net_id),
|
|
'tenant_id': self.fake_tenant_id}}
|
|
|
|
def _fake_subnet(self, net_id):
|
|
allocation_pools = [{'start': '10.0.0.2',
|
|
'end': '10.0.0.254'}]
|
|
return {'subnet': {'name': net_id,
|
|
'network_id': net_id,
|
|
'gateway_ip': '10.0.0.1',
|
|
'dns_nameservers': ['10.0.0.2'],
|
|
'host_routes': [],
|
|
'cidr': '10.0.0.0/24',
|
|
'allocation_pools': allocation_pools,
|
|
'enable_dhcp': True,
|
|
'ip_version': 4}}
|
|
|
|
def _fake_router(self, flavor):
|
|
data = {'router': {'name': flavor, 'admin_state_up': True,
|
|
'tenant_id': self.fake_tenant_id,
|
|
ext_flavor.FLAVOR_ROUTER: flavor,
|
|
'external_gateway_info': None}}
|
|
return data
|
|
|
|
def test_create_delete_network(self):
|
|
network1 = self._fake_network('fake1')
|
|
ret1 = self.plugin.create_network(self.context, network1)
|
|
self.assertEqual('fake1', ret1[ext_flavor.FLAVOR_NETWORK])
|
|
|
|
network2 = self._fake_network('fake2')
|
|
ret2 = self.plugin.create_network(self.context, network2)
|
|
self.assertEqual('fake2', ret2[ext_flavor.FLAVOR_NETWORK])
|
|
|
|
network3 = self._fake_network('proxy')
|
|
ret3 = self.plugin.create_network(self.context, network3)
|
|
self.assertEqual('proxy', ret3[ext_flavor.FLAVOR_NETWORK])
|
|
|
|
db_ret1 = self.plugin.get_network(self.context, ret1['id'])
|
|
self.assertEqual('fake1', db_ret1['name'])
|
|
|
|
db_ret2 = self.plugin.get_network(self.context, ret2['id'])
|
|
self.assertEqual('fake2', db_ret2['name'])
|
|
|
|
db_ret3 = self.plugin.get_network(self.context, ret3['id'])
|
|
self.assertEqual('proxy', db_ret3['name'])
|
|
|
|
db_ret4 = self.plugin.get_networks(self.context)
|
|
self.assertEqual(3, len(db_ret4))
|
|
|
|
db_ret5 = self.plugin.get_networks(
|
|
self.context,
|
|
{ext_flavor.FLAVOR_NETWORK: ['fake1']})
|
|
self.assertEqual(1, len(db_ret5))
|
|
self.assertEqual('fake1', db_ret5[0]['name'])
|
|
self.plugin.delete_network(self.context, ret1['id'])
|
|
self.plugin.delete_network(self.context, ret2['id'])
|
|
self.plugin.delete_network(self.context, ret3['id'])
|
|
|
|
def test_create_delete_port(self):
|
|
network1 = self._fake_network('fake1')
|
|
network_ret1 = self.plugin.create_network(self.context, network1)
|
|
network2 = self._fake_network('fake2')
|
|
network_ret2 = self.plugin.create_network(self.context, network2)
|
|
network3 = self._fake_network('proxy')
|
|
network_ret3 = self.plugin.create_network(self.context, network3)
|
|
|
|
port1 = self._fake_port(network_ret1['id'])
|
|
port2 = self._fake_port(network_ret2['id'])
|
|
port3 = self._fake_port(network_ret3['id'])
|
|
|
|
port1_ret = self.plugin.create_port(self.context, port1)
|
|
port2_ret = self.plugin.create_port(self.context, port2)
|
|
port3_ret = self.plugin.create_port(self.context, port3)
|
|
ports_all = self.plugin.get_ports(self.context)
|
|
|
|
self.assertEqual(network_ret1['id'], port1_ret['network_id'])
|
|
self.assertEqual(network_ret2['id'], port2_ret['network_id'])
|
|
self.assertEqual(network_ret3['id'], port3_ret['network_id'])
|
|
self.assertEqual(3, len(ports_all))
|
|
|
|
port1_dict = self.plugin._make_port_dict(port1_ret)
|
|
port2_dict = self.plugin._make_port_dict(port2_ret)
|
|
port3_dict = self.plugin._make_port_dict(port3_ret)
|
|
|
|
self.assertEqual(port1_dict, port1_ret)
|
|
self.assertEqual(port2_dict, port2_ret)
|
|
self.assertEqual(port3_dict, port3_ret)
|
|
|
|
port1['port']['admin_state_up'] = False
|
|
port2['port']['admin_state_up'] = False
|
|
port3['port']['admin_state_up'] = False
|
|
self.plugin.update_port(self.context, port1_ret['id'], port1)
|
|
self.plugin.update_port(self.context, port2_ret['id'], port2)
|
|
self.plugin.update_port(self.context, port3_ret['id'], port3)
|
|
port_in_db1 = self.plugin.get_port(self.context, port1_ret['id'])
|
|
port_in_db2 = self.plugin.get_port(self.context, port2_ret['id'])
|
|
port_in_db3 = self.plugin.get_port(self.context, port3_ret['id'])
|
|
self.assertEqual(False, port_in_db1['admin_state_up'])
|
|
self.assertEqual(False, port_in_db2['admin_state_up'])
|
|
self.assertEqual(False, port_in_db3['admin_state_up'])
|
|
|
|
self.plugin.delete_port(self.context, port1_ret['id'])
|
|
self.plugin.delete_port(self.context, port2_ret['id'])
|
|
self.plugin.delete_port(self.context, port3_ret['id'])
|
|
|
|
self.plugin.delete_network(self.context, network_ret1['id'])
|
|
self.plugin.delete_network(self.context, network_ret2['id'])
|
|
self.plugin.delete_network(self.context, network_ret3['id'])
|
|
|
|
def test_create_delete_subnet(self):
|
|
# for this test we need to enable overlapping ips
|
|
cfg.CONF.set_default('allow_overlapping_ips', True)
|
|
network1 = self._fake_network('fake1')
|
|
network_ret1 = self.plugin.create_network(self.context, network1)
|
|
network2 = self._fake_network('fake2')
|
|
network_ret2 = self.plugin.create_network(self.context, network2)
|
|
network3 = self._fake_network('proxy')
|
|
network_ret3 = self.plugin.create_network(self.context, network3)
|
|
|
|
subnet1 = self._fake_subnet(network_ret1['id'])
|
|
subnet2 = self._fake_subnet(network_ret2['id'])
|
|
subnet3 = self._fake_subnet(network_ret3['id'])
|
|
|
|
subnet1_ret = self.plugin.create_subnet(self.context, subnet1)
|
|
subnet2_ret = self.plugin.create_subnet(self.context, subnet2)
|
|
subnet3_ret = self.plugin.create_subnet(self.context, subnet3)
|
|
self.assertEqual(network_ret1['id'], subnet1_ret['network_id'])
|
|
self.assertEqual(network_ret2['id'], subnet2_ret['network_id'])
|
|
self.assertEqual(network_ret3['id'], subnet3_ret['network_id'])
|
|
|
|
subnet_in_db1 = self.plugin.get_subnet(self.context, subnet1_ret['id'])
|
|
subnet_in_db2 = self.plugin.get_subnet(self.context, subnet2_ret['id'])
|
|
subnet_in_db3 = self.plugin.get_subnet(self.context, subnet3_ret['id'])
|
|
|
|
subnet1['subnet']['allocation_pools'].pop()
|
|
subnet2['subnet']['allocation_pools'].pop()
|
|
subnet3['subnet']['allocation_pools'].pop()
|
|
|
|
self.plugin.update_subnet(self.context,
|
|
subnet1_ret['id'], subnet1)
|
|
self.plugin.update_subnet(self.context,
|
|
subnet2_ret['id'], subnet2)
|
|
self.plugin.update_subnet(self.context,
|
|
subnet3_ret['id'], subnet3)
|
|
subnet_in_db1 = self.plugin.get_subnet(self.context, subnet1_ret['id'])
|
|
subnet_in_db2 = self.plugin.get_subnet(self.context, subnet2_ret['id'])
|
|
subnet_in_db3 = self.plugin.get_subnet(self.context, subnet3_ret['id'])
|
|
|
|
self.assertEqual(4, subnet_in_db1['ip_version'])
|
|
self.assertEqual(4, subnet_in_db2['ip_version'])
|
|
self.assertEqual(4, subnet_in_db3['ip_version'])
|
|
|
|
self.plugin.delete_subnet(self.context, subnet1_ret['id'])
|
|
self.plugin.delete_subnet(self.context, subnet2_ret['id'])
|
|
self.plugin.delete_subnet(self.context, subnet3_ret['id'])
|
|
|
|
self.plugin.delete_network(self.context, network_ret1['id'])
|
|
self.plugin.delete_network(self.context, network_ret2['id'])
|
|
self.plugin.delete_network(self.context, network_ret3['id'])
|
|
|
|
def test_create_delete_router(self):
|
|
router1 = self._fake_router('fake1')
|
|
router_ret1 = self.plugin.create_router(self.context, router1)
|
|
router2 = self._fake_router('fake2')
|
|
router_ret2 = self.plugin.create_router(self.context, router2)
|
|
|
|
self.assertEqual('fake1', router_ret1[ext_flavor.FLAVOR_ROUTER])
|
|
self.assertEqual('fake2', router_ret2[ext_flavor.FLAVOR_ROUTER])
|
|
|
|
router_in_db1 = self.plugin.get_router(self.context, router_ret1['id'])
|
|
router_in_db2 = self.plugin.get_router(self.context, router_ret2['id'])
|
|
|
|
self.assertEqual('fake1', router_in_db1[ext_flavor.FLAVOR_ROUTER])
|
|
self.assertEqual('fake2', router_in_db2[ext_flavor.FLAVOR_ROUTER])
|
|
|
|
self.plugin.delete_router(self.context, router_ret1['id'])
|
|
self.plugin.delete_router(self.context, router_ret2['id'])
|
|
with testtools.ExpectedException(meta_neutron_plugin.FlavorNotFound):
|
|
self.plugin.get_router(self.context, router_ret1['id'])
|
|
|
|
def test_extension_method(self):
|
|
self.assertEqual('fake1', self.plugin.fake_func())
|
|
self.assertEqual('fake2', self.plugin.fake_func2())
|
|
|
|
def test_extension_not_implemented_method(self):
|
|
try:
|
|
self.plugin.not_implemented()
|
|
except AttributeError:
|
|
return
|
|
except Exception:
|
|
self.fail("AttributeError Error is not raised")
|
|
|
|
self.fail("No Error is not raised")
|
|
|
|
def test_create_network_flavor_fail(self):
|
|
with mock.patch('neutron.plugins.metaplugin.meta_db_v2.'
|
|
'add_network_flavor_binding',
|
|
side_effect=Exception):
|
|
network = self._fake_network('fake1')
|
|
self.assertRaises(meta_neutron_plugin.FaildToAddFlavorBinding,
|
|
self.plugin.create_network,
|
|
self.context,
|
|
network)
|
|
count = self.plugin.get_networks_count(self.context)
|
|
self.assertEqual(count, 0)
|
|
|
|
def test_create_router_flavor_fail(self):
|
|
with mock.patch('neutron.plugins.metaplugin.meta_db_v2.'
|
|
'add_router_flavor_binding',
|
|
side_effect=Exception):
|
|
router = self._fake_router('fake1')
|
|
self.assertRaises(meta_neutron_plugin.FaildToAddFlavorBinding,
|
|
self.plugin.create_router,
|
|
self.context,
|
|
router)
|
|
count = self.plugin.get_routers_count(self.context)
|
|
self.assertEqual(count, 0)
|
|
|
|
|
|
class MetaNeutronPluginV2TestWithoutL3(MetaNeutronPluginV2Test):
|
|
"""Tests without l3_plugin_list configration."""
|
|
|
|
has_l3 = False
|
|
|
|
def test_supported_extension_aliases(self):
|
|
self.assertEqual(self.plugin.supported_extension_aliases,
|
|
['flavor', 'external-net'])
|
|
|
|
def test_create_delete_router(self):
|
|
self.skipTest("Test case without router")
|
|
|
|
def test_create_router_flavor_fail(self):
|
|
self.skipTest("Test case without router")
|
|
|
|
|
|
class MetaNeutronPluginV2TestRpcFlavor(testlib_api.SqlTestCase):
|
|
"""Tests for rpc_flavor."""
|
|
|
|
def setUp(self):
|
|
super(MetaNeutronPluginV2TestRpcFlavor, self).setUp()
|
|
self.addCleanup(unregister_meta_hooks)
|
|
|
|
def test_rpc_flavor(self):
|
|
setup_metaplugin_conf()
|
|
cfg.CONF.set_override('rpc_flavor', 'fake1', 'META')
|
|
self.plugin = meta_neutron_plugin.MetaPluginV2()
|
|
self.assertEqual(topics.PLUGIN, 'q-plugin')
|
|
ret = self.plugin.rpc_workers_supported()
|
|
self.assertFalse(ret)
|
|
|
|
def test_invalid_rpc_flavor(self):
|
|
setup_metaplugin_conf()
|
|
cfg.CONF.set_override('rpc_flavor', 'fake-fake', 'META')
|
|
self.assertRaises(exc.Invalid,
|
|
meta_neutron_plugin.MetaPluginV2)
|
|
self.assertEqual(topics.PLUGIN, 'q-plugin')
|
|
|
|
def test_rpc_flavor_multiple_rpc_workers(self):
|
|
setup_metaplugin_conf()
|
|
cfg.CONF.set_override('rpc_flavor', 'fake2', 'META')
|
|
self.plugin = meta_neutron_plugin.MetaPluginV2()
|
|
self.assertEqual(topics.PLUGIN, 'q-plugin')
|
|
ret = self.plugin.rpc_workers_supported()
|
|
self.assertTrue(ret)
|
|
ret = self.plugin.start_rpc_listeners()
|
|
self.assertEqual('OK', ret)
|