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>
170 lines
7.9 KiB
Python
170 lines
7.9 KiB
Python
# Copyright (c) 2012 OpenStack Foundation.
|
|
#
|
|
# 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.
|
|
|
|
from oslo.config import cfg
|
|
from six import moves
|
|
import testtools
|
|
from testtools import matchers
|
|
|
|
from neutron.common import exceptions as n_exc
|
|
from neutron.db import api as db
|
|
from neutron.plugins.linuxbridge.db import l2network_db_v2 as lb_db
|
|
from neutron.tests.unit import test_db_plugin as test_plugin
|
|
from neutron.tests.unit import testlib_api
|
|
|
|
PHYS_NET = 'physnet1'
|
|
PHYS_NET_2 = 'physnet2'
|
|
VLAN_MIN = 10
|
|
VLAN_MAX = 19
|
|
VLAN_RANGES = {PHYS_NET: [(VLAN_MIN, VLAN_MAX)]}
|
|
UPDATED_VLAN_RANGES = {PHYS_NET: [(VLAN_MIN + 5, VLAN_MAX + 5)],
|
|
PHYS_NET_2: [(VLAN_MIN + 20, VLAN_MAX + 20)]}
|
|
|
|
PLUGIN_NAME = ('neutron.plugins.linuxbridge.'
|
|
'lb_neutron_plugin.LinuxBridgePluginV2')
|
|
|
|
|
|
class NetworkStatesTest(testlib_api.SqlTestCase):
|
|
def setUp(self):
|
|
super(NetworkStatesTest, self).setUp()
|
|
lb_db.sync_network_states(VLAN_RANGES)
|
|
self.session = db.get_session()
|
|
|
|
def test_sync_network_states(self):
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
lb_db.sync_network_states(UPDATED_VLAN_RANGES)
|
|
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5 - 1))
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5 + 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5 - 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5).allocated)
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5 + 1))
|
|
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20 - 1))
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20 + 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20 - 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20).allocated)
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20 + 1))
|
|
|
|
lb_db.sync_network_states(VLAN_RANGES)
|
|
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20))
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20))
|
|
|
|
def test_network_pool(self):
|
|
vlan_ids = set()
|
|
for x in moves.xrange(VLAN_MIN, VLAN_MAX + 1):
|
|
physical_network, vlan_id = lb_db.reserve_network(self.session)
|
|
self.assertEqual(physical_network, PHYS_NET)
|
|
self.assertThat(vlan_id, matchers.GreaterThan(VLAN_MIN - 1))
|
|
self.assertThat(vlan_id, matchers.LessThan(VLAN_MAX + 1))
|
|
vlan_ids.add(vlan_id)
|
|
|
|
with testtools.ExpectedException(n_exc.NoNetworkAvailable):
|
|
physical_network, vlan_id = lb_db.reserve_network(self.session)
|
|
|
|
for vlan_id in vlan_ids:
|
|
lb_db.release_network(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
|
|
def test_specific_network_inside_pool(self):
|
|
vlan_id = VLAN_MIN + 5
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
lb_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(lb_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.VlanIdInUse):
|
|
lb_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
|
|
lb_db.release_network(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertFalse(lb_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
def test_specific_network_outside_pool(self):
|
|
vlan_id = VLAN_MAX + 5
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET, vlan_id))
|
|
lb_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(lb_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.VlanIdInUse):
|
|
lb_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
|
|
lb_db.release_network(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertIsNone(lb_db.get_network_state(PHYS_NET, vlan_id))
|
|
|
|
|
|
class NetworkBindingsTest(test_plugin.NeutronDbPluginV2TestCase):
|
|
def setUp(self):
|
|
cfg.CONF.set_override('network_vlan_ranges', ['physnet1:1000:2999'],
|
|
group='VLANS')
|
|
super(NetworkBindingsTest, self).setUp(plugin=PLUGIN_NAME)
|
|
self.session = db.get_session()
|
|
|
|
def test_add_network_binding(self):
|
|
params = {'provider:network_type': 'vlan',
|
|
'provider:physical_network': PHYS_NET,
|
|
'provider:segmentation_id': 1234}
|
|
params['arg_list'] = tuple(params.keys())
|
|
with self.network(**params) as network:
|
|
TEST_NETWORK_ID = network['network']['id']
|
|
binding = lb_db.get_network_binding(self.session, TEST_NETWORK_ID)
|
|
self.assertIsNotNone(binding)
|
|
self.assertEqual(binding.network_id, TEST_NETWORK_ID)
|
|
self.assertEqual(binding.physical_network, PHYS_NET)
|
|
self.assertEqual(binding.vlan_id, 1234)
|