From 40159ac6d2cc87becb8f191bc2e4340eef6936f7 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 30 Sep 2015 08:23:00 -0700 Subject: [PATCH] Reserve 10 migrations for backports Reserve 10 migrations so that we have the option of backporting fixes that include a db migration to the stable/liberty branch. We did this same thing to allow backports and stable/kilo in 6a3ebda039e58e5f4c1d7815ecc19302fd8288ec Change-Id: Iaf6652c34c3510faacaca37e6397901abe327c5f --- .../migrate_repo/versions/303_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/304_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/305_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/306_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/307_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/308_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/309_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/310_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/311_placeholder.py | 22 +++++++++++++++++++ .../migrate_repo/versions/312_placeholder.py | 22 +++++++++++++++++++ nova/tests/unit/db/test_migrations.py | 4 +++- 11 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/303_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/304_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/305_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/306_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/307_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/308_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/309_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/310_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/311_placeholder.py create mode 100644 nova/db/sqlalchemy/migrate_repo/versions/312_placeholder.py diff --git a/nova/db/sqlalchemy/migrate_repo/versions/303_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/303_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/303_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 Liberty backports. +# Do not use this number for new Mitaka 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/304_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/304_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/304_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 Liberty backports. +# Do not use this number for new Mitaka 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/305_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/305_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/305_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 Liberty backports. +# Do not use this number for new Mitaka 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/306_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/306_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/306_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 Liberty backports. +# Do not use this number for new Mitaka 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/307_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/307_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/307_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 Liberty backports. +# Do not use this number for new Mitaka 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/308_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/308_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/308_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 Liberty backports. +# Do not use this number for new Mitaka 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/309_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/309_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/309_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 Liberty backports. +# Do not use this number for new Mitaka 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/310_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/310_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/310_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 Liberty backports. +# Do not use this number for new Mitaka 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/311_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/311_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/311_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 Liberty backports. +# Do not use this number for new Mitaka 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/312_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/312_placeholder.py new file mode 100644 index 000000000000..50ff45bf3d3a --- /dev/null +++ b/nova/db/sqlalchemy/migrate_repo/versions/312_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 Liberty backports. +# Do not use this number for new Mitaka 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/unit/db/test_migrations.py b/nova/tests/unit/db/test_migrations.py index 8b58429cc09d..859968958038 100644 --- a/nova/tests/unit/db/test_migrations.py +++ b/nova/tests/unit/db/test_migrations.py @@ -174,12 +174,14 @@ class NovaMigrationsCheckers(test_migrations.ModelsMigrationsSync, icehouse_placeholders = range(235, 244) juno_placeholders = range(255, 265) kilo_placeholders = range(281, 291) + liberty_placeholders = range(303, 313) return (special + havana_placeholders + icehouse_placeholders + juno_placeholders + - kilo_placeholders) + kilo_placeholders + + liberty_placeholders) def migrate_up(self, version, with_data=False): if with_data: