diff options
Diffstat (limited to 'windriver/titanium_cloud/registration')
3 files changed, 1 insertions, 345 deletions
diff --git a/windriver/titanium_cloud/registration/tests/test_registration2.py b/windriver/titanium_cloud/registration/tests/test_registration2.py index 9f0cd4d2..840f982f 100644 --- a/windriver/titanium_cloud/registration/tests/test_registration2.py +++ b/windriver/titanium_cloud/registration/tests/test_registration2.py @@ -18,17 +18,8 @@ import unittest # import json from django.test import Client from rest_framework import status - -# from django.core.cache import cache -# from common.msapi import extsys - from common.utils import restcall -# from newton_base.tests import mock_info -# from newton_base.tests import test_base -# from newton_base.util import VimDriverUtils - -# from newton_base.registration import registration as newton_registration -from titanium_cloud.registration.views import registration +from starlingx_base.registration import registration from newton_base.tests import test_base MOCK_VIM_INFO = { diff --git a/windriver/titanium_cloud/registration/views/__init__.py b/windriver/titanium_cloud/registration/views/__init__.py deleted file mode 100644 index ae1ce9db..00000000 --- a/windriver/titanium_cloud/registration/views/__init__.py +++ /dev/null @@ -1,13 +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. diff --git a/windriver/titanium_cloud/registration/views/registration.py b/windriver/titanium_cloud/registration/views/registration.py deleted file mode 100644 index 17992af7..00000000 --- a/windriver/titanium_cloud/registration/views/registration.py +++ /dev/null @@ -1,322 +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 uuid -import traceback - -from django.conf import settings - -from newton_base.registration import registration as newton_registration -# from common.exceptions import VimDriverNewtonException -from rest_framework import status -from rest_framework.response import Response -from common.msapi import extsys -from keystoneauth1.exceptions import HttpError -from newton_base.util import VimDriverUtils -from common.utils import restcall - -logger = logging.getLogger(__name__) - - -# DEBUG=True - - -class Registry(newton_registration.Registry): - def __init__(self): - super(Registry, self).__init__() - self.proxy_prefix = settings.MULTICLOUD_PREFIX - self.aai_base_url = settings.AAI_BASE_URL - # self._logger = logger - - def _get_ovsdpdk_capabilities(self, extra_specs, viminfo): - instruction_capability = {} - feature_uuid = uuid.uuid4() - - instruction_capability['hpa-capability-id'] = str(feature_uuid) - instruction_capability['hpa-feature'] = 'ovsDpdk' - instruction_capability['architecture'] = 'Intel64' - instruction_capability['hpa-version'] = 'v1' - - instruction_capability['hpa-feature-attributes'] = [] - instruction_capability['hpa-feature-attributes'].append( - {'hpa-attribute-key': 'dataProcessingAccelerationLibrary', - 'hpa-attribute-value': - '{{\"value\":\"{0}\"}}'.format("v17.02") - }) - return instruction_capability - - -class APIv1Registry(newton_registration.Registry): - def __init__(self): - super(APIv1Registry, self).__init__() - self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX - self.aai_base_url = settings.AAI_BASE_URL - # self._logger = logger - - def _get_ovsdpdk_capabilities(self, extra_specs, viminfo): - instruction_capability = {} - feature_uuid = uuid.uuid4() - - instruction_capability['hpa-capability-id'] = str(feature_uuid) - instruction_capability['hpa-feature'] = 'ovsDpdk' - instruction_capability['architecture'] = 'Intel64' - instruction_capability['hpa-version'] = 'v1' - - instruction_capability['hpa-feature-attributes'] = [] - instruction_capability['hpa-feature-attributes'].append( - {'hpa-attribute-key': 'dataProcessingAccelerationLibrary', - 'hpa-attribute-value': - '{{\"value\":\"{0}\"}}'.format("v17.02") - }) - return instruction_capability - - def _update_cloud_region(self, cloud_owner, cloud_region_id, openstack_region_id, viminfo, session=None): - if cloud_owner and cloud_region_id: - self._logger.debug( - ("_update_cloud_region, %(cloud_owner)s" - "_%(cloud_region_id)s ") - % { - "cloud_owner": cloud_owner, - "cloud_region_id": cloud_region_id - }) - - # Note1: The intent is to populate the openstack region id into property: cloud-region.esr-system-info.openstackRegionId - # Note2: As temp solution: the openstack region id was put into AAI cloud-region["cloud-epa-caps"] - - resource_info = { - "cloud-owner": cloud_owner, - "cloud-region-id": cloud_region_id, - "cloud-type": viminfo["type"], - "cloud-region-version": viminfo["version"], - "identity-url": - self.proxy_prefix + "/%s_%s/identity/v2.0" % (cloud_owner, cloud_region_id) - if self.proxy_prefix[-3:] == "/v0" else - self.proxy_prefix + "/%s/%s/identity/v2.0" % (cloud_owner, cloud_region_id), - "complex-name": viminfo["complex-name"], - "cloud-extra-info": viminfo["cloud_extra_info"], - "cloud-epa-caps": openstack_region_id, - "esr-system-info-list": { - "esr-system-info": [ - { - "esr-system-info-id": str(uuid.uuid4()), - "service-url": viminfo["url"], - "user-name": viminfo["userName"], - "password": viminfo["password"], - "system-type": "VIM", - "ssl-cacert": viminfo["cacert"], - "ssl-insecure": viminfo["insecure"], - "cloud-domain": viminfo["domain"], - "default-tenant": viminfo["tenant"] - - } - ] - } - } - - # get the resource first - resource_url = ("/cloud-infrastructure/cloud-regions/" - "cloud-region/%(cloud_owner)s/%(cloud_region_id)s" - % { - "cloud_owner": cloud_owner, - "cloud_region_id": cloud_region_id - }) - - # get cloud-region - retcode, content, status_code = \ - restcall.req_to_aai(resource_url, "GET") - - # add resource-version - if retcode == 0 and content: - content = json.JSONDecoder().decode(content) - # resource_info["resource-version"] = content["resource-version"] - content.update(resource_info) - resource_info = content - - # then update the resource - retcode, content, status_code = \ - restcall.req_to_aai(resource_url, "PUT", content=resource_info) - - self._logger.debug( - ("_update_cloud_region,%(cloud_owner)s" - "_%(cloud_region_id)s , " - "return %(retcode)s, %(content)s, %(status_code)s") - % { - "cloud_owner": cloud_owner, - "cloud_region_id": cloud_region_id, - "retcode": retcode, - "content": content, - "status_code": status_code, - }) - - # wait and confirm the update has been available for next AAI calls - while True: - # get cloud-region - retcode2, content2, status_code2 = \ - restcall.req_to_aai(resource_url, "GET") - if retcode2 == 0 and content2: - content2 = json.JSONDecoder().decode(content2) - if content2.get("identity-url", None)\ - == resource_info.get("identity-url", None): - break - - return retcode - return 1 # unknown cloud owner,region_id - - def _discover_regions(self, cloud_owner="", cloud_region_id="", - session=None, viminfo=None): - try: - regions = [] - vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) - isDistributedCloud = False - openstackregions = self._get_list_resources( - "/regions", "identity", session, viminfo, vimid, - "regions") - - for region in openstackregions: - if region['id'] == 'SystemController': - isDistributedCloud = True - break - else: - continue - - for region in openstackregions: - if region['id'] == 'SystemController': - continue - elif region['id'] == 'RegionOne' and isDistributedCloud: - continue - else: - regions.append(region['id']) - - self._logger.info("Discovered Regions :%s" % regions) - return regions - - except HttpError as e: - self._logger.error("HttpError: status:%s, response:%s" - % (e.http_status, e.response.json())) - return [] - except Exception: - self._logger.error(traceback.format_exc()) - return [] - - def post(self, request, cloud_owner="", cloud_region_id=""): - self._logger.info("registration with : %s, %s" - % (cloud_owner, cloud_region_id)) - - try: - vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) - - viminfo = VimDriverUtils.get_vim_info(vimid) - cloud_extra_info_str = viminfo['cloud_extra_info'] - cloud_extra_info = None - try: - cloud_extra_info = json.loads(cloud_extra_info_str)\ - if cloud_extra_info_str else None - except Exception as ex: - logger.error("Can not convert cloud extra info %s %s" % ( - str(ex), cloud_extra_info_str)) - pass - - region_specified = cloud_extra_info.get( - "openstack-region-id", None) if cloud_extra_info else None - multi_region_discovery = cloud_extra_info.get( - "multi-region-discovery", None) if cloud_extra_info else None - - # set the default tenant since there is no tenant info in the VIM yet - sess = VimDriverUtils.get_session( - viminfo, tenant_name=viminfo['tenant']) - - # discover the regions, expect it always returns a list (even empty list) - region_ids = self._discover_regions(cloud_owner, cloud_region_id, sess, viminfo) - - if len(region_ids) == 0: - self._logger.warn("failed to get region id") - - # compare the regions with region_specified and then cloud_region_id - if region_specified in region_ids: - pass - elif cloud_region_id in region_ids: - region_specified = cloud_region_id - pass - else: - # assume the first region be the primary region - # since we have no other way to determine it. - region_specified = region_ids.pop(0) - - # update cloud region and discover/register resource - if multi_region_discovery: - # no input for specified cloud region, - # so discover all cloud region - for regionid in region_ids: - # do not update the specified region here - if region_specified == regionid: - continue - - # create cloud region with composed AAI cloud_region_id - # except for the one onboarded externally (e.g. ESR) - gen_cloud_region_id = cloud_region_id + "_" + regionid - self._logger.info("create a cloud region: %s,%s,%s" - % (cloud_owner, gen_cloud_region_id, regionid)) - - self._update_cloud_region( - cloud_owner, gen_cloud_region_id, regionid, viminfo) - new_vimid = extsys.encode_vim_id( - cloud_owner, gen_cloud_region_id) - super(APIv1Registry, self).post(request, new_vimid) - - # update the specified region - self._update_cloud_region(cloud_owner, cloud_region_id, - region_specified, viminfo) - return super(APIv1Registry, self).post(request, vimid) - - except HttpError as e: - self._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: - self._logger.error(traceback.format_exc()) - return Response( - data={'error': str(e)}, - status=status.HTTP_500_INTERNAL_SERVER_ERROR) - - def delete(self, request, cloud_owner="", cloud_region_id=""): - self._logger.debug("unregister cloud region: %s, %s" - % (cloud_owner, cloud_region_id)) - - vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id) - return super(APIv1Registry, self).delete(request, vimid) - - -# APIv0 handler upgrading: leverage APIv1 handler -class APIv0Registry(APIv1Registry): - def __init__(self): - super(APIv0Registry, self).__init__() - self.proxy_prefix = settings.MULTICLOUD_PREFIX - self.aai_base_url = settings.AAI_BASE_URL - # self._logger = logger - - def post(self, request, vimid=""): - self._logger.info("registration with : %s" % vimid) - - cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid) - return super(APIv0Registry, self).post( - request, cloud_owner, cloud_region_id) - - def delete(self, request, vimid=""): - self._logger.debug("unregister cloud region: %s" % vimid) - - cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid) - return super(APIv0Registry, self).delete( - request, cloud_owner, cloud_region_id) |