From: Yun Huang <yun.huang@windriver.com>
Date: Fri, 20 Apr 2018 06:17:09 +0000 (+0800)
Subject: Fix HPA memorypagesize unit issue for ocata
X-Git-Tag: v1.1.2~73
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F43855%2F1;p=multicloud%2Fopenstack.git

Fix HPA memorypagesize unit issue for ocata

Change-Id: I5f5d50720b0e4e81cbe22c77499c00a862d639ad
Issue-ID: MULTICLOUD-206
Signed-off-by: Yun Huang <yun.huang@windriver.com>
---

diff --git a/ocata/ocata/registration/views/registration.py b/ocata/ocata/registration/views/registration.py
index 25ec0dbf..4dd87675 100644
--- a/ocata/ocata/registration/views/registration.py
+++ b/ocata/ocata/registration/views/registration.py
@@ -211,8 +211,21 @@ class Registry(newton_registration.Registry):
             hugepages_capability['version'] = 'v1'
 
             hugepages_capability['attributes'] = []
-            hugepages_capability['attributes'].append({'hpa-attribute-key': 'memoryPageSize',
-                                                       'hpa-attribute-value':{'value': str(extra_specs['hw:mem_page_size'])}})
+            if extra_specs['hw:mem_page_size'] == 'large':
+                hugepages_capability['attributes'].append({'hpa-attribute-key': 'memoryPageSize',
+                                                           'hpa-attribute-value':{'value': '2',
+                                                                                   'unit': 'MB'}})
+            elif extra_specs['hw:mem_page_size'] == 'small':
+                hugepages_capability['attributes'].append({'hpa-attribute-key': 'memoryPageSize',
+                                                           'hpa-attribute-value':{'value': '4',
+                                                                                   'unit': 'KB'}})
+            elif extra_specs['hw:mem_page_size'] == 'any':
+                self._logger.info("Currently HPA feature memoryPageSize did not support 'any' page!!")
+            else :
+                hugepages_capability['attributes'].append({'hpa-attribute-key': 'memoryPageSize',
+                                                           'hpa-attribute-value':{'value': str(extra_specs['hw:mem_page_size']),
+                                                                                   'unit': 'KB'}})
+
         return hugepages_capability
 
     def _get_numa_capabilities(self, extra_specs):