From 5534ba84270dbc8154fa34bd9a3d81620b6a1277 Mon Sep 17 00:00:00 2001 From: Yun Huang Date: Mon, 26 Mar 2018 15:45:03 +0800 Subject: UT data for HPA cpu instruction set capabilities Change-Id: I0fb115409978f8d48849af5062a293b252e83006 Issue-ID: MULTICLOUD-200 Signed-off-by: Yun Huang --- windriver/titanium_cloud/registration/tests/test_registration.py | 5 +++-- windriver/titanium_cloud/registration/views/registration.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'windriver') diff --git a/windriver/titanium_cloud/registration/tests/test_registration.py b/windriver/titanium_cloud/registration/tests/test_registration.py index bf192444..8ef4b4b8 100644 --- a/windriver/titanium_cloud/registration/tests/test_registration.py +++ b/windriver/titanium_cloud/registration/tests/test_registration.py @@ -59,8 +59,9 @@ MOCK_GET_FLAVOR_EXTRA_SPECS_RESPONSE = { "hw:numa_cpus.0" : "0,1", "hw:numa_cpus.1" : "2,3,4,5", "hw:numa_mem.0" : "2048", - "hw:numa_mem.1" : "2048" - + "hw:numa_mem.1" : "2048", + "hw:capabilities:cpu_info:features":"avx,acpi" + } } diff --git a/windriver/titanium_cloud/registration/views/registration.py b/windriver/titanium_cloud/registration/views/registration.py index a7103056..4db8e987 100644 --- a/windriver/titanium_cloud/registration/views/registration.py +++ b/windriver/titanium_cloud/registration/views/registration.py @@ -119,7 +119,7 @@ class Registry(newton_registration.Registry): hpa_caps.append(caps_dict) # CPU instruction set extension capabilities - caps_dict = self._get_instruction_set_capabilities(flavor) + caps_dict = self._get_instruction_set_capabilities(extra_specs) if len(caps_dict) > 0: self._logger.debug("instruction_set_capabilities_info: %s" % caps_dict) hpa_caps.append(caps_dict) -- cgit 1.2.3-korg