Fix ML2 VXLAN TypeDriver DB migration

The migration for the ML2 VXLAN TypeDriver was incorrectly setting
primary key attributes on separate lines for 'ip_address' and
'udp_port'. Also, a primary key cannot have autoincrement set, so
add this to 'udp_port' as well.

Fixes bug 1213134

Change-Id: I0b2e2685bf524dd9c0333ac4511287ad6a5eb87e

diff --git a/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py b/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
index a57617e445c7237a71697eb56f54b1554424eadf..8f54b51b8109fabbfd6d7951156cba5a88dd38d7 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
+++ b/neutron/db/migration/alembic_migrations/versions/477a4488d3f4_ml2_vxlan_type_driver.py
@@ -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')
     )
 
 

diff --git a/neutron/plugins/ml2/drivers/type_vxlan.py b/neutron/plugins/ml2/drivers/type_vxlan.py
index 75f7d0b0ff223a351a81b05b6dd511bb80300145..a5c7f1206f6d29a43da32425b656062a17d5cce5 100644 (file)
--- a/neutron/plugins/ml2/drivers/type_vxlan.py
+++ b/neutron/plugins/ml2/drivers/type_vxlan.py
@@ -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