Merge "Make InstanceMappings.cell_id nullable"

nova/db/sqlalchemy/api_migrations/migrate_repo/versions/007_instance_mapping_nullable_cellid.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.
+
+from sqlalchemy import MetaData
+from sqlalchemy import Table
+
+
+def upgrade(migrate_engine):
+    meta = MetaData()
+    meta.bind = migrate_engine
+
+    instance_mapping = Table('instance_mappings', meta, autoload=True)
+    instance_mapping.c.cell_id.alter(nullable=True)

nova/db/sqlalchemy/api_models.py

@@ -60,7 +60,7 @@ class InstanceMapping(API_BASE):
     id = Column(Integer, primary_key=True)
     instance_uuid = Column(String(36), nullable=False)
     cell_id = Column(Integer, ForeignKey('cell_mappings.id'),
-            nullable=False)
+            nullable=True)
     project_id = Column(String(255), nullable=False)