From 521287f1f9d4be8f1903aeaef973eb644a8cddad Mon Sep 17 00:00:00 2001 From: Huang Haibin Date: Wed, 21 Mar 2018 17:31:45 +0800 Subject: Update pci passthrough of HPA to AAI unit test Change-Id: Ic88bbad22f01d9d9d63013f5ec0814425a36bd6d Issue-ID: MULTICLOUD-194 Signed-off-by: Huang Haibin --- ocata/ocata/registration/tests/test_registration.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ocata/ocata/registration/tests/test_registration.py b/ocata/ocata/registration/tests/test_registration.py index 8c8597e4..7ab7e306 100644 --- a/ocata/ocata/registration/tests/test_registration.py +++ b/ocata/ocata/registration/tests/test_registration.py @@ -45,18 +45,18 @@ MOCK_GET_FLAVOR_RESPONSE = { "properties": "hw:cpu_policy, hw:cpu_thread_policy" }, { - "id": "3", "name": "onap.cpu_pinning_prefer_dedicated", "vcpus": 2, "ram": "2MB", + "id": "3", "name": "onap.cpu_pinning", "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" + "properties": "hw:cpu_policy=dedicated, hw:cpu_thread_policy=prefer" }, { - "id": "4", "name": "onap.cpu_topology_4_4_8", "vcpus": 2, "ram": "2MB", + "id": "4", "name": "onap.cpu_topology", "vcpus": 128, "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" + "properties": "hw:cpu_sockets=4, hw:cpu_cores=4, hw:cpu_threads=8" }, { "id": "5", "name": "onap.base_capabilities", "vcpus": 2, "ram": "2MB", @@ -91,6 +91,13 @@ MOCK_GET_FLAVOR_RESPONSE = { "OS-FLV-DISABLED:disabled": True, "properties": "hw:capabilities:cpu_info:features=aes" }, + { + "id": "10", "name": "onap.pci_passthrough", "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": "pci_passthrough:alias=sriov-pf-intel-8086-10fb:1" + }, ] } -- cgit 1.2.3-korg