diff options
author | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-07-26 16:35:13 -0700 |
---|---|---|
committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-07-30 06:31:55 -0700 |
commit | f5718605d7aae67eb9b63e3d5fa3f2217ec9bdf2 (patch) | |
tree | eb95244d9fee7beb6e928b626cc94722fc6fafe0 /share/newton_base/extensions | |
parent | 0d3e9ace323660381350a884b08ed92aa2290dbd (diff) |
Remove EPA attribute
Remove EPA property from multicloud as it is repaced by HPA attributes.
Change-Id: I96e2ebcc60ac55cb0f0559607de919da410f66b1
Issue-ID: AAI-1150
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Diffstat (limited to 'share/newton_base/extensions')
-rw-r--r-- | share/newton_base/extensions/epacaps.py | 62 | ||||
-rw-r--r-- | share/newton_base/extensions/extensions.py | 12 |
2 files changed, 1 insertions, 73 deletions
diff --git a/share/newton_base/extensions/epacaps.py b/share/newton_base/extensions/epacaps.py deleted file mode 100644 index cc5420e5..00000000 --- a/share/newton_base/extensions/epacaps.py +++ /dev/null @@ -1,62 +0,0 @@ -# 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 common.exceptions import VimDriverNewtonException -from newton_base.util import VimDriverUtils -from common.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) diff --git a/share/newton_base/extensions/extensions.py b/share/newton_base/extensions/extensions.py index a08da3e3..dd6ee55e 100644 --- a/share/newton_base/extensions/extensions.py +++ b/share/newton_base/extensions/extensions.py @@ -45,17 +45,7 @@ class Extensions(APIView): % vimid) try: cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid) - registered_extensions = \ - [ - { - "alias": "epa-caps", - "description": "Multiple network support", - "name": "EPACapsQuery", - "url": self.proxy_prefix + "/%s/extensions/epa-caps" \ - % (vimid), - "spec": "" - } - ] + registered_extensions = [] content = { "cloud-owner":cloud_owner, |