From 9c56f8386c5e2e12a8efaf16235d156929859cf0 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Wed, 27 Feb 2019 16:31:12 -0500 Subject: [PATCH] Remove quota_db backward compat file It's been four years since neutron.db.quota_db was changed to really use neutron.db.quota.driver under the covers, let's remove it now that all Openstack consumers have been updated. There are other occurences besides below, but they are only doc changes so will not be broken. Depends-on: https://review.openstack.org/639829 (neutron-lbaas) Depends-on: https://review.openstack.org/639837 (tempest) Change-Id: I948356c34e2bff5ca10fd1e3481762de0be62555 --- doc/source/contributor/internals/quota.rst | 2 +- neutron/db/quota_db.py | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 neutron/db/quota_db.py diff --git a/doc/source/contributor/internals/quota.rst b/doc/source/contributor/internals/quota.rst index 4b8fa90179f..1dc7db9848a 100644 --- a/doc/source/contributor/internals/quota.rst +++ b/doc/source/contributor/internals/quota.rst @@ -346,7 +346,7 @@ References ---------- .. [#] Subnet allocation extension: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/extensions/subnetallocation.py -.. [#] DB Quota driver class: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/quota_db.py#n33 +.. [#] DB Quota driver class: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/quota/driver.py#n30 .. [#] Quota API extension controller: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/extensions/quotasv2.py#n40 .. [#] Neutron resource attribute map: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/api/v2/attributes.py#n639 .. [#] Base controller class: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/api/v2/base.py#n50 diff --git a/neutron/db/quota_db.py b/neutron/db/quota_db.py deleted file mode 100644 index 1ce75aeef78..00000000000 --- a/neutron/db/quota_db.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2011 OpenStack Foundation. -# All Rights Reserved. -# -# 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. - -import sys - -from neutron.db.quota import driver # noqa - -# This module has been preserved for backward compatibility, and will be -# deprecated in the future -sys.modules[__name__] = sys.modules['neutron.db.quota.driver']