x/vmware-nsx
Code Issues Proposed changes

Merge "Fix ML2 VXLAN TypeDriver DB migration"

Browse Source
This commit is contained in:
Jenkins 2013-08-20 05:04:34 +00:00 committed by Gerrit Code Review
commit cae08ee0b8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
View File

@ -55,9 +55,9 @@ def upgrade(active_plugins=None, options=None):
op.create_table(
'ml2_vxlan_endpoints',
sa.Column('ip_address', sa.String(length=64)),
sa.Column('udp_port', sa.Integer(), nullable=False),
sa.PrimaryKeyConstraint('ip_address'),
sa.PrimaryKeyConstraint('udp_port')
sa.Column('udp_port', sa.Integer(), nullable=False,
autoincrement=False),
sa.PrimaryKeyConstraint('ip_address', 'udp_port')
)

3
neutron/plugins/ml2/drivers/type_vxlan.py
View File

@ -59,7 +59,8 @@ class VxlanEndpoints(model_base.BASEV2):
__tablename__ = 'ml2_vxlan_endpoints'
ip_address = sa.Column(sa.String(64), primary_key=True)
udp_port = sa.Column(sa.Integer, primary_key=True, nullable=False)
udp_port = sa.Column(sa.Integer, primary_key=True, nullable=False,
autoincrement=False)
def __repr__(self):
return "<VxlanTunnelEndpoint(%s)>" % self.ip_address