diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/063_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/063_placeholder.py deleted file mode 100644 index 7a93224504..0000000000 --- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/063_placeholder.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -# This is a placeholder for backports. -# Do not use this number for new work. New work starts after -# all the placeholders. -# -# See this for more information: -# http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html - - -def upgrade(migrate_engine): - pass diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/064_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/064_placeholder.py deleted file mode 100644 index 7a93224504..0000000000 --- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/064_placeholder.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -# This is a placeholder for backports. -# Do not use this number for new work. New work starts after -# all the placeholders. -# -# See this for more information: -# http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html - - -def upgrade(migrate_engine): - pass diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/065_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/065_placeholder.py deleted file mode 100644 index 7a93224504..0000000000 --- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/065_placeholder.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -# This is a placeholder for backports. -# Do not use this number for new work. New work starts after -# all the placeholders. -# -# See this for more information: -# http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html - - -def upgrade(migrate_engine): - pass diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/066_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/066_placeholder.py deleted file mode 100644 index 7a93224504..0000000000 --- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/066_placeholder.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -# This is a placeholder for backports. -# Do not use this number for new work. New work starts after -# all the placeholders. -# -# See this for more information: -# http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html - - -def upgrade(migrate_engine): - pass diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/067_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/067_placeholder.py deleted file mode 100644 index 7a93224504..0000000000 --- a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/067_placeholder.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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. - -# This is a placeholder for backports. -# Do not use this number for new work. New work starts after -# all the placeholders. -# -# See this for more information: -# http://lists.openstack.org/pipermail/openstack-dev/2013-March/006827.html - - -def upgrade(migrate_engine): - pass diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/062_stein.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/067_train.py similarity index 100% rename from nova/db/sqlalchemy/api_migrations/migrate_repo/versions/062_stein.py rename to nova/db/sqlalchemy/api_migrations/migrate_repo/versions/067_train.py diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index 62424d48d3..0a1407356e 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -29,7 +29,7 @@ from nova.i18n import _ INIT_VERSION = {} INIT_VERSION['main'] = 401 -INIT_VERSION['api'] = 61 +INIT_VERSION['api'] = 66 _REPOSITORY = {} LOG = logging.getLogger(__name__) diff --git a/nova/tests/functional/db/api/test_migrations.py b/nova/tests/functional/db/api/test_migrations.py index 622adafd7a..f27a31e2bf 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -167,15 +167,13 @@ class NovaAPIMigrationsWalk(test_migrations.WalkVersionsMixin): return self.engine def _skippable_migrations(self): - stein_placeholders = list(range(63, 68)) train_placeholders = list(range(68, 73)) ussuri_placeholders = list(range(73, 78)) victoria_placeholders = list(range(78, 83)) special_cases = [ self.INIT_VERSION + 1, # initial change ] - return (stein_placeholders + - train_placeholders + + return (train_placeholders + ussuri_placeholders + victoria_placeholders + special_cases)