Add quota table in PLUMgrid plugin

Quota DB driver is enabled in Neutron by default.
PLUMgrid plugin was missing the "quota" table. It has
been added in this commit.

Fix bug# 1236970

Change-Id: I5170a8be2b412a3bcf1edcacce5574f0073b84d4
(cherry picked from commit 23bec4f7cb6e84a8d717c0b5ccc222f51c67f072)

diff --git a/neutron/db/migration/alembic_migrations/versions/27ef74513d33_quota_in_plumgrid_pl.py b/neutron/db/migration/alembic_migrations/versions/27ef74513d33_quota_in_plumgrid_pl.py
new file mode 100644 (file)
index 0000000..df44781
--- /dev/null
+++ b/neutron/db/migration/alembic_migrations/versions/27ef74513d33_quota_in_plumgrid_pl.py
@@ -0,0 +1,65 @@
+# 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.
+#
+
+"""quota_in_plumgrid_plugin
+
+Revision ID: 27ef74513d33
+Revises: 3a520dd165d0
+Create Date: 2013-10-08 10:59:19.860397
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '27ef74513d33'
+down_revision = '3a520dd165d0'
+
+# Change to ['*'] if this migration applies to all plugins
+
+migration_for_plugins = [
+    'neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin.'
+    'NeutronPluginPLUMgridV2'
+]
+
+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
+
+    ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        'quotas',
+        sa.Column('id', sa.String(length=36), nullable=False),
+        sa.Column('tenant_id', sa.String(length=255), nullable=True),
+        sa.Column('resource', sa.String(length=255), nullable=True),
+        sa.Column('limit', sa.Integer(), nullable=True),
+        sa.PrimaryKeyConstraint('id')
+    )
+    ### end Alembic commands ###
+
+
+def downgrade(active_plugins=None, options=None):
+    if not migration.should_run(active_plugins, migration_for_plugins):
+        return
+
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('quotas')
+    ### end Alembic commands ###

diff --git a/neutron/db/migration/alembic_migrations/versions/havana_release.py b/neutron/db/migration/alembic_migrations/versions/havana_release.py
index c6f9e006758c27f30f89f70ef063573f2bdb8829..a8dc05d9683716fb8fc3485fa12aa3422600bf46 100644 (file)
--- a/neutron/db/migration/alembic_migrations/versions/havana_release.py
+++ b/neutron/db/migration/alembic_migrations/versions/havana_release.py
@@ -25,7 +25,7 @@ Create Date: 2013-10-02 00:00:00.000000
 
 # revision identifiers, used by Alembic.
 revision = 'havana'
-down_revision = '3a520dd165d0'
+down_revision = '27ef74513d33'
 
 # Change to ['*'] if this migration applies to all plugins
 

diff --git a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
index cf65b21691e1ceec0aaed7e17a2a37d086dc61de..2c0b159bc0f9ee96d419c9d8bf7fd23b194b13d3 100644 (file)
--- a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
+++ b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py
@@ -30,6 +30,7 @@ from neutron.db import db_base_plugin_v2
 from neutron.db import external_net_db
 from neutron.db import l3_db
 from neutron.db import portbindings_db
+from neutron.db import quota_db  # noqa
 from neutron.extensions import portbindings
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
@@ -60,7 +61,8 @@ class NeutronPluginPLUMgridV2(db_base_plugin_v2.NeutronDbPluginV2,
                               external_net_db.External_net_db_mixin,
                               l3_db.L3_NAT_db_mixin):
 
-    supported_extension_aliases = ["external-net", "router", "binding"]
+    supported_extension_aliases = ["external-net", "router", "binding",
+                                   "quotas"]
 
     binding_view = "extension:port_binding:view"
     binding_set = "extension:port_binding:set"