Browse Source

Merge "Remove all deprecated driver code that moved to octavia-lib"

changes/61/730961/2
Zuul 2 years ago committed by Gerrit Code Review
parent
commit
b6e0221ca8
  1. 1
      lower-constraints.txt
  2. 58
      octavia/api/drivers/data_models.py
  3. 26
      octavia/api/drivers/driver_lib.py
  4. 26
      octavia/api/drivers/provider_base.py
  5. 2
      octavia/api/v2/controllers/health_monitor.py
  6. 2
      octavia/api/v2/controllers/l7policy.py
  7. 2
      octavia/api/v2/controllers/l7rule.py
  8. 2
      octavia/api/v2/controllers/listener.py
  9. 2
      octavia/api/v2/controllers/load_balancer.py
  10. 2
      octavia/api/v2/controllers/member.py
  11. 2
      octavia/api/v2/controllers/pool.py
  12. 47
      octavia/tests/unit/api/drivers/test_driver_lib.py
  13. 44
      octavia/tests/unit/api/drivers/test_provider_base.py
  14. 2
      octavia/tests/unit/api/drivers/test_provider_noop_driver.py
  15. 1
      requirements.txt

1
lower-constraints.txt

@ -21,7 +21,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

58
octavia/api/drivers/data_models.py

@ -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')

26
octavia/api/drivers/driver_lib.py

@ -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')

26
octavia/api/drivers/provider_base.py

@ -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')

2
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

2
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

2
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

2
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

2
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

2
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

2
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

47
octavia/tests/unit/api/drivers/test_driver_lib.py

@ -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)

44
octavia/tests/unit/api/drivers/test_provider_base.py

@ -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)

2
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

1
requirements.txt

@ -43,7 +43,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

Loading…
Cancel
Save