From dc7458dfb321574c910f54f0f9a872fec91e14bd Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Wed, 2 Sep 2020 12:15:39 +0200 Subject: [PATCH] drop maas service, since doesnt exist anymore --- otcextensions/sdk/__init__.py | 4 ---- otcextensions/sdk/maas/__init__.py | 0 otcextensions/sdk/maas/maas_service.py | 22 ----------------- otcextensions/sdk/maas/v1/__init__.py | 0 otcextensions/sdk/maas/v1/_proxy.py | 17 ------------- .../tests/functional/sdk/maas/__init__.py | 0 .../tests/functional/sdk/maas/v1/__init__.py | 0 .../functional/sdk/maas/v1/test_service.py | 24 ------------------- otcextensions/tests/unit/sdk/maas/__init__.py | 0 .../tests/unit/sdk/maas/v1/test_proxy.py | 22 ----------------- 10 files changed, 89 deletions(-) delete mode 100644 otcextensions/sdk/maas/__init__.py delete mode 100644 otcextensions/sdk/maas/maas_service.py delete mode 100644 otcextensions/sdk/maas/v1/__init__.py delete mode 100644 otcextensions/sdk/maas/v1/_proxy.py delete mode 100644 otcextensions/tests/functional/sdk/maas/__init__.py delete mode 100644 otcextensions/tests/functional/sdk/maas/v1/__init__.py delete mode 100644 otcextensions/tests/functional/sdk/maas/v1/test_service.py delete mode 100644 otcextensions/tests/unit/sdk/maas/__init__.py delete mode 100644 otcextensions/tests/unit/sdk/maas/v1/test_proxy.py diff --git a/otcextensions/sdk/__init__.py b/otcextensions/sdk/__init__.py index 3394b7fd8..ce0a26872 100644 --- a/otcextensions/sdk/__init__.py +++ b/otcextensions/sdk/__init__.py @@ -108,10 +108,6 @@ 'lts': { 'service_type': 'lts' }, - 'maas': { - 'service_type': 'maas', - 'append_project_id': True, - }, 'mrs': { 'service_type': 'mrs' }, diff --git a/otcextensions/sdk/maas/__init__.py b/otcextensions/sdk/maas/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/otcextensions/sdk/maas/maas_service.py b/otcextensions/sdk/maas/maas_service.py deleted file mode 100644 index cf5d82dce..000000000 --- a/otcextensions/sdk/maas/maas_service.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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 openstack import service_description - -from otcextensions.sdk.maas.v1 import _proxy - - -class MaasService(service_description.ServiceDescription): - """The Maas service.""" - - supported_versions = { - '1': _proxy.Proxy - } diff --git a/otcextensions/sdk/maas/v1/__init__.py b/otcextensions/sdk/maas/v1/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/otcextensions/sdk/maas/v1/_proxy.py b/otcextensions/sdk/maas/v1/_proxy.py deleted file mode 100644 index 38cfb42e8..000000000 --- a/otcextensions/sdk/maas/v1/_proxy.py +++ /dev/null @@ -1,17 +0,0 @@ -# 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 openstack import proxy - - -class Proxy(proxy.Proxy): - - skip_discovery = True diff --git a/otcextensions/tests/functional/sdk/maas/__init__.py b/otcextensions/tests/functional/sdk/maas/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/otcextensions/tests/functional/sdk/maas/v1/__init__.py b/otcextensions/tests/functional/sdk/maas/v1/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/otcextensions/tests/functional/sdk/maas/v1/test_service.py b/otcextensions/tests/functional/sdk/maas/v1/test_service.py deleted file mode 100644 index 68ca38110..000000000 --- a/otcextensions/tests/functional/sdk/maas/v1/test_service.py +++ /dev/null @@ -1,24 +0,0 @@ -# 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 openstack import _log - -from otcextensions.tests.functional import base - -_logger = _log.setup_logging('openstack') - - -class TestService(base.BaseFunctionalTest): - - def test_initialize(self): - client = self.conn.maas - - self.assertIsNotNone(client) diff --git a/otcextensions/tests/unit/sdk/maas/__init__.py b/otcextensions/tests/unit/sdk/maas/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/otcextensions/tests/unit/sdk/maas/v1/test_proxy.py b/otcextensions/tests/unit/sdk/maas/v1/test_proxy.py deleted file mode 100644 index 886d9e379..000000000 --- a/otcextensions/tests/unit/sdk/maas/v1/test_proxy.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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 otcextensions.sdk.maas.v1 import _proxy - -from openstack.tests.unit import test_proxy_base - - -class TestMaasProxy(test_proxy_base.TestProxyBase): - - def setUp(self): - super(TestMaasProxy, self).setUp() - self.proxy = _proxy.Proxy(self.session)