From: Roman Podolyaka <rpodolyaka@mirantis.com>
Date: Fri, 2 Aug 2013 15:00:04 +0000 (+0300)
Subject: Fix enum definition in FWaaS DB schema migration
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ac1c9005e90d0ad65d7078e0e1604ca0ff2c7431;p=openstack-build%2Fneutron-build.git

Fix enum definition in FWaaS DB schema migration

Applying of migration 39cf3f799352 fails due to the error
in definiton of action Enum type (values are not passed).

Fixes bug 1207805

Change-Id: Ibfdc268b400433c9013ca4c475f6b1fa32d338fb
---

diff --git a/neutron/db/migration/alembic_migrations/versions/39cf3f799352_fwaas_havana_2_model.py b/neutron/db/migration/alembic_migrations/versions/39cf3f799352_fwaas_havana_2_model.py
index 59736ec54..077f44f8d 100644
--- a/neutron/db/migration/alembic_migrations/versions/39cf3f799352_fwaas_havana_2_model.py
+++ b/neutron/db/migration/alembic_migrations/versions/39cf3f799352_fwaas_havana_2_model.py
@@ -94,7 +94,9 @@ def upgrade(active_plugin=None, options=None):
         sa.Column('source_port_range_max', sa.Integer(), nullable=True),
         sa.Column('destination_port_range_min', sa.Integer(), nullable=True),
         sa.Column('destination_port_range_max', sa.Integer(), nullable=True),
-        sa.Column('action', sa.Enum(), nullable=True),
+        sa.Column('action',
+                  sa.Enum('allow', 'deny', name='firewallrules_action'),
+                  nullable=True),
         sa.Column('enabled', sa.Boolean(), autoincrement=False,
                   nullable=True),
         sa.Column('position', sa.Integer(), autoincrement=False,