openstack
/
neutron
Code Issues Proposed changes

Merge "NSX: Allow multiple references to same gw device"

changes/44/79544/2
Jenkins 2014-03-12 06:49:14 +00:00 committed by Gerrit Code Review
parent 2acc53aa39 2014300886
commit c3938f8613
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/migration/alembic_migrations/versions/19180cf98af6_nsx_gw_devices.py
View File

@ -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 "

5
neutron/plugins/vmware/dbexts/networkgw_db.py
View File

@ -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,