Postgresql ENUM type requires a name exceptions NVP Plugin

Fixes bug 1109824

Change-Id: I62beceaa14773de94e79d7017658f9f6e6212bb6

diff --git a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
index ae1035eaf58b520f80fa24ec79870de9dfb2fb9f..5f392076bbb9176387a39feef02c036707d7baec 100644 (file)
--- a/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
+++ b/quantum/db/migration/alembic_migrations/versions/1d76643bcec4_nvp_netbinding.py
@@ -46,7 +46,9 @@ def upgrade(active_plugin=None, options=None):
     op.create_table(
         'nvp_network_bindings',
         sa.Column('network_id', sa.String(length=36), nullable=False),
-        sa.Column('binding_type', sa.Enum('flat', 'vlan', 'stt', 'gre'),
+        sa.Column('binding_type',
+                  sa.Enum('flat', 'vlan', 'stt', 'gre',
+                          name='nvp_network_bindings_binding_type'),
                   nullable=False),
         sa.Column('tz_uuid', sa.String(length=36), nullable=True),
         sa.Column('vlan_id', sa.Integer(), nullable=True),

diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
index 1a176be0602441e163b6c9207118b8db367bb1bb..37344b4e20050df506e8aff6e6838b0e4bb59ed9 100644 (file)
--- a/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
+++ b/quantum/plugins/nicira/nicira_nvp_plugin/nicira_models.py
@@ -33,7 +33,9 @@ class NvpNetworkBinding(model_base.BASEV2):
                         ForeignKey('networks.id', ondelete="CASCADE"),
                         primary_key=True)
     # 'flat', 'vlan', stt' or 'gre'
-    binding_type = Column(Enum('flat', 'vlan', 'stt', 'gre'), nullable=False)
+    binding_type = Column(Enum('flat', 'vlan', 'stt', 'gre',
+                               name='nvp_network_bindings_binding_type'),
+                          nullable=False)
     tz_uuid = Column(String(36))
     vlan_id = Column(Integer)