From dd9d5031e3babd86ca25a2a06586dee1513269e5 Mon Sep 17 00:00:00 2001 From: Huang Haibin Date: Mon, 15 Oct 2018 11:24:32 +0800 Subject: Upgrade extension v1 for pike Change-Id: I0178d07897eaf32174938362a54addbac4355f4e Issue-ID: MULTICLOUD-377 Signed-off-by: Huang Haibin --- pike/pike/extensions/urlsV1.py | 24 ++++++++++++++++++++++++ pike/pike/extensions/views/extensions.py | 11 +++++++++++ pike/pike/urls.py | 3 ++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pike/pike/extensions/urlsV1.py diff --git a/pike/pike/extensions/urlsV1.py b/pike/pike/extensions/urlsV1.py new file mode 100644 index 00000000..eb31ca19 --- /dev/null +++ b/pike/pike/extensions/urlsV1.py @@ -0,0 +1,24 @@ +# Copyright (c) 2018 Intel Corporation. +# +# 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 django.conf.urls import url +from rest_framework.urlpatterns import format_suffix_patterns + +from pike.extensions.views import extensions + +urlpatterns = [ + url(r'^sions/?$', extensions.APIv1Extensions.as_view()), +] + +urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/pike/pike/extensions/views/extensions.py b/pike/pike/extensions/views/extensions.py index 2c499f36..75569377 100644 --- a/pike/pike/extensions/views/extensions.py +++ b/pike/pike/extensions/views/extensions.py @@ -27,3 +27,14 @@ class Extensions(newton_extensions.Extensions): self._logger = logger self.proxy_prefix = settings.MULTICLOUD_PREFIX +class APIv1Extensions(Extensions): + + def __init__(self): + self._logger = logger + self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX + + def get(self, request, cloud_owner="", cloud_region_id=""): + self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id)) + + vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) + return super(APIv1Extensions,self).get(request, vimid) diff --git a/pike/pike/urls.py b/pike/pike/urls.py index 8e1ad9f6..15948e45 100644 --- a/pike/pike/urls.py +++ b/pike/pike/urls.py @@ -40,7 +40,8 @@ urlpatterns = [ registration.RegistryV1.as_view()), url(r'^api/multicloud-pike/v1/(?P[0-9a-zA-Z_-]+)$', registration.RegistryV1.as_view()), - + url(r'^api/multicloud-pike/v1/(?P[0-9a-zA-Z_-]+)/exten', + include('pike.extensions.urlsV1')), url(r'^api/multicloud-pike/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/infra_workload/?$', infra_workload.APIv1InfraWorkload.as_view()), url(r'^api/multicloud-pike/v1/(?P[0-9a-zA-Z_-]+)/(?P[0-9a-zA-Z_-]+)/infra_workload/(?P[0-9a-zA-Z_-]*)/?$', -- cgit 1.2.3-korg