From e324b7a53fae2b54638d3545fb1f860b60703702 Mon Sep 17 00:00:00 2001
From: Abhishek Raut <rauta@vmware.com>
Date: Thu, 20 Aug 2015 12:49:35 -0700
Subject: [PATCH] Fix the L2gw migration script

Remove the foreign key constraint for the connection_id
column. This removes the dependency from the networking-l2gw
tables enabling devstack to run sucessfully. A follow up patch
will be added to clean up connection mappings.

Change-Id: Ib1de421e6187231c875cad76e1981c787ede89f8
---
 ...70ac3ae8_nsxv3_add_l2gwconnection_table.py | 26 +++++++------------
 vmware_nsx/db/nsx_models.py                   |  2 --
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py
index 00bc6e6632..32074174a8 100644
--- a/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py
+++ b/vmware_nsx/db/migration/alembic_migrations/versions/liberty/expand/279b70ac3ae8_nsxv3_add_l2gwconnection_table.py
@@ -30,19 +30,13 @@ import sqlalchemy as sa
 
 
 def upgrade():
-    try:
-        op.create_table(
-            'nsx_l2gw_connection_mappings',
-            sa.Column('connection_id', sa.String(length=36), nullable=False),
-            sa.Column('port_id', sa.String(length=36), nullable=False),
-            sa.Column('bridge_endpoint_id', sa.String(length=36),
-                      nullable=False),
-            sa.ForeignKeyConstraint(['connection_id'],
-                                    ['l2gatewayconnections.id'],
-                                    ondelete='CASCADE'),
-            sa.ForeignKeyConstraint(['port_id'], ['ports.id'],
-                                    ondelete='CASCADE'),
-            sa.PrimaryKeyConstraint('connection_id'),
-        )
-    except Exception:
-        pass
+    op.create_table(
+        'nsx_l2gw_connection_mappings',
+        sa.Column('connection_id', sa.String(length=36), nullable=False),
+        sa.Column('port_id', sa.String(length=36), nullable=False),
+        sa.Column('bridge_endpoint_id', sa.String(length=36),
+                  nullable=False),
+        sa.ForeignKeyConstraint(['port_id'], ['ports.id'],
+                                ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('connection_id'),
+    )
diff --git a/vmware_nsx/db/nsx_models.py b/vmware_nsx/db/nsx_models.py
index c32f001794..2e28589411 100644
--- a/vmware_nsx/db/nsx_models.py
+++ b/vmware_nsx/db/nsx_models.py
@@ -306,8 +306,6 @@ class NsxL2GWConnectionMapping(model_base.BASEV2):
     """Define a mapping between L2 gateway connection and bridge endpoint."""
     __tablename__ = 'nsx_l2gw_connection_mappings'
     connection_id = sa.Column(sa.String(36),
-                              sa.ForeignKey("l2gatewayconnections.id",
-                                            ondelete="CASCADE"),
                               nullable=False,
                               primary_key=True)
     port_id = sa.Column(sa.String(36),