From 4b5e1060035b5070f26f92ef07230ccc44816f00 Mon Sep 17 00:00:00 2001 From: Shushanik Hovhannesyan Date: Tue, 12 May 2026 16:43:29 +0200 Subject: [PATCH 1/3] Reegister service and add empty proxy for CCN --- otcextensions/sdk/__init__.py | 5 +++++ otcextensions/sdk/ccn/__init__.py | 0 otcextensions/sdk/ccn/ccn_service.py | 20 ++++++++++++++++++++ otcextensions/sdk/ccn/v3/__init__.py | 0 otcextensions/sdk/ccn/v3/_proxy.py | 17 +++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 otcextensions/sdk/ccn/__init__.py create mode 100644 otcextensions/sdk/ccn/ccn_service.py create mode 100644 otcextensions/sdk/ccn/v3/__init__.py create mode 100644 otcextensions/sdk/ccn/v3/_proxy.py diff --git a/otcextensions/sdk/__init__.py b/otcextensions/sdk/__init__.py index 3ca208f8f..9e6076003 100644 --- a/otcextensions/sdk/__init__.py +++ b/otcextensions/sdk/__init__.py @@ -70,6 +70,11 @@ "service_type": "cce", "endpoint_service_type": "ccev2.0", }, + "ccn": { + "service_type": "ccn", + "append_project_id": True, + "endpoint_service_type": "ccnv3", + }, "ces": { "service_type": "ces", "append_project_id": True, diff --git a/otcextensions/sdk/ccn/__init__.py b/otcextensions/sdk/ccn/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/otcextensions/sdk/ccn/ccn_service.py b/otcextensions/sdk/ccn/ccn_service.py new file mode 100644 index 000000000..96ac2c0ce --- /dev/null +++ b/otcextensions/sdk/ccn/ccn_service.py @@ -0,0 +1,20 @@ +# 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.ccn.v3 import _proxy + + +class CcnService(service_description.ServiceDescription): + """The Cloud Connect service.""" + + supported_versions = {"3": _proxy.Proxy} diff --git a/otcextensions/sdk/ccn/v3/__init__.py b/otcextensions/sdk/ccn/v3/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/otcextensions/sdk/ccn/v3/_proxy.py b/otcextensions/sdk/ccn/v3/_proxy.py new file mode 100644 index 000000000..bac534d2b --- /dev/null +++ b/otcextensions/sdk/ccn/v3/_proxy.py @@ -0,0 +1,17 @@ +# 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): + + pass From 479041e27f27881e8822f566cf9d3efcbd4d1335 Mon Sep 17 00:00:00 2001 From: Shushanik Hovhannesyan Date: Thu, 14 May 2026 13:38:23 +0200 Subject: [PATCH 2/3] Add test for ccn service --- otcextensions/sdk/__init__.py | 2 +- otcextensions/sdk/ccn/v3/_proxy.py | 2 +- .../tests/functional/sdk/ccn/__init__.py | 0 .../tests/functional/sdk/ccn/v1/__init__.py | 0 .../functional/sdk/ccn/v1/test_service.py | 23 +++++++++++++++++++ 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 otcextensions/tests/functional/sdk/ccn/__init__.py create mode 100644 otcextensions/tests/functional/sdk/ccn/v1/__init__.py create mode 100644 otcextensions/tests/functional/sdk/ccn/v1/test_service.py diff --git a/otcextensions/sdk/__init__.py b/otcextensions/sdk/__init__.py index 9e6076003..0b1565f91 100644 --- a/otcextensions/sdk/__init__.py +++ b/otcextensions/sdk/__init__.py @@ -73,7 +73,7 @@ "ccn": { "service_type": "ccn", "append_project_id": True, - "endpoint_service_type": "ccnv3", + "endpoint_service_type": "ccn", }, "ces": { "service_type": "ces", diff --git a/otcextensions/sdk/ccn/v3/_proxy.py b/otcextensions/sdk/ccn/v3/_proxy.py index bac534d2b..38cfb42e8 100644 --- a/otcextensions/sdk/ccn/v3/_proxy.py +++ b/otcextensions/sdk/ccn/v3/_proxy.py @@ -14,4 +14,4 @@ class Proxy(proxy.Proxy): - pass + skip_discovery = True diff --git a/otcextensions/tests/functional/sdk/ccn/__init__.py b/otcextensions/tests/functional/sdk/ccn/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/otcextensions/tests/functional/sdk/ccn/v1/__init__.py b/otcextensions/tests/functional/sdk/ccn/v1/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/otcextensions/tests/functional/sdk/ccn/v1/test_service.py b/otcextensions/tests/functional/sdk/ccn/v1/test_service.py new file mode 100644 index 000000000..a7b7253ac --- /dev/null +++ b/otcextensions/tests/functional/sdk/ccn/v1/test_service.py @@ -0,0 +1,23 @@ +# 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.ccn + + self.assertIsNotNone(client) From 30b78d24697a4f14f681e8667df99691b373d47a Mon Sep 17 00:00:00 2001 From: Shushanik Hovhannesyan Date: Fri, 15 May 2026 15:03:01 +0200 Subject: [PATCH 3/3] Fix endpoint service type --- otcextensions/sdk/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otcextensions/sdk/__init__.py b/otcextensions/sdk/__init__.py index 0b1565f91..ae630e582 100644 --- a/otcextensions/sdk/__init__.py +++ b/otcextensions/sdk/__init__.py @@ -73,7 +73,7 @@ "ccn": { "service_type": "ccn", "append_project_id": True, - "endpoint_service_type": "ccn", + "endpoint_service_type": "cc", }, "ces": { "service_type": "ces",