From b198ad349af834e00eedc0f5c6f11ccc327046a7 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 23 Aug 2017 12:16:55 -0700 Subject: [PATCH] Add placeholder migrations for Pike backports Change-Id: I8fd8c75ddfac917777c466d1e5416a37a368a175 --- .../migrate_repo/versions/045_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/046_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/047_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/048_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/049_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/363_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/364_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/365_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/366_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/367_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/368_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/369_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/370_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/371_placeholder.py | 23 +++++++++++++++++++ .../migrate_repo/versions/372_placeholder.py | 23 +++++++++++++++++++ .../functional/db/api/test_migrations.py | 2 ++ nova/tests/unit/db/test_migrations.py | 4 +++- 17 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/045_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/046_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/047_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/048_placeholder.py create mode 100644 nova/db/sqlalchemy/api_migrations/migrate_repo/versions/049_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/363_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/364_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/365_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/366_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/367_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/368_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/369_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/370_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/371_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/372_placeholder.py diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/045_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/045_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/045_placeholder.py @@ -0,0 +1,23 @@ + +# 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/046_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/046_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/046_placeholder.py @@ -0,0 +1,23 @@ + +# 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/047_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/047_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/047_placeholder.py @@ -0,0 +1,23 @@ + +# 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/048_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/048_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/048_placeholder.py @@ -0,0 +1,23 @@ + +# 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/049_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/049_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/049_placeholder.py @@ -0,0 +1,23 @@ + +# 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/363_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/363_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/363_placeholder.py @@ -0,0 +1,23 @@ + +# 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/364_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/364_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/364_placeholder.py @@ -0,0 +1,23 @@ + +# 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/365_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/365_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/365_placeholder.py @@ -0,0 +1,23 @@ + +# 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/366_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/366_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/366_placeholder.py @@ -0,0 +1,23 @@ + +# 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/367_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/367_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/367_placeholder.py @@ -0,0 +1,23 @@ + +# 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/368_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/368_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/368_placeholder.py @@ -0,0 +1,23 @@ + +# 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/369_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/369_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/369_placeholder.py @@ -0,0 +1,23 @@ + +# 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/370_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/370_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/370_placeholder.py @@ -0,0 +1,23 @@ + +# 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/371_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/371_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/371_placeholder.py @@ -0,0 +1,23 @@ + +# 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/372_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/372_placeholder.py new file mode 100644 index 000000000000..a5d6ecd3add5 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/372_placeholder.py @@ -0,0 +1,23 @@ + +# 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 82309c6b02dc..171edbe53044 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -166,12 +166,14 @@ class NovaAPIMigrationsWalk(test_migrations.WalkVersionsMixin): mitaka_placeholders = list(range(8, 13)) newton_placeholders = list(range(21, 26)) ocata_placeholders = list(range(31, 41)) + pike_placeholders = list(range(45, 50)) special_cases = [ 30, # Enforcement migration, no changes to test ] return (mitaka_placeholders + newton_placeholders + ocata_placeholders + + pike_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 a8925358ab7c..d0b51fb8e9e8 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -176,6 +176,7 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, mitaka_placeholders = list(range(320, 330)) newton_placeholders = list(range(335, 345)) ocata_placeholders = list(range(348, 358)) + pike_placeholders = list(range(363, 373)) return (special + havana_placeholders + @@ -185,7 +186,8 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, liberty_placeholders + mitaka_placeholders + newton_placeholders + - ocata_placeholders) + ocata_placeholders + + pike_placeholders) def migrate_up(self, version, with_data=False): if with_data: