diff --git a/neutron_taas/db/head.py b/neutron_taas/db/head.py new file mode 100644 index 0000000..657aaba --- /dev/null +++ b/neutron_taas/db/head.py @@ -0,0 +1,21 @@ +# Copyright 2016 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 neutron.db.migration.models import head + +from neutron_taas.db import taas_db # noqa + + +def get_metadata(): + return head.model_base.BASEV2.metadata diff --git a/neutron_taas/tests/unit/db/test_migrations.py b/neutron_taas/tests/unit/db/test_migrations.py new file mode 100644 index 0000000..0c7f847 --- /dev/null +++ b/neutron_taas/tests/unit/db/test_migrations.py @@ -0,0 +1,61 @@ +# Copyright 2016 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_config import cfg + +from neutron.db.migration.alembic_migrations import external +from neutron.db.migration import cli as migration +from neutron.tests.functional.db import test_migrations +from neutron.tests.unit import testlib_api + +from neutron_taas.db import head + +# EXTERNAL_TABLES should contain all names of tables that are not related to +# current repo. +EXTERNAL_TABLES = set(external.TABLES) +VERSION_TABLE = 'taas_alembic_version' + + +class _TestModelsMigrationsTAAS(test_migrations._TestModelsMigrations): + + def db_sync(self, engine): + cfg.CONF.set_override('connection', engine.url, group='database') + for conf in migration.get_alembic_configs(): + self.alembic_config = conf + self.alembic_config.neutron_config = cfg.CONF + migration.do_alembic_command(conf, 'upgrade', 'heads') + + def get_metadata(self): + return head.get_metadata() + + def include_object(self, object_, name, type_, reflected, compare_to): + if type_ == 'table' and (name.startswith('alembic') or + name == VERSION_TABLE or + name in EXTERNAL_TABLES): + return False + if type_ == 'index' and reflected and name.startswith("idx_autoinc_"): + return False + return True + + +class TestModelsMigrationsMysql(testlib_api.MySQLTestCaseMixin, + _TestModelsMigrationsTAAS, + testlib_api.SqlTestCaseLight): + pass + + +class TestModelsMigrationsPostgresql(testlib_api.PostgreSQLTestCaseMixin, + _TestModelsMigrationsTAAS, + testlib_api.SqlTestCaseLight): + pass diff --git a/test-requirements.txt b/test-requirements.txt index 1c42e21..04742e3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,8 @@ hacking<0.11,>=0.10.0 coverage>=3.6 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +psycopg2>=2.5 # LGPL/ZPL +PyMySQL>=0.6.2 # MIT License oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 os-testr>=0.7.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 81545e7..095f864 100644 --- a/tox.ini +++ b/tox.ini @@ -17,6 +17,9 @@ whitelist_externals = find [tox:jenkins] sitepackages = True +[testenv:py27] +setenv = OS_FAIL_ON_MISSING_DEPS=1 + [testenv:pep8] commands = flake8