diff --git a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
index 1e5ecc5ba9d..2eabc150a12 100644
--- a/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
+++ b/neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
@@ -51,7 +51,7 @@ def upgrade(active_plugins=None, options=None):
         sa.Column('interface_name', sa.String(length=64), nullable=True),
         sa.ForeignKeyConstraint(['network_gateway_id'], ['networkgateways.id'],
                                 ondelete='CASCADE'),
-        sa.PrimaryKeyConstraint('id'),
+        sa.PrimaryKeyConstraint('id', 'network_gateway_id', 'interface_name'),
         mysql_engine='InnoDB')
     # Copy data from networkgatewaydevices into networkgatewaydevicereference
     op.execute("INSERT INTO networkgatewaydevicereferences SELECT "
diff --git a/neutron/plugins/vmware/dbexts/networkgw_db.py b/neutron/plugins/vmware/dbexts/networkgw_db.py
index 5609a0867f4..6a1c3c21b3c 100644
--- a/neutron/plugins/vmware/dbexts/networkgw_db.py
+++ b/neutron/plugins/vmware/dbexts/networkgw_db.py
@@ -121,8 +121,9 @@ class NetworkGatewayDeviceReference(model_base.BASEV2):
     id = sa.Column(sa.String(36), primary_key=True)
     network_gateway_id = sa.Column(sa.String(36),
                                    sa.ForeignKey('networkgateways.id',
-                                                 ondelete='CASCADE'))
-    interface_name = sa.Column(sa.String(64))
+                                                 ondelete='CASCADE'),
+                                   primary_key=True)
+    interface_name = sa.Column(sa.String(64), primary_key=True)
 
 
 class NetworkGatewayDevice(model_base.BASEV2, models_v2.HasId,