From d48dc5d5af174535d5d96c2bbaee3d03715ed2b9 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Sat, 23 Sep 2017 01:20:11 +0800 Subject: 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 --- .../titanium_cloud/extensions/views/extensions.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'windriver/titanium_cloud/extensions/views/extensions.py') diff --git a/windriver/titanium_cloud/extensions/views/extensions.py b/windriver/titanium_cloud/extensions/views/extensions.py index 2dd61fe9..3b231c02 100644 --- a/windriver/titanium_cloud/extensions/views/extensions.py +++ b/windriver/titanium_cloud/extensions/views/extensions.py @@ -12,9 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. import logging +import traceback + +from keystoneauth1.exceptions import HttpError +from rest_framework import status +from rest_framework.response import Response +from rest_framework.views import APIView from titanium_cloud.pub.config import config +from newton.pub.exceptions import VimDriverNewtonException +from newton.requests.views.util import VimDriverUtils from newton.extensions.views import extensions as newton_extensions +from newton.pub.msapi import extsys logger = logging.getLogger(__name__) @@ -39,17 +48,14 @@ class Extensions(newton_extensions.Extensions): "alias": "epa-caps", "description": "Multiple network support", "name": "EPACapsQuery", - "url": self.proxy_prefix + "/%s/extensions/epa-caps" \ - % (vimid), + "url": self.proxy_prefix + "/%s/extensions/epa-caps" % (vimid), "spec": "" }, { "alias": "guest-monitor", "description": "Multiple network support", - "name": "EPACapsQuery", - "url": self.proxy_prefix +\ - "/%s/extensions/guest-monitor/{server_id}" \ - % (vimid), + "name": "Guest Monitor", + "url": self.proxy_prefix + "/%s/extensions/guest-monitor/{server_id}" % (vimid), "spec": "" } ] -- cgit 1.2.3-korg