Increase size of peer_address attribute in VPNaaS

Increased the size so that peer_address could be FQDN. API
document changed constraint from IPAddress to string, however
in the plugin/service code, it is already a string and there is
no specific restriction on the value. Database migration will
be performed, due to the size change.

bug 1225128

Change-Id: Idc0d545491074fc0a1a3bd0256fdbba0a3a0718c

diff --git a/neutron/db/migration/alembic_migrations/versions/338d7508968c_vpnaas_peer_address_.py b/neutron/db/migration/alembic_migrations/versions/338d7508968c_vpnaas_peer_address_.py
new file mode 100644 (file)
index 0000000..2b57cdb
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/338d7508968c_vpnaas_peer_address_.py
@@ -0,0 +1,55 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+#
+# Copyright 2013 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.
+#
+
+"""vpnaas peer_address size increase
+
+Revision ID: 338d7508968c
+Revises: 4a666eb208c2
+Create Date: 2013-09-16 11:31:39.410189
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '338d7508968c'
+down_revision = '4a666eb208c2'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.services.vpn.plugin.VPNPlugin'
+]
+
+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',
+                    _type=sa.String(255), existing_type=sa.String(64))
+
+
+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',
+                    _type=sa.String(64), existing_type=sa.String(255))

diff --git a/neutron/db/vpn/vpn_db.py b/neutron/db/vpn/vpn_db.py
index 035711edc5f09abd0d3445338aa7b09bd7bda4ef..175dd0bc6e0382b2d01ec508711ad70012522a0c 100644 (file)
--- a/neutron/db/vpn/vpn_db.py
+++ b/neutron/db/vpn/vpn_db.py
@@ -110,7 +110,7 @@ class IPsecSiteConnection(model_base.BASEV2,
     __tablename__ = 'ipsec_site_connections'
     name = sa.Column(sa.String(255))
     description = sa.Column(sa.String(255))
-    peer_address = sa.Column(sa.String(64), nullable=False)
+    peer_address = sa.Column(sa.String(255), nullable=False)
     peer_id = sa.Column(sa.String(255), nullable=False)
     route_mode = sa.Column(sa.String(8), nullable=False)
     mtu = sa.Column(sa.Integer, nullable=False)