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>
316 lines
15 KiB
Python
316 lines
15 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.
|
|
|
|
import mock
|
|
from oslo.config import cfg
|
|
from oslo.db import exception as db_exc
|
|
from oslo.db.sqlalchemy import session
|
|
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.openvswitch import ovs_db_v2
|
|
from neutron.plugins.openvswitch import ovs_models_v2 as ovs_models
|
|
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)]}
|
|
TUN_MIN = 100
|
|
TUN_MAX = 109
|
|
TUNNEL_RANGES = [(TUN_MIN, TUN_MAX)]
|
|
UPDATED_TUNNEL_RANGES = [(TUN_MIN + 5, TUN_MAX + 5)]
|
|
|
|
PLUGIN_NAME = ('neutron.plugins.openvswitch.'
|
|
'ovs_neutron_plugin.OVSNeutronPluginV2')
|
|
|
|
|
|
class VlanAllocationsTest(testlib_api.SqlTestCase):
|
|
def setUp(self):
|
|
super(VlanAllocationsTest, self).setUp()
|
|
ovs_db_v2.sync_vlan_allocations(VLAN_RANGES)
|
|
self.session = db.get_session()
|
|
|
|
def test_sync_vlan_allocations(self):
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
ovs_db_v2.sync_vlan_allocations(UPDATED_VLAN_RANGES)
|
|
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN + 5 - 1))
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN + 5).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN + 5 + 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX + 5 - 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX + 5).
|
|
allocated)
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX + 5 + 1))
|
|
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MIN + 20 - 1))
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MIN + 20).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MIN + 20 + 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MAX + 20 - 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MAX + 20).
|
|
allocated)
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MAX + 20 + 1))
|
|
|
|
ovs_db_v2.sync_vlan_allocations(VLAN_RANGES)
|
|
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN - 1))
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MIN + 1).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX - 1).allocated)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX).allocated)
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
VLAN_MAX + 1))
|
|
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MIN + 20))
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET_2,
|
|
VLAN_MAX + 20))
|
|
|
|
def test_vlan_pool(self):
|
|
vlan_ids = set()
|
|
for x in moves.xrange(VLAN_MIN, VLAN_MAX + 1):
|
|
physical_network, vlan_id = ovs_db_v2.reserve_vlan(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 = ovs_db_v2.reserve_vlan(self.session)
|
|
|
|
ovs_db_v2.release_vlan(self.session, PHYS_NET, vlan_ids.pop(),
|
|
VLAN_RANGES)
|
|
physical_network, vlan_id = ovs_db_v2.reserve_vlan(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)
|
|
|
|
for vlan_id in vlan_ids:
|
|
ovs_db_v2.release_vlan(self.session, PHYS_NET, vlan_id,
|
|
VLAN_RANGES)
|
|
|
|
def test_specific_vlan_inside_pool(self):
|
|
vlan_id = VLAN_MIN + 5
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
vlan_id).allocated)
|
|
ovs_db_v2.reserve_specific_vlan(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.VlanIdInUse):
|
|
ovs_db_v2.reserve_specific_vlan(self.session, PHYS_NET, vlan_id)
|
|
|
|
ovs_db_v2.release_vlan(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertFalse(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
def test_specific_vlan_outside_pool(self):
|
|
vlan_id = VLAN_MAX + 5
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET, vlan_id))
|
|
ovs_db_v2.reserve_specific_vlan(self.session, PHYS_NET, vlan_id)
|
|
self.assertTrue(ovs_db_v2.get_vlan_allocation(PHYS_NET,
|
|
vlan_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.VlanIdInUse):
|
|
ovs_db_v2.reserve_specific_vlan(self.session, PHYS_NET, vlan_id)
|
|
|
|
ovs_db_v2.release_vlan(self.session, PHYS_NET, vlan_id, VLAN_RANGES)
|
|
self.assertIsNone(ovs_db_v2.get_vlan_allocation(PHYS_NET, vlan_id))
|
|
|
|
def test_sync_with_allocated_false(self):
|
|
vlan_ids = set()
|
|
for x in moves.xrange(VLAN_MIN, VLAN_MAX + 1):
|
|
physical_network, vlan_id = ovs_db_v2.reserve_vlan(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)
|
|
|
|
ovs_db_v2.release_vlan(self.session, PHYS_NET, vlan_ids.pop(),
|
|
VLAN_RANGES)
|
|
ovs_db_v2.sync_vlan_allocations({})
|
|
|
|
|
|
class TunnelAllocationsTest(testlib_api.SqlTestCase):
|
|
def setUp(self):
|
|
super(TunnelAllocationsTest, self).setUp()
|
|
ovs_db_v2.sync_tunnel_allocations(TUNNEL_RANGES)
|
|
self.session = db.get_session()
|
|
|
|
def test_sync_tunnel_allocations(self):
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(TUN_MIN - 1))
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MIN).allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MIN + 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MAX - 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MAX).allocated)
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(TUN_MAX + 1))
|
|
|
|
ovs_db_v2.sync_tunnel_allocations(UPDATED_TUNNEL_RANGES)
|
|
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(TUN_MIN + 5 - 1))
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MIN + 5).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MIN + 5 + 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MAX + 5 - 1).
|
|
allocated)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(TUN_MAX + 5).
|
|
allocated)
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(TUN_MAX + 5 + 1))
|
|
|
|
def test_tunnel_pool(self):
|
|
tunnel_ids = set()
|
|
for x in moves.xrange(TUN_MIN, TUN_MAX + 1):
|
|
tunnel_id = ovs_db_v2.reserve_tunnel(self.session)
|
|
self.assertThat(tunnel_id, matchers.GreaterThan(TUN_MIN - 1))
|
|
self.assertThat(tunnel_id, matchers.LessThan(TUN_MAX + 1))
|
|
tunnel_ids.add(tunnel_id)
|
|
|
|
with testtools.ExpectedException(n_exc.NoNetworkAvailable):
|
|
tunnel_id = ovs_db_v2.reserve_tunnel(self.session)
|
|
|
|
ovs_db_v2.release_tunnel(self.session, tunnel_ids.pop(), TUNNEL_RANGES)
|
|
tunnel_id = ovs_db_v2.reserve_tunnel(self.session)
|
|
self.assertThat(tunnel_id, matchers.GreaterThan(TUN_MIN - 1))
|
|
self.assertThat(tunnel_id, matchers.LessThan(TUN_MAX + 1))
|
|
tunnel_ids.add(tunnel_id)
|
|
|
|
for tunnel_id in tunnel_ids:
|
|
ovs_db_v2.release_tunnel(self.session, tunnel_id, TUNNEL_RANGES)
|
|
|
|
def test_add_tunnel_endpoints(self):
|
|
tun_1 = ovs_db_v2.add_tunnel_endpoint('192.168.0.1')
|
|
tun_2 = ovs_db_v2.add_tunnel_endpoint('192.168.0.2')
|
|
self.assertEqual(1, tun_1.id)
|
|
self.assertEqual('192.168.0.1', tun_1.ip_address)
|
|
self.assertEqual(2, tun_2.id)
|
|
self.assertEqual('192.168.0.2', tun_2.ip_address)
|
|
|
|
def test_specific_tunnel_inside_pool(self):
|
|
tunnel_id = TUN_MIN + 5
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(tunnel_id).allocated)
|
|
ovs_db_v2.reserve_specific_tunnel(self.session, tunnel_id)
|
|
self.assertTrue(ovs_db_v2.get_tunnel_allocation(tunnel_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.TunnelIdInUse):
|
|
ovs_db_v2.reserve_specific_tunnel(self.session, tunnel_id)
|
|
|
|
ovs_db_v2.release_tunnel(self.session, tunnel_id, TUNNEL_RANGES)
|
|
self.assertFalse(ovs_db_v2.get_tunnel_allocation(tunnel_id).allocated)
|
|
|
|
def test_specific_tunnel_outside_pool(self):
|
|
tunnel_id = TUN_MAX + 5
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(tunnel_id))
|
|
ovs_db_v2.reserve_specific_tunnel(self.session, tunnel_id)
|
|
self.assertTrue(ovs_db_v2.get_tunnel_allocation(tunnel_id).allocated)
|
|
|
|
with testtools.ExpectedException(n_exc.TunnelIdInUse):
|
|
ovs_db_v2.reserve_specific_tunnel(self.session, tunnel_id)
|
|
|
|
ovs_db_v2.release_tunnel(self.session, tunnel_id, TUNNEL_RANGES)
|
|
self.assertIsNone(ovs_db_v2.get_tunnel_allocation(tunnel_id))
|
|
|
|
def test_add_tunnel_endpoint_create_new_endpoint(self):
|
|
addr = '10.0.0.1'
|
|
ovs_db_v2.add_tunnel_endpoint(addr)
|
|
self.assertIsNotNone(self.session.query(ovs_models.TunnelEndpoint).
|
|
filter_by(ip_address=addr).first())
|
|
|
|
def test_add_tunnel_endpoint_retrieve_an_existing_endpoint(self):
|
|
addr = '10.0.0.1'
|
|
self.session.add(ovs_models.TunnelEndpoint(ip_address=addr, id=1))
|
|
self.session.flush()
|
|
|
|
tunnel = ovs_db_v2.add_tunnel_endpoint(addr)
|
|
self.assertEqual(tunnel.id, 1)
|
|
self.assertEqual(tunnel.ip_address, addr)
|
|
|
|
def test_add_tunnel_endpoint_handle_duplicate_error(self):
|
|
with mock.patch.object(session.Session, 'query') as query_mock:
|
|
error = db_exc.DBDuplicateEntry(['id'])
|
|
query_mock.side_effect = error
|
|
|
|
with testtools.ExpectedException(n_exc.NeutronException):
|
|
ovs_db_v2.add_tunnel_endpoint('10.0.0.1', 5)
|
|
self.assertEqual(query_mock.call_count, 5)
|
|
|
|
|
|
class NetworkBindingsTest(test_plugin.NeutronDbPluginV2TestCase):
|
|
def setUp(self):
|
|
cfg.CONF.set_override('network_vlan_ranges', ['physnet1:1000:2999'],
|
|
group='OVS')
|
|
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 = ovs_db_v2.get_network_binding(self.session,
|
|
TEST_NETWORK_ID)
|
|
self.assertIsNotNone(binding)
|
|
self.assertEqual(binding.network_id, TEST_NETWORK_ID)
|
|
self.assertEqual(binding.network_type, 'vlan')
|
|
self.assertEqual(binding.physical_network, PHYS_NET)
|
|
self.assertEqual(binding.segmentation_id, 1234)
|