From bf8bf46cbbe7428c9a12886604fe5aa10019aaec Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Mon, 6 Jan 2014 03:31:52 +0000 Subject: [PATCH] Enables quota extension on BigSwitch plugin Adds quotas to supported extensions in BigSwitch plugin and adds db migration script to create quota tables for BigSwitch plugin. Closes-Bug: #1266334 Change-Id: I255b318fde792ef59fe2cf456df4be87135c65cd --- .../versions/ed93525fd003_bigswitch_quota.py | 64 +++++++++++++++++++ neutron/plugins/bigswitch/plugin.py | 2 +- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py diff --git a/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py b/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py new file mode 100644 index 00000000000..3baa247d4c4 --- /dev/null +++ b/neutron/db/migration/alembic_migrations/versions/ed93525fd003_bigswitch_quota.py @@ -0,0 +1,64 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# +# 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. +# + +"""bigswitch_quota + +Revision ID: ed93525fd003 +Revises: 50e86cb2637a +Create Date: 2014-01-05 10:59:19.860397 + +""" + +# revision identifiers, used by Alembic. +revision = 'ed93525fd003' +down_revision = '50e86cb2637a' + +# Change to ['*'] if this migration applies to all plugins + +migration_for_plugins = [ + 'neutron.plugins.bigswitch.plugin.NeutronRestProxyV2' +] + +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/plugins/bigswitch/plugin.py b/neutron/plugins/bigswitch/plugin.py index 8f1a48a2749..f9499d59c3d 100644 --- a/neutron/plugins/bigswitch/plugin.py +++ b/neutron/plugins/bigswitch/plugin.py @@ -430,7 +430,7 @@ class NeutronRestProxyV2(db_base_plugin_v2.NeutronDbPluginV2, agentschedulers_db.DhcpAgentSchedulerDbMixin): supported_extension_aliases = ["external-net", "router", "binding", - "router_rules", "extra_dhcp_opt", + "router_rules", "extra_dhcp_opt", "quotas", "dhcp_agent_scheduler", "agent"] def __init__(self, server_timeout=None):