Fix incorrect default paramater in migration

Migration 5446f2a45467_set_server_default try to set incorrect default
boolean value on Integer column cisco_network_profiles.

Closes-bug: #1341518

Change-Id: I594a6811af23fced7105252f47d72232bf37184c

diff --git a/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py b/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py
index 1e9f5b5db6e23cfbcf147fb43bbf016058a75b5b..f98e2c5cdb0841b542653c5e314c4c06032a9126 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py
+++ b/neutron/db/migration/alembic_migrations/versions/5446f2a45467_set_server_default.py
@@ -14,6 +14,7 @@
 #
 
 """set_server_default
+
 Revision ID: 5446f2a45467
 Revises: 2db5203cb7a9
 Create Date: 2014-07-07 18:31:30.384522
@@ -96,18 +97,17 @@ def set_default_mlnx(default):
 
 
 def set_default_cisco(default):
+    profile_binding_default = (cisco_constants.TENANT_ID_NOT_SET
+                               if default else None)
+    profile_default = '0' if default else None
     if default:
         default = sqlalchemy.sql.false()
-        op.alter_column('cisco_n1kv_profile_bindings', 'tenant_id',
-                        existing_type=sa.String(length=36),
-                        server_default=cisco_constants.TENANT_ID_NOT_SET,
-                        existing_nullable=False)
-    else:
-        op.alter_column('cisco_n1kv_profile_bindings', 'tenant_id',
-                        existing_type=sa.String(length=36),
-                        server_default=None, existing_nullable=False)
+    op.alter_column('cisco_n1kv_profile_bindings', 'tenant_id',
+                    existing_type=sa.String(length=36),
+                    server_default=profile_binding_default,
+                    existing_nullable=False)
     op.alter_column('cisco_network_profiles', 'multicast_ip_index',
-                    server_default=default, existing_type=sa.Integer)
+                    server_default=profile_default, existing_type=sa.Integer)
     op.alter_column('cisco_n1kv_vlan_allocations', 'allocated',
                     existing_type=sa.Boolean,
                     server_default=default, existing_nullable=False)