diff options
| author |   zhang ab <zhanganbing@chinamobile.com> | 2018-03-19 01:33:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-19 01:33:36 +0000 |
| commit | 9f8bc90b5b302514a67d62ea99b68b9b21e8b7a8 (patch) | |
| tree | 659124854b46fa38c9643f91f60fffa47287a3d4 | |
| parent | acf103dbf3555d6b5f2302054d47fb755c33e2f5 (diff) | |
| parent | 36f39033644f0a12b959d516d4d5892f97a95fc3 (diff) | |
Merge "add cpu topology"
| -rw-r--r-- | ocata/ocata/registration/tests/test_registration.py | 10 | ||||
| -rw-r--r-- | ocata/ocata/registration/views/registration.py | 38 |
2 files changed, 38 insertions, 10 deletions
diff --git a/ocata/ocata/registration/tests/test_registration.py b/ocata/ocata/registration/tests/test_registration.py index e7d089b9..ac0a3cd9 100644 --- a/ocata/ocata/registration/tests/test_registration.py +++ b/ocata/ocata/registration/tests/test_registration.py @@ -45,12 +45,20 @@ MOCK_GET_FLAVOR_RESPONSE = { "properties": "hw:cpu_policy, hw:cpu_thread_policy" }, { - "id": "3", "name": "onap.cpu_pinning", "vcpus": 2, "ram": "2MB", + "id": "3", "name": "onap.cpu_pinning_prefer_dedicated", "vcpus": 2, "ram": "2MB", "disk": "2G", "OS-FLV-EXT-DATA:ephemeral": True, "swap": False, "os-flavor-access:is_public": True, "OS-FLV-DISABLED:disabled": True, "properties": "hw:cpu_policy, hw:cpu_thread_policy" }, + { + "id": "4", "name": "onap.cpu_topology_4_4_8", "vcpus": 2, "ram": "2MB", + "disk": "2G", "OS-FLV-EXT-DATA:ephemeral": True, + "swap": False, "os-flavor-access:is_public": True, + "OS-FLV-DISABLED:disabled": True, + "properties": "hw:cpu_sockets, hw:cpu_cores, hw:cpu_threads" + }, + ] } diff --git a/ocata/ocata/registration/views/registration.py b/ocata/ocata/registration/views/registration.py index 5d663fe1..f5e524e2 100644 --- a/ocata/ocata/registration/views/registration.py +++ b/ocata/ocata/registration/views/registration.py @@ -43,7 +43,7 @@ class Registry(newton_registration.Registry): for flavor in self._get_list_resources( "/flavors/detail", "compute", session, viminfo, vimid, "flavors"): - + flavor_info = { 'flavor-id': flavor['id'], 'flavor-name': flavor['name'], @@ -55,37 +55,57 @@ class Registry(newton_registration.Registry): 'flavor-is-public': flavor['os-flavor-access:is_public'], 'flavor-disabled': flavor['OS-FLV-DISABLED:disabled'], } - if flavor.get('link') and len(flavor['link']) > 0: flavor_info['flavor-selflink'] = flavor['link'][0]['href'] or 'http://0.0.0.0', else: flavor_info['flavor-selflink'] = 'http://0.0.0.0', - + # add hpa capabilities if (flavor['name'].find('onap.') == -1): continue - + properties = flavor['properties'].split(', ') if len(properties): flavor_info['flavor-properties'] = flavor['properties'] + uuid4 = uuid.uuid4() # add hpa capability cpu pinning if (flavor['name'].find('onap.cpu_pinning') != -1): - uuid1 = uuid.uuid4() - hpa_caps.append("{'hpaCapabilityID': '" + str(uuid1) + "', ") + hpa_caps.append("{'hpaCapabilityID': '" + str(uuid4) + "', ") hpa_caps.append("'hpaFeature': 'cpuPinning', ") hpa_caps.append("'hardwareArchitecture': 'generic', ") hpa_caps.append("'version': 'v1', ") hpa_caps.append("[") + values = flavor['name'].split('_') for p in range(len(properties)): if (properties[p] == "hw:cpu_policy") : hpa_caps.append("{'hpa-attribute-key':'logicalCpuThreadPinningPolicy', ") - hpa_caps.append("'hpa-attribute-value': {'value':'prefer'}}, ") + hpa_caps.append("'hpa-attribute-value': {'value':'" + str(values[1]) + "'}}, ") if (properties[p] == "hw:cpu_thread_policy") : hpa_caps.append("{'hpa-attribute-key':'logicalCpuPinningPolicy', ") - hpa_caps.append("'hpa-attribute-value': {'value':'dedicated'}}, ") + hpa_caps.append("'hpa-attribute-value': {'value':'" + str(values[2]) + "'}}, ") hpa_caps.append("]},") + elif (flavor['name'].find('onap.cpu_topology') != -1): + hpa_caps.append("{'hpaCapabilityID': '" + str(uuid4) + "', ") + hpa_caps.append("'hpaFeature': 'cpuTopology', ") + hpa_caps.append("'hardwareArchitecture': 'generic', ") + hpa_caps.append("'version': 'v1', ") + + hpa_caps.append("[") + values = flavor['name'].split('_') + for p in range(len(properties)): + if (properties[p] == "hw:cpu_sockets") : + hpa_caps.append("{'hpa-attribute-key':'numCpuSockets', ") + hpa_caps.append("'hpa-attribute-value': {'value':'" + str(values[1]) + "'}}, ") + if (properties[p] == "hw:cpu_cores") : + hpa_caps.append("{'hpa-attribute-key':'numCpuCores', ") + hpa_caps.append("'hpa-attribute-value': {'value':'" + str(values[2]) + "'}}, ") + if (properties[p] == "hw:cpu_threads") : + hpa_caps.append("{'hpa-attribute-key':'numCpuThreads', ") + hpa_caps.append("'hpa-attribute-value': {'value':'" + str(values[3]) + "'}}, ") + hpa_caps.append("]},") + else: self._logger.info("can not support this properties") else: @@ -94,7 +114,7 @@ class Registry(newton_registration.Registry): str_hpa_caps = '' flavor_info['hpa_capabilities'] = str_hpa_caps.join(hpa_caps) self._logger.debug("flavor_info: %s" % flavor_info) - + self._update_resoure( cloud_owner, cloud_region_id, flavor['id'], flavor_info, "flavor") |