Add mtu attributes to network model

Database changes to support including mtu as
part of the network model.

Change-Id: Id6410de8844d3476893647b22baa7f1a96f1df8b
Partially-Implements: blueprint mtu-selection-and-advertisement

diff --git a/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py b/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py
new file mode 100644 (file)
index 0000000..550f939
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/43763a9618fd_add_mtu_attributes_to_network.py
@@ -0,0 +1,38 @@
+# Copyright 2015 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.
+#
+
+"""add mtu attributes to network
+
+Revision ID: 43763a9618fd
+Revises: 16cdf118d31d
+Create Date: 2015-02-05 17:44:14.161377
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '43763a9618fd'
+down_revision = '16cdf118d31d'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('networks', sa.Column('mtu', sa.Integer(),
+                  nullable=True))
+
+
+def downgrade():
+    op.drop_column('networks', 'mtu')

diff --git a/neutron/db/migration/alembic_migrations/versions/HEAD b/neutron/db/migration/alembic_migrations/versions/HEAD
index f55008a4e107883169ba24bf7d4fd21589019cb8..0e974fd024f84374c5e96841ecd785c11d9fdda8 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/HEAD
+++ b/neutron/db/migration/alembic_migrations/versions/HEAD
@@ -1 +1 @@
-16cdf118d31d
+43763a9618fd
\ No newline at end of file

diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py
index e9b97daec050a58d9fd1b93b8dcb0d3295be9693..9f570d5c3304b3f74648149b3561e9a1cc4324f4 100644 (file)
--- a/neutron/db/models_v2.py
+++ b/neutron/db/models_v2.py
@@ -219,3 +219,4 @@ class Network(model_base.BASEV2, HasId, HasTenant):
     status = sa.Column(sa.String(16))
     admin_state_up = sa.Column(sa.Boolean)
     shared = sa.Column(sa.Boolean)
+    mtu = sa.Column(sa.Integer, nullable=True)

diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py
index cd9985ecebfe6ddc44c11cddec6f1cf5a492fed9..9143f19209e896fcca29de9848d0d121c5f80cd4 100644 (file)
--- a/neutron/tests/unit/test_db_plugin.py
+++ b/neutron/tests/unit/test_db_plugin.py
@@ -4181,7 +4181,8 @@ class DbModelTestCase(base.BaseTestCase):
         exp_middle = "[object at %x]" % id(network)
         exp_end_with = (" {tenant_id=None, id=None, "
                         "name='net_net', status='OK', "
-                        "admin_state_up=True, shared=None}>")
+                        "admin_state_up=True, shared=None, "
+                        "mtu=None}>")
         final_exp = exp_start_with + exp_middle + exp_end_with
         self.assertEqual(actual_repr_output, final_exp)