diff options
| author |   Bin Hu <bh526r@att.com> | 2018-03-27 17:53:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-27 17:53:06 +0000 |
| commit | a3b7ac14b562270157bf6fe7a91666449244d126 (patch) | |
| tree | 528f0d4ed0237a26068e73e3b4beb96540365091 | |
| parent | 00d39278b227b9566a9a51350b46726b57b4cefb (diff) | |
| parent | 905a7229938fe3914db8f62af70c5d798542bfe2 (diff) | |
Merge "Add OVS DPDK HPA to Newton"
| -rw-r--r-- | newton/newton/registration/views/hpa.json | 6 | ||||
| -rw-r--r-- | newton/newton/registration/views/registration.py | 25 |
2 files changed, 29 insertions, 2 deletions
diff --git a/newton/newton/registration/views/hpa.json b/newton/newton/registration/views/hpa.json index 832d55af..2f87d21e 100644 --- a/newton/newton/registration/views/hpa.json +++ b/newton/newton/registration/views/hpa.json @@ -125,5 +125,11 @@ "unit": null } } + }, + "ovsDpdk": { + "info": { + "hpa-feature": "ovsDpdk", + "hpa-version": "v1" + } } } diff --git a/newton/newton/registration/views/registration.py b/newton/newton/registration/views/registration.py index 6b231a6d..e446a3b8 100644 --- a/newton/newton/registration/views/registration.py +++ b/newton/newton/registration/views/registration.py @@ -38,6 +38,11 @@ class Registry(newton_registration.Registry): def _discover_flavors(self, vimid="", session=None, viminfo=None): try: cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid) + cloud_extra_info_str = viminfo.get('cloud_extra_info') + if cloud_extra_info_str: + cloud_extra_info = json.loads(cloud_extra_info_str) + else: + cloud_extra_info = None for flavor in self._get_list_resources( "/flavors/detail", "compute", session, viminfo, vimid, "flavors"): @@ -61,7 +66,8 @@ class Registry(newton_registration.Registry): extraResp = Flavors._get_flavor_extra_specs(session, flavor['id']) extraContent = extraResp.json() hpa_capabilities = self._get_hpa_capabilities(vimid, flavor, - extraContent["extra_specs"]) + extraContent["extra_specs"], + cloud_extra_info) flavor_info['hpa_capabilities'] = hpa_capabilities self._update_resoure( @@ -78,7 +84,7 @@ class Registry(newton_registration.Registry): self._logger.error(traceback.format_exc()) return - def _get_hpa_capabilities(self, vimid, flavor, extra_specs): + def _get_hpa_capabilities(self, vimid, flavor, extra_specs, cloud_extra_info): """Convert flavor information to HPA capabilities for AAI""" cloud_owner, cloud_region_id = extsys.decode_vim_id(vimid) @@ -194,6 +200,21 @@ class Registry(newton_registration.Registry): capability['hpa-features-attributes'] = attributes capabilities.append(capability) + # OVS DPDK + if cloud_extra_info: + cloud_dpdk_info = cloud_extra_info.get('ovsDpdk') + capability = hpa_dict['ovsDpdk']['info'] + capability['hpa-capability-id'] = str(uuid.uuid4()) + capability['hardwareArchitecture'] = cloud_dpdk_info.get('arch') + attributes = [ + { + 'hpa-attribute-key': cloud_dpdk_info.get('libname'), + 'hpa-attribute-value': '{{\"value\":\"{0}\"}}'.format(cloud_dpdk_info.get('libvalue')) + } + ] + capability['hpa-features-attributes'] = attributes + capabilities.append(capability) + return capabilities def _get_capability_attributes(self, cloud_info, attributes): |