diff --git a/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/073_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/073_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/073_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/074_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/074_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/074_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/075_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/075_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/075_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/076_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/076_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/076_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/077_placeholder.py b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/077_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/api_migrations/migrate_repo/versions/077_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/408_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/408_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/408_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/409_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/409_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/409_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/410_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/410_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/410_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/411_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/411_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/411_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/412_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/412_placeholder.py new file mode 100644 index 00000000000..7a932245044 --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/412_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 9f873f2c593..e77563524bf 100644 --- a/nova/tests/functional/db/api/test_migrations.py +++ b/nova/tests/functional/db/api/test_migrations.py @@ -180,6 +180,7 @@ def _skippable_migrations(self): # We forgot to add the rocky placeholders stein_placeholders = list(range(63, 68)) train_placeholders = list(range(68, 73)) + ussuri_placeholders = list(range(73, 78)) special_cases = [ 30, # Enforcement migration, no changes to test ] @@ -190,6 +191,7 @@ def _skippable_migrations(self): queens_placeholders + stein_placeholders + train_placeholders + + ussuri_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 adca3d8f6e0..26c8f996c80 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -183,6 +183,7 @@ def _skippable_migrations(self): # significantly stein_placeholders = list(range(392, 397)) train_placeholders = list(range(403, 408)) + ussuri_placeholders = list(range(408, 413)) return (special + havana_placeholders + @@ -196,7 +197,8 @@ def _skippable_migrations(self): pike_placeholders + queens_placeholders + stein_placeholders + - train_placeholders) + train_placeholders + + ussuri_placeholders) def migrate_up(self, version, with_data=False): if with_data: