summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2018-02-08 04:30:04 +0800
committerHuang Haibin <haibin.huang@intel.com>2018-02-08 16:56:11 +0800
commit8083053372919faadb37b7b32a1d2edc9334fcb0 (patch)
tree4cc4e856f2be0dfd37dcda2cc56f77bf3a4ec3b6
parentea912204c5308393ab1f5349fd9accfbf0ea5885 (diff)
Move epacaps from newton to newton_base
Change-Id: Ic22158577045a06af85f3998d4c1ab1c7e8b4bf7 Issue-ID: MULTICLOUD-138 Signed-off-by: Huang Haibin <haibin.huang@intel.com>
-rw-r--r--ocata/ocata/extensions/views/epacaps.py4
-rw-r--r--share/newton_base/extensions/epacaps.py62
2 files changed, 64 insertions, 2 deletions
diff --git a/ocata/ocata/extensions/views/epacaps.py b/ocata/ocata/extensions/views/epacaps.py
index 72942064..d7567ea1 100644
--- a/ocata/ocata/extensions/views/epacaps.py
+++ b/ocata/ocata/extensions/views/epacaps.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Wind River Systems, Inc.
+# 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.
@@ -18,7 +18,7 @@ import traceback
from ocata.pub.config import config
-from newton.extensions.views import epacaps as newton_epacaps
+from newton_base.extensions import epacaps as newton_epacaps
logger = logging.getLogger(__name__)
diff --git a/share/newton_base/extensions/epacaps.py b/share/newton_base/extensions/epacaps.py
new file mode 100644
index 00000000..d8878e2c
--- /dev/null
+++ b/share/newton_base/extensions/epacaps.py
@@ -0,0 +1,62 @@
+# 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.
+
+import logging
+import json
+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 newton.pub.exceptions import VimDriverNewtonException
+from newton.requests.views.util import VimDriverUtils
+from newton.pub.msapi import extsys
+
+logger = logging.getLogger(__name__)
+
+
+class EpaCaps(APIView):
+
+ def __init__(self):
+ self.proxy_prefix = "multicloud"
+ self._logger = logger
+
+ def get(self, request, vimid=""):
+ logger.debug("EpaCaps--get::data> %s" % request.data)
+ logger.debug("EpaCaps--get::vimid> %s"
+ % vimid)
+ try:
+
+ vim = VimDriverUtils.get_vim_info(vimid)
+ caps_json = json.loads(vim['cloud_epa_caps'])
+
+ cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid)
+ content = {
+ "cloud-owner":cloud_owner,
+ "cloud-region-id":cloud_region_id,
+ "vimid":vimid,
+ "cloud-epa-caps": caps_json,
+ }
+ return Response(data=content, status=status.HTTP_200_OK)
+ except VimDriverNewtonException as e:
+ return Response(data={'error': e.content}, status=e.status_code)
+ except HttpError as e:
+ logger.error("HttpError: status:%s, response:%s" % (e.http_status, e.response.json()))
+ return Response(data=e.response.json(), status=e.http_status)
+ except Exception as e:
+ logger.error(traceback.format_exc())
+ return Response(data={'error': str(e)},
+ status=status.HTTP_500_INTERNAL_SERVER_ERROR)