9bf0e66544
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>
179 lines
8.4 KiB
Python
179 lines
8.4 KiB
Python
# Copyright (c) 2013 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 six import moves
|
|
from testtools import matchers
|
|
|
|
from neutron.common import exceptions as n_exc
|
|
from neutron.db import api as db
|
|
from neutron.plugins.mlnx.db import mlnx_db_v2 as mlnx_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'
|
|
NET_TYPE = 'vlan'
|
|
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)]}
|
|
TEST_NETWORK_ID = 'abcdefghijklmnopqrstuvwxyz'
|
|
|
|
|
|
class SegmentationIdAllocationTest(testlib_api.SqlTestCase):
|
|
def setUp(self):
|
|
super(SegmentationIdAllocationTest, self).setUp()
|
|
mlnx_db.sync_network_states(VLAN_RANGES)
|
|
self.session = db.get_session()
|
|
|
|
def test_sync_segmentationIdAllocation(self):
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
mlnx_db.sync_network_states(UPDATED_VLAN_RANGES)
|
|
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5 - 1))
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 5 + 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5 - 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5).allocated)
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 5 + 1))
|
|
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20 - 1))
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20).allocated)
|
|
self.assertFalse(
|
|
mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20 + 1).allocated)
|
|
self.assertFalse(
|
|
mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20 - 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20).allocated)
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20 + 1))
|
|
|
|
mlnx_db.sync_network_states(VLAN_RANGES)
|
|
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MIN + 20))
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET_2,
|
|
VLAN_MAX + 20))
|
|
|
|
def test_segmentationId_pool(self):
|
|
vlan_ids = set()
|
|
for x in moves.xrange(VLAN_MIN, VLAN_MAX + 1):
|
|
physical_network, vlan_id = mlnx_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)
|
|
|
|
self.assertRaises(n_exc.NoNetworkAvailable,
|
|
mlnx_db.reserve_network,
|
|
self.session)
|
|
for vlan_id in vlan_ids:
|
|
mlnx_db.release_network(self.session, PHYS_NET,
|
|
vlan_id, VLAN_RANGES)
|
|
|
|
def test_specific_segmentationId_inside_pool(self):
|
|
vlan_id = VLAN_MIN + 5
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
mlnx_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(mlnx_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
self.assertRaises(n_exc.VlanIdInUse,
|
|
mlnx_db.reserve_specific_network,
|
|
self.session,
|
|
PHYS_NET,
|
|
vlan_id)
|
|
|
|
mlnx_db.release_network(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertFalse(mlnx_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
def test_specific_segmentationId_outside_pool(self):
|
|
vlan_id = VLAN_MAX + 5
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET, vlan_id))
|
|
mlnx_db.reserve_specific_network(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(mlnx_db.get_network_state(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
self.assertRaises(n_exc.VlanIdInUse,
|
|
mlnx_db.reserve_specific_network,
|
|
self.session,
|
|
PHYS_NET,
|
|
vlan_id)
|
|
|
|
mlnx_db.release_network(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertIsNone(mlnx_db.get_network_state(PHYS_NET, vlan_id))
|
|
|
|
|
|
class NetworkBindingsTest(test_plugin.NeutronDbPluginV2TestCase):
|
|
def setUp(self):
|
|
super(NetworkBindingsTest, self).setUp()
|
|
self.session = db.get_session()
|
|
|
|
def test_add_network_binding(self):
|
|
with self.network() as network:
|
|
TEST_NETWORK_ID = network['network']['id']
|
|
self.assertIsNone(mlnx_db.get_network_binding(self.session,
|
|
TEST_NETWORK_ID))
|
|
mlnx_db.add_network_binding(self.session,
|
|
TEST_NETWORK_ID,
|
|
NET_TYPE,
|
|
PHYS_NET,
|
|
1234)
|
|
binding = mlnx_db.get_network_binding(self.session,
|
|
TEST_NETWORK_ID)
|
|
self.assertIsNotNone(binding)
|
|
self.assertEqual(binding.network_id, TEST_NETWORK_ID)
|
|
self.assertEqual(binding.network_type, NET_TYPE)
|
|
self.assertEqual(binding.physical_network, PHYS_NET)
|
|
self.assertEqual(binding.segmentation_id, 1234)
|