From 4dda84eb03114c2ef90ff0a9918440a90f2479c1 Mon Sep 17 00:00:00 2001 From: Sylvain Bauza Date: Fri, 5 Mar 2021 14:53:08 +0100 Subject: [PATCH] Placeholders for DB migration backports to Wallaby We somehow need to reserve some migration numbers for any possible backports down to Wallaby. Change-Id: Ibda1b6ebdd4786e97686b523a23476a5b5caaa30 --- .../migrate_repo/versions/083_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/084_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/085_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/086_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/087_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/418_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/419_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/420_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/421_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/422_placeholder.py | 22 +++++++++++++++++++ .../functional/db/api/test_migrations.py | 2 ++ nova/tests/unit/db/test_migrations.py | 4 +++- 12 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/083_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/084_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/085_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/086_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/087_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/418_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/419_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/420_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/421_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/422_placeholder.py diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/083_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/083_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/083_placeholder.py @@ -0,0 +1,22 @@ +# 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/084_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/084_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/084_placeholder.py @@ -0,0 +1,22 @@ +# 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/085_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/085_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/085_placeholder.py @@ -0,0 +1,22 @@ +# 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/086_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/086_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/086_placeholder.py @@ -0,0 +1,22 @@ +# 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/087_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/087_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/087_placeholder.py @@ -0,0 +1,22 @@ +# 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/migrate_repo/versions/418_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/418_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/418_placeholder.py @@ -0,0 +1,22 @@ +# 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/migrate_repo/versions/419_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/419_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/419_placeholder.py @@ -0,0 +1,22 @@ +# 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/migrate_repo/versions/420_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/420_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/420_placeholder.py @@ -0,0 +1,22 @@ +# 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/migrate_repo/versions/421_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/421_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/421_placeholder.py @@ -0,0 +1,22 @@ +# 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/migrate_repo/versions/422_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/422_placeholder.py new file mode 100644 index 000000000000..7a9322450445 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/422_placeholder.py @@ -0,0 +1,22 @@ +# 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/tests/functional/db/api/test_migrations.py b/nova/tests/functional/db/api/test_migrations.py index d22d62aae5d0..250138aeeb16 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -181,6 +181,7 @@ class NovaAPIMigrationsWalk(test_migrations.WalkVersionsMixin): train_placeholders = list(range(68, 73)) ussuri_placeholders = list(range(73, 78)) victoria_placeholders = list(range(78, 83)) + wallaby_placeholders = list(range(83, 88)) special_cases = [ self.INIT_VERSION + 1, # initial change 30, # Enforcement migration, no changes to test @@ -193,6 +194,7 @@ class NovaAPIMigrationsWalk(test_migrations.WalkVersionsMixin): train_placeholders + ussuri_placeholders + victoria_placeholders + + wallaby_placeholders + special_cases) def migrate_up(self, version, with_data=False): diff --git a/nova/tests/unit/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py index c0b4ee89999d..2755fa2a037e 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -165,11 +165,13 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, train_placeholders = list(range(403, 408)) ussuri_placeholders = list(range(408, 413)) victoria_placeholders = list(range(413, 418)) + wallaby_placeholders = list(range(418, 423)) return (special + train_placeholders + ussuri_placeholders + - victoria_placeholders) + victoria_placeholders + + wallaby_placeholders) def migrate_up(self, version, with_data=False): if with_data: