Name the securitygrouprules.direction enum.

Updates to the SecurityGroupRule model and migration so that we
explicitly name the securitygrouprules.direction enum. This fixes
'Postgresql ENUM type requires a name.' errors.

Fixes LP Bug #1099267.

Change-Id: Ia46fe8d4b0793caaabbfc71b7fa5f0cbb8c6d24b

diff --git a/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
index ff39de84aa6970fb139e5aead62ea1c013d90622..cf565af0f0945d0b360212407f877693c11c6ea1 100644 (file)
--- a/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
+++ b/quantum/db/migration/alembic_migrations/versions/3cb5d900c5de_security_groups.py
@@ -62,7 +62,10 @@ def upgrade(active_plugin=None, options=None):
         sa.Column('external_id', sa.Integer(), nullable=True),
         sa.Column('security_group_id', sa.String(length=36), nullable=False),
         sa.Column('source_group_id', sa.String(length=36), nullable=True),
-        sa.Column('direction', sa.Enum('ingress', 'egress'), nullable=True),
+        sa.Column('direction',
+                  sa.Enum('ingress', 'egress',
+                          name='securitygrouprules_direction'),
+                  nullable=True),
         sa.Column('ethertype', sa.String(length=40), nullable=True),
         sa.Column('protocol', sa.String(length=40), nullable=True),
         sa.Column('port_range_min', sa.Integer(), nullable=True),

diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py
index 9903a6493f9f377f1548baf805e8af44f1584fe0..5bd890bbee96d12afc7e0b6c56b14ad27f1fb7cb 100644 (file)
--- a/quantum/db/securitygroups_db.py
+++ b/quantum/db/securitygroups_db.py
@@ -62,7 +62,8 @@ class SecurityGroupRule(model_base.BASEV2, models_v2.HasId,
                                               ondelete="CASCADE"),
                                 nullable=True)
 
-    direction = sa.Column(sa.Enum('ingress', 'egress'))
+    direction = sa.Column(sa.Enum('ingress', 'egress',
+                                  name='securitygrouprules_direction'))
     ethertype = sa.Column(sa.String(40))
     protocol = sa.Column(sa.String(40))
     port_range_min = sa.Column(sa.Integer)