From 89d522e84ec07399c12df0e505b52f47898d6806 Mon Sep 17 00:00:00 2001
From: Ann Kamyshnikova <akamyshnikova@mirantis.com>
Date: Fri, 14 Mar 2014 15:09:36 +0400
Subject: [PATCH] Set correct columns' length

In migration 569e98a8132b_metering incorrect length is set for
description column (255 instead of 1024) and in migration
39cf3f799352_fwaas_havana_2_model for firewall_rules table
incorrect length is set  for protocol column (24 instead of 40).

partially implement bp: db-sync-models-with-migrations

Change-Id: I0b2cb00c3bd2cd2ac7e002c861095129e5b5aa96
---
 ...et_length_of_description_field_metering.py | 52 +++++++++++++++++++
 .../alembic_migrations/versions/HEAD          |  2 +-
 ...65aa907aec_set_length_of_protocol_field.py | 52 +++++++++++++++++++
 3 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py
 create mode 100644 neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py

diff --git a/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py b/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py
new file mode 100644
index 000000000..184d11cb2
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/33c3db036fe4_set_length_of_description_field_metering.py
@@ -0,0 +1,52 @@
+# Copyright 2014 OpenStack Foundation
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+
+"""set_length_of_description_field_metering
+
+Revision ID: 33c3db036fe4
+Revises: b65aa907aec
+Create Date: 2014-03-25 11:04:27.341830
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '33c3db036fe4'
+down_revision = 'b65aa907aec'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.services.metering.metering_plugin.MeteringPlugin'
+]
+
+from alembic import op
+import sqlalchemy as sa
+
+from neutron.db import migration
+
+
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    op.alter_column('meteringlabels', 'description', type_=sa.String(1024),
+                    existing_nullable=True)
+
+
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    pass
diff --git a/neutron/db/migration/alembic_migrations/versions/HEAD b/neutron/db/migration/alembic_migrations/versions/HEAD
index bf461ee18..cc5794e19 100644
--- a/neutron/db/migration/alembic_migrations/versions/HEAD
+++ b/neutron/db/migration/alembic_migrations/versions/HEAD
@@ -1 +1 @@
-1e5dd1d09b22
+33c3db036fe4
diff --git a/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py b/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py
new file mode 100644
index 000000000..de82ce505
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/b65aa907aec_set_length_of_protocol_field.py
@@ -0,0 +1,52 @@
+# Copyright 2014 OpenStack Foundation
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+#
+
+"""set_length_of_protocol_field
+
+Revision ID: b65aa907aec
+Revises: 2447ad0e9585
+Create Date: 2014-03-21 16:30:10.626649
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'b65aa907aec'
+down_revision = '1e5dd1d09b22'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.services.firewall.fwaas_plugin.FirewallPlugin'
+]
+
+from alembic import op
+import sqlalchemy as sa
+
+from neutron.db import migration
+
+
+def upgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    op.alter_column('firewall_rules', 'protocol', type_=sa.String(40),
+                    existing_nullable=True)
+
+
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    pass
-- 
2.45.2