summaryrefslogtreecommitdiffstats
path: root/windriver/titanium_cloud/proxy
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-09-23 01:20:11 +0800
committerBin Yang <bin.yang@windriver.com>2017-09-23 01:21:52 +0800
commitd48dc5d5af174535d5d96c2bbaee3d03715ed2b9 (patch)
treec5a1cfc07fc8d5df4cfe52aeb5d0ea4e4896333f /windriver/titanium_cloud/proxy
parent2de8e160c31f3ecf951fb4e85a96aa1e814b0a33 (diff)
Add backward support for identity v2.0 API
Add NBI v2.0/tokens and convert to SBI v3/auth/tokens Change-Id: I5734e18f78844f15847b3a0a2d906b70e75fd260 Issue-Id: INT-225 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'windriver/titanium_cloud/proxy')
-rw-r--r--windriver/titanium_cloud/proxy/urls.py4
-rw-r--r--windriver/titanium_cloud/proxy/views/identityV3.py6
2 files changed, 9 insertions, 1 deletions
diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py
index dbad26fa..31a3c8f7 100644
--- a/windriver/titanium_cloud/proxy/urls.py
+++ b/windriver/titanium_cloud/proxy/urls.py
@@ -23,7 +23,9 @@ urlpatterns = [
# identityV2.Tokens.as_view()),
url(r'^identity/v3/auth/tokens/?$',
identityV3.Tokens.as_view()),
- url(r'^identity/(?:v2.0/|)tenants/?$',
+ url(r'^identity/v2.0/tokens/?$',
+ identityV3.TokensV2.as_view()),
+ url(r'^identity/v2.0/tenants/?$',
services.GetTenants.as_view()),
url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$',
services.Services.as_view()),
diff --git a/windriver/titanium_cloud/proxy/views/identityV3.py b/windriver/titanium_cloud/proxy/views/identityV3.py
index a6efa6ac..2938caec 100644
--- a/windriver/titanium_cloud/proxy/views/identityV3.py
+++ b/windriver/titanium_cloud/proxy/views/identityV3.py
@@ -25,3 +25,9 @@ class Tokens(newton_identityV3.Tokens):
def __init__(self):
self.proxy_prefix = config.MULTICLOUD_PREFIX
self._logger = logger
+
+class TokensV2(newton_identityV3.TokensV2):
+
+ def __init__(self):
+ self.proxy_prefix = config.MULTICLOUD_PREFIX
+ self._logger = logger