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>
85 lines
3.7 KiB
Python
85 lines
3.7 KiB
Python
# Copyright 2013 VMware, Inc.
|
|
#
|
|
# 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.db import exception as d_exc
|
|
|
|
from neutron import context
|
|
from neutron.db import models_v2
|
|
from neutron.plugins.vmware.dbexts import db as nsx_db
|
|
from neutron.plugins.vmware.dbexts import models
|
|
from neutron.tests.unit import testlib_api
|
|
|
|
|
|
class NsxDBTestCase(testlib_api.SqlTestCase):
|
|
|
|
def setUp(self):
|
|
super(NsxDBTestCase, self).setUp()
|
|
self.ctx = context.get_admin_context()
|
|
|
|
def _setup_neutron_network_and_port(self, network_id, port_id):
|
|
with self.ctx.session.begin(subtransactions=True):
|
|
self.ctx.session.add(models_v2.Network(id=network_id))
|
|
port = models_v2.Port(id=port_id,
|
|
network_id=network_id,
|
|
mac_address='foo_mac_address',
|
|
admin_state_up=True,
|
|
status='ACTIVE',
|
|
device_id='',
|
|
device_owner='')
|
|
self.ctx.session.add(port)
|
|
|
|
def test_add_neutron_nsx_port_mapping_handle_duplicate_constraint(self):
|
|
neutron_net_id = 'foo_neutron_network_id'
|
|
neutron_port_id = 'foo_neutron_port_id'
|
|
nsx_port_id = 'foo_nsx_port_id'
|
|
nsx_switch_id = 'foo_nsx_switch_id'
|
|
self._setup_neutron_network_and_port(neutron_net_id, neutron_port_id)
|
|
|
|
nsx_db.add_neutron_nsx_port_mapping(
|
|
self.ctx.session, neutron_port_id, nsx_switch_id, nsx_port_id)
|
|
# Call the method twice to trigger a db duplicate constraint error
|
|
nsx_db.add_neutron_nsx_port_mapping(
|
|
self.ctx.session, neutron_port_id, nsx_switch_id, nsx_port_id)
|
|
result = (self.ctx.session.query(models.NeutronNsxPortMapping).
|
|
filter_by(neutron_id=neutron_port_id).one())
|
|
self.assertEqual(nsx_port_id, result.nsx_port_id)
|
|
self.assertEqual(neutron_port_id, result.neutron_id)
|
|
|
|
def test_add_neutron_nsx_port_mapping_raise_on_duplicate_constraint(self):
|
|
neutron_net_id = 'foo_neutron_network_id'
|
|
neutron_port_id = 'foo_neutron_port_id'
|
|
nsx_port_id_1 = 'foo_nsx_port_id_1'
|
|
nsx_port_id_2 = 'foo_nsx_port_id_2'
|
|
nsx_switch_id = 'foo_nsx_switch_id'
|
|
self._setup_neutron_network_and_port(neutron_net_id, neutron_port_id)
|
|
|
|
nsx_db.add_neutron_nsx_port_mapping(
|
|
self.ctx.session, neutron_port_id, nsx_switch_id, nsx_port_id_1)
|
|
# Call the method twice to trigger a db duplicate constraint error,
|
|
# this time with a different nsx port id!
|
|
self.assertRaises(d_exc.DBDuplicateEntry,
|
|
nsx_db.add_neutron_nsx_port_mapping,
|
|
self.ctx.session, neutron_port_id,
|
|
nsx_switch_id, nsx_port_id_2)
|
|
|
|
def test_add_neutron_nsx_port_mapping_raise_integrity_constraint(self):
|
|
neutron_port_id = 'foo_neutron_port_id'
|
|
nsx_port_id = 'foo_nsx_port_id'
|
|
nsx_switch_id = 'foo_nsx_switch_id'
|
|
self.assertRaises(d_exc.DBError,
|
|
nsx_db.add_neutron_nsx_port_mapping,
|
|
self.ctx.session, neutron_port_id,
|
|
nsx_switch_id, nsx_port_id)
|