From 04e79b5b7e18f033053d4057edc768281b91a4d7 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 3 Oct 2019 07:09:11 -0700 Subject: [PATCH] Add reserved schema migrations for Ussuri Change-Id: Idb28bcae55db19a62b5e8b6dfcfc9fd5b8839e41 --- .../migrate_repo/versions/068_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/069_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/070_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/071_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/072_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/403_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/404_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/405_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/406_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/407_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/068_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/069_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/070_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/071_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/072_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/403_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/404_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/405_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/406_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/407_placeholder.py diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/068_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/068_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/068_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/069_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/069_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/069_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/070_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/070_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/070_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/071_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/071_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/071_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/072_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/072_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/072_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/403_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/403_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/403_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/404_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/404_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/404_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/405_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/405_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/405_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/406_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/406_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/406_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/407_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/407_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/407_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 770c5fa6f3f..9f873f2c593 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -179,6 +179,7 @@ def _skippable_migrations(self): queens_placeholders = list(range(53, 58)) # We forgot to add the rocky placeholders stein_placeholders = list(range(63, 68)) + train_placeholders = list(range(68, 73)) special_cases = [ 30, # Enforcement migration, no changes to test ] @@ -188,6 +189,7 @@ def _skippable_migrations(self): pike_placeholders + queens_placeholders + stein_placeholders + + train_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 de898f2fe33..c7eb7dae97f 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -185,6 +185,7 @@ def _skippable_migrations(self): # placeholders per cycle since the rate of DB changes has dropped # significantly stein_placeholders = list(range(392, 397)) + train_placeholders = list(range(403, 408)) return (special + havana_placeholders + @@ -197,7 +198,8 @@ def _skippable_migrations(self): ocata_placeholders + pike_placeholders + queens_placeholders + - stein_placeholders) + stein_placeholders + + train_placeholders) def migrate_up(self, version, with_data=False): if with_data: