From de69b2c7ff9e4d72c003c7fb6fe624c570b3324c Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Tue, 7 Jan 2020 17:03:03 -0500 Subject: [PATCH] Remove all deprecated driver code that moved to octavia-lib In https://review.opendev.org/#/c/613709/ octavia was changed to use octavia-lib for a lot of API driver-related code and deprecation warnings put in place. Now that we're in Victoria remove all the deprecation shims and use octavia-lib exclusively. Change-Id: If92988150479a7daf465af5f8df22818664a0fce --- lower-constraints.txt | 1 - octavia/api/drivers/data_models.py | 58 ------------------- octavia/api/drivers/driver_lib.py | 26 --------- octavia/api/drivers/provider_base.py | 26 --------- octavia/api/v2/controllers/health_monitor.py | 2 +- octavia/api/v2/controllers/l7policy.py | 2 +- octavia/api/v2/controllers/l7rule.py | 2 +- octavia/api/v2/controllers/listener.py | 2 +- octavia/api/v2/controllers/load_balancer.py | 2 +- octavia/api/v2/controllers/member.py | 2 +- octavia/api/v2/controllers/pool.py | 2 +- .../tests/unit/api/drivers/test_driver_lib.py | 47 --------------- .../unit/api/drivers/test_provider_base.py | 44 -------------- .../api/drivers/test_provider_noop_driver.py | 2 +- requirements.txt | 1 - 15 files changed, 8 insertions(+), 211 deletions(-) delete mode 100644 octavia/api/drivers/data_models.py delete mode 100644 octavia/api/drivers/driver_lib.py delete mode 100644 octavia/api/drivers/provider_base.py delete mode 100644 octavia/tests/unit/api/drivers/test_driver_lib.py delete mode 100644 octavia/tests/unit/api/drivers/test_provider_base.py diff --git a/lower-constraints.txt b/lower-constraints.txt index 8188549cf9..56afb20154 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -22,7 +22,6 @@ contextlib2==0.5.5 cotyledon==1.3.0 coverage==4.0 cryptography==2.1 -debtcollector==1.19.0 decorator==4.2.1 deprecation==2.0 diskimage-builder==2.24.0 diff --git a/octavia/api/drivers/data_models.py b/octavia/api/drivers/data_models.py deleted file mode 100644 index 0db407f8ed..0000000000 --- a/octavia/api/drivers/data_models.py +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2014 Rackspace -# Copyright (c) 2016 Blue Box, an IBM Company -# Copyright 2018 Rackspace, US Inc. -# 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 warnings - -from debtcollector import moves - -from octavia_lib.api.drivers import data_models as lib_data_models - - -warnings.simplefilter('default', DeprecationWarning) - -BaseDataModel = moves.moved_class(lib_data_models.BaseDataModel, - 'BaseDataModel', __name__, - version='Stein', removal_version='U') - -UnsetType = moves.moved_class(lib_data_models.UnsetType, 'UnsetType', __name__, - version='Stein', removal_version='U') - -LoadBalancer = moves.moved_class(lib_data_models.LoadBalancer, 'LoadBalancer', - __name__, version='Stein', - removal_version='U') - -Listener = moves.moved_class(lib_data_models.Listener, 'Listener', __name__, - version='Stein', removal_version='U') - -Pool = moves.moved_class(lib_data_models.Pool, 'Pool', __name__, - version='Stein', removal_version='U') - -Member = moves.moved_class(lib_data_models.Member, 'Member', __name__, - version='Stein', removal_version='U') - -HealthMonitor = moves.moved_class(lib_data_models.HealthMonitor, - 'HealthMonitor', __name__, - version='Stein', removal_version='U') - -L7Policy = moves.moved_class(lib_data_models.L7Policy, 'L7Policy', __name__, - version='Stein', removal_version='U') - -L7Rule = moves.moved_class(lib_data_models.L7Rule, 'L7Rule', __name__, - version='Stein', removal_version='U') - -VIP = moves.moved_class(lib_data_models.VIP, 'VIP', __name__, - version='Stein', removal_version='U') diff --git a/octavia/api/drivers/driver_lib.py b/octavia/api/drivers/driver_lib.py deleted file mode 100644 index 3bc4bddbe8..0000000000 --- a/octavia/api/drivers/driver_lib.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2018 Rackspace, US Inc. -# -# 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 warnings - -from debtcollector import moves - -from octavia_lib.api.drivers import driver_lib as lib_driver_lib - - -warnings.simplefilter('default', DeprecationWarning) - -DriverLibrary = moves.moved_class( - lib_driver_lib.DriverLibrary, 'DriverLibrary', __name__, - version='Stein', removal_version='U') diff --git a/octavia/api/drivers/provider_base.py b/octavia/api/drivers/provider_base.py deleted file mode 100644 index 4cef3387d6..0000000000 --- a/octavia/api/drivers/provider_base.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2018 Rackspace, US Inc. -# -# 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 warnings - -from debtcollector import moves - -from octavia_lib.api.drivers import provider_base as lib_provider_base - - -warnings.simplefilter('default', DeprecationWarning) - -ProviderDriver = moves.moved_class( - lib_provider_base.ProviderDriver, 'ProviderDriver', __name__, - version='Stein', removal_version='U') diff --git a/octavia/api/v2/controllers/health_monitor.py b/octavia/api/v2/controllers/health_monitor.py index e8879923ca..896533387f 100644 --- a/octavia/api/v2/controllers/health_monitor.py +++ b/octavia/api/v2/controllers/health_monitor.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_config import cfg from oslo_db import exception as odb_exceptions from oslo_log import log as logging @@ -21,7 +22,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/l7policy.py b/octavia/api/v2/controllers/l7policy.py index 4d31011c1d..92fa3d87ee 100644 --- a/octavia/api/v2/controllers/l7policy.py +++ b/octavia/api/v2/controllers/l7policy.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_config import cfg from oslo_db import exception as odb_exceptions from oslo_log import log as logging @@ -21,7 +22,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/l7rule.py b/octavia/api/v2/controllers/l7rule.py index fda37097e4..f2015af433 100644 --- a/octavia/api/v2/controllers/l7rule.py +++ b/octavia/api/v2/controllers/l7rule.py @@ -12,6 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_db import exception as odb_exceptions from oslo_log import log as logging from oslo_utils import excutils @@ -19,7 +20,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/listener.py b/octavia/api/v2/controllers/listener.py index 62ca98b68c..6de1990b0a 100644 --- a/octavia/api/v2/controllers/listener.py +++ b/octavia/api/v2/controllers/listener.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_config import cfg from oslo_db import exception as odb_exceptions from oslo_log import log as logging @@ -22,7 +23,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/load_balancer.py b/octavia/api/v2/controllers/load_balancer.py index dd0e43c1bf..377ec42b84 100644 --- a/octavia/api/v2/controllers/load_balancer.py +++ b/octavia/api/v2/controllers/load_balancer.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_config import cfg from oslo_db import exception as odb_exceptions from oslo_log import log as logging @@ -24,7 +25,6 @@ from sqlalchemy.orm import exc as sa_exception from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/member.py b/octavia/api/v2/controllers/member.py index eb3ed15a3d..ca33851e2e 100644 --- a/octavia/api/v2/controllers/member.py +++ b/octavia/api/v2/controllers/member.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_db import exception as odb_exceptions from oslo_log import log as logging from oslo_utils import excutils @@ -21,7 +22,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/api/v2/controllers/pool.py b/octavia/api/v2/controllers/pool.py index b000c61f3e..e362bfda04 100644 --- a/octavia/api/v2/controllers/pool.py +++ b/octavia/api/v2/controllers/pool.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models as driver_dm from oslo_config import cfg from oslo_db import exception as odb_exceptions from oslo_log import log as logging @@ -22,7 +23,6 @@ from pecan import request as pecan_request from wsme import types as wtypes from wsmeext import pecan as wsme_pecan -from octavia.api.drivers import data_models as driver_dm from octavia.api.drivers import driver_factory from octavia.api.drivers import utils as driver_utils from octavia.api.v2.controllers import base diff --git a/octavia/tests/unit/api/drivers/test_driver_lib.py b/octavia/tests/unit/api/drivers/test_driver_lib.py deleted file mode 100644 index 3784fa4ff9..0000000000 --- a/octavia/tests/unit/api/drivers/test_driver_lib.py +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2018 Rackspace, US Inc. -# -# 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. - -# Copyright 2018 Rackspace, US Inc. -# -# 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. - -from unittest import mock - -import octavia_lib.api.drivers.driver_lib as lib_driver_lib - -from octavia.api.drivers import driver_lib -import octavia.tests.unit.base as base - - -class TestDriverLib(base.TestCase): - - def setUp(self): - super(TestDriverLib, self).setUp() - - # Silly test to check that debtcollector moves is working - @mock.patch('octavia_lib.api.drivers.driver_lib.DriverLibrary.' - '_check_for_socket_ready') - def test_driver_lib_exists(self, mock_ready): - driver_lib_class = driver_lib.DriverLibrary() - self.assertIsInstance(driver_lib_class, lib_driver_lib.DriverLibrary) diff --git a/octavia/tests/unit/api/drivers/test_provider_base.py b/octavia/tests/unit/api/drivers/test_provider_base.py deleted file mode 100644 index 86e7d63968..0000000000 --- a/octavia/tests/unit/api/drivers/test_provider_base.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2018 Rackspace, US Inc. -# -# 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. - -# Copyright 2018 Rackspace, US Inc. -# -# 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 octavia_lib.api.drivers.provider_base as lib_provider_base - -from octavia.api.drivers import provider_base -import octavia.tests.unit.base as base - - -class TestProviderBase(base.TestCase): - - def setUp(self): - super(TestProviderBase, self).setUp() - - # Silly test to check that debtcollector moves is working - def test_provider_base_exists(self): - provider_base_class = provider_base.ProviderDriver() - self.assertIsInstance(provider_base_class, - lib_provider_base.ProviderDriver) diff --git a/octavia/tests/unit/api/drivers/test_provider_noop_driver.py b/octavia/tests/unit/api/drivers/test_provider_noop_driver.py index 5a5096baee..faf95f28a8 100644 --- a/octavia/tests/unit/api/drivers/test_provider_noop_driver.py +++ b/octavia/tests/unit/api/drivers/test_provider_noop_driver.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from octavia_lib.api.drivers import data_models from oslo_utils import uuidutils -from octavia.api.drivers import data_models from octavia.api.drivers.noop_driver import driver import octavia.tests.unit.base as base diff --git a/requirements.txt b/requirements.txt index 050e01d5df..f52d5130ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,6 @@ castellan>=0.16.0 # Apache-2.0 tenacity>=5.0.4 # Apache-2.0 distro>=1.2.0 # Apache-2.0 jsonschema>=2.6.0 # MIT -debtcollector>=1.19.0 # Apache-2.0 octavia-lib>=2.0.0 # Apache-2.0 netaddr>=0.7.19 # BSD simplejson>=3.13.2 # MIT