Restore NOT NULL constraint lost by earlier migrations

Bring back nullable=False for columns in tables poolstatisticss
and ipsec_site_connections that disapeared because of
migrations abc88c33f74f and 338d7508968c correspondingly.

Closes-bug: #1288681

Change-Id: Idc4608616c2b4c06e7404157b2f708d46e91accc

diff --git a/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py b/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py
new file mode 100644 (file)
index 0000000..6d4d3ad
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/1e5dd1d09b22_set_not_null_fields_lb_stats.py
@@ -0,0 +1,66 @@
+# 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_not_null_fields_lb_stats
+
+Revision ID: 1e5dd1d09b22
+Revises: 54f7549a0e5f
+Create Date: 2014-03-17 11:00:35.370618
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '1e5dd1d09b22'
+down_revision = '54f7549a0e5f'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.services.loadbalancer.plugin.LoadBalancerPlugin'
+]
+
+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('poolstatisticss', 'bytes_in', nullable=False,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'bytes_out', nullable=False,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'active_connections', nullable=False,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'total_connections', nullable=False,
+                    existing_type=sa.BigInteger())
+
+
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    op.alter_column('poolstatisticss', 'bytes_in', nullable=True,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'bytes_out', nullable=True,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'active_connections', nullable=True,
+                    existing_type=sa.BigInteger())
+    op.alter_column('poolstatisticss', 'total_connections', nullable=True,
+                    existing_type=sa.BigInteger())

diff --git a/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py b/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py
new file mode 100644 (file)
index 0000000..626c26f
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/54f7549a0e5f_set_not_null_peer_address.py
@@ -0,0 +1,54 @@
+# 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_not_null_peer_address
+
+Revision ID: 54f7549a0e5f
+Revises: 33dd0a9fa487
+Create Date: 2014-03-17 11:00:17.539028
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '54f7549a0e5f'
+down_revision = 'icehouse'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.services.vpn.plugin.VPNDriverPlugin'
+]
+
+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('ipsec_site_connections', 'peer_address',
+                    existing_type=sa.String(255), nullable=False)
+
+
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    op.alter_column('ipsec_site_connections', 'peer_address', nullable=True,
+                    existing_type=sa.String(255))

diff --git a/neutron/db/migration/alembic_migrations/versions/HEAD b/neutron/db/migration/alembic_migrations/versions/HEAD
index 762682ddb0514ecc56859bc693855e623756323b..bf461ee18d43f9565d7253c2a72d64ca884e6a19 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/HEAD
+++ b/neutron/db/migration/alembic_migrations/versions/HEAD
@@ -1 +1 @@
-icehouse
+1e5dd1d09b22