API upgrading for identity proxy

Change-Id: I793dfc79d4a04da3b0b3fe19ed1b3076a5744106
Issue-ID: MULTICLOUD-297
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/windriver/titanium_cloud/proxy/urlsV1.py b/windriver/titanium_cloud/proxy/urlsV1.py
new file mode 100644 (file)
index 0000000..238d527
--- /dev/null
+++ b/windriver/titanium_cloud/proxy/urlsV1.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2017-2018 Wind River Systems, 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 django.conf.urls import url
+from rest_framework.urlpatterns import format_suffix_patterns
+
+from titanium_cloud.proxy.views import identityV3
+#from titanium_cloud.proxy.views import services
+#from newton_base.proxy import dnsaasdelegate
+
+urlpatterns = [
+    #    url(r'^identity/v2)$',
+    #        identityV2.Tokens.as_view()),
+    url(r'^identity/v3/auth/tokens/?$',
+        identityV3.APIv1Tokens.as_view()),
+    url(r'^identity/v3/?$',
+        identityV3.APIv1Tokens.as_view()),
+    url(r'^identity/v2.0/?$',
+        identityV3.APIv1TokensV2.as_view()),
+    url(r'^identity/v2.0/tokens/?$',
+        identityV3.APIv1TokensV2.as_view()),
+#    url(r'^identity/v2.0/tenants/?$',
+#        services.APIv1GetTenants.as_view()),
+#    url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$',
+#        dnsaasdelegate.APIv1DnsaasDelegate.as_view()),
+#    url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
+#        services.APIv1Services.as_view()),
+]
+
+urlpatterns = format_suffix_patterns(urlpatterns)

diff --git a/windriver/titanium_cloud/proxy/views/identityV3.py b/windriver/titanium_cloud/proxy/views/identityV3.py
index eaeeca4..cae0e83 100644 (file)
--- a/windriver/titanium_cloud/proxy/views/identityV3.py
+++ b/windriver/titanium_cloud/proxy/views/identityV3.py
@@ -16,6 +16,7 @@ import logging
 
 from django.conf import settings
 from newton_base.proxy import identityV3 as newton_identityV3
+from common.msapi import extsys
 
 logger = logging.getLogger(__name__)
 
@@ -32,3 +33,51 @@ class TokensV2(newton_identityV3.TokensV2):
     def __init__(self):
         self.proxy_prefix = settings.MULTICLOUD_PREFIX
         self._logger = logger
+
+
+class APIv1Tokens(Tokens):
+    def __init__(self):
+        self.proxy_prefix = settings.MULTICLOUD_PREFIX
+        self._logger = logger
+
+
+    def get(self, request, cloud_owner="", cloud_region_id=""):
+        self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
+        #self._logger.debug("META> %s" % request.META)
+        #self._logger.debug("data> %s" % request.data)
+
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return super(APIv1Tokens,self).get(request, vimid)
+
+
+    def post(self, request, cloud_owner="", cloud_region_id=""):
+        self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
+        #self._logger.debug("META> %s" % request.META)
+        #self._logger.debug("data> %s" % request.data)
+
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return super(APIv1Tokens,self).post(request, vimid)
+
+
+class APIv1TokensV2(TokensV2):
+    def __init__(self):
+        self.proxy_prefix = settings.MULTICLOUD_PREFIX
+        self._logger = logger
+
+
+    def get(self, request, cloud_owner="", cloud_region_id=""):
+        self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
+        #self._logger.debug("META> %s" % request.META)
+        #self._logger.debug("data> %s" % request.data)
+
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return super(APIv1TokensV2,self).get(request, vimid)
+
+
+    def post(self, request, cloud_owner="", cloud_region_id=""):
+        self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
+        #self._logger.debug("META> %s" % request.META)
+        #self._logger.debug("data> %s" % request.data)
+
+        vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
+        return super(APIv1TokensV2,self).post(request, vimid)

diff --git a/windriver/titanium_cloud/urls.py b/windriver/titanium_cloud/urls.py
index cecfcbd..e8ec9f0 100644 (file)
--- a/windriver/titanium_cloud/urls.py
+++ b/windriver/titanium_cloud/urls.py
@@ -47,12 +47,12 @@ urlpatterns = [
 #API upgrading
     url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/registry/?$',
         registration.RegistryV1.as_view()),
-#    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/?$',
-#        registration.Registry.as_view()),
+    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/?$',
+        registration.RegistryV1.as_view()),
 #    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/exten',
 #        include('titanium_cloud.extensions.urls')),
-#    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
-#        include('titanium_cloud.proxy.urls')),
+    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/',
+        include('titanium_cloud.proxy.urlsV1')),
 #    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/tenants/?$',
 #        tenants.Tenants.as_view()),
 #    url(r'^api/multicloud-titanium_cloud/v1/(?P<cloud_owner>[0-9a-zA-Z_-]+)/(?P<cloud_region_id>[0-9a-zA-Z_-]+)/'