summaryrefslogtreecommitdiffstats
path: root/newton/newton/extensions
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2017-09-13 17:57:00 +0800
committerBin Yang <bin.yang@windriver.com>2017-09-13 17:57:00 +0800
commit51f18c6e84a88eaea53237b3a21d32ad4ab0e8a5 (patch)
treeaed163e17ddfde30bb46e9aafa857550b07d1f05 /newton/newton/extensions
parent530818aab2a02921e0445b6062260aad9e4b2810 (diff)
Refactor newton and ocato proxy
refactor code and fix bugs to update proxy prefix Change-Id: I4a02b0570759f087581e875cc683d4475bd2121b Issue-Id: MULTICLOUD-89 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton/newton/extensions')
-rw-r--r--newton/newton/extensions/views/epacaps.py4
-rw-r--r--newton/newton/extensions/views/extensions.py8
2 files changed, 10 insertions, 2 deletions
diff --git a/newton/newton/extensions/views/epacaps.py b/newton/newton/extensions/views/epacaps.py
index ef8aabed..54bd0ebe 100644
--- a/newton/newton/extensions/views/epacaps.py
+++ b/newton/newton/extensions/views/epacaps.py
@@ -34,6 +34,10 @@ DEBUG=True
class EpaCaps(APIView):
+ def __init__(self):
+ self.proxy_prefix = config.MULTICLOUD_PREFIX
+ self._logger = logger
+
def get(self, request, vimid=""):
logger.debug("EpaCaps--get::data> %s" % request.data)
logger.debug("EpaCaps--get::vimid> %s"
diff --git a/newton/newton/extensions/views/extensions.py b/newton/newton/extensions/views/extensions.py
index e1901d01..a196edcc 100644
--- a/newton/newton/extensions/views/extensions.py
+++ b/newton/newton/extensions/views/extensions.py
@@ -36,6 +36,10 @@ DEBUG=True
class Extensions(APIView):
+ def __init__(self):
+ self.proxy_prefix = config.MULTICLOUD_PREFIX
+ self._logger = logger
+
def get(self, request, vimid=""):
logger.debug("Extensions--get::data> %s" % request.data)
logger.debug("Extensions--get::vimid> %s"
@@ -48,7 +52,7 @@ class Extensions(APIView):
"alias": "epa-caps",
"description": "Multiple network support",
"name": "EPACapsQuery",
- "url": config.MULTICLOUD_PREFIX+"/%s/extensions/epa-caps" \
+ "url": self.proxy_prefix+"/%s/extensions/epa-caps" \
% (vimid),
"spec": ""
}
@@ -61,7 +65,7 @@ class Extensions(APIView):
"extensions": registered_extensions
}
return Response(data=content, status=status.HTTP_200_OK)
- #return resp
+
except VimDriverNewtonException as e:
return Response(data={'error': e.content}, status=e.status_code)
except HttpError as e: