Check for a flavor with hugepages

Flavor is not checked by name but by huge_pages extra option.
It is created when no flavor has huge_pages setting.

Change-Id: I1266a6e58047c24456b12f16fc3061082916558c
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
Signed-off-by: juraj.linkes <jlinkes@cisco.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/testing/robot/lib/Keywords.robot b/testing/robot/lib/Keywords.robot
index 36136a1..d9d9cb1 100644
--- a/testing/robot/lib/Keywords.robot
+++ b/testing/robot/lib/Keywords.robot
@@ -15,16 +15,20 @@ Variables       ../data/test_data.py
 *** Keywords ***
 
 Ensure Flavor
-    ${result} =     Check Flavor Exists     ${vm_flavor}
-    Return From Keyword If  '${result}' == 'True'
+    ${result} =     Check Flavor Exists
+    Log    ${result}
+    Set Suite Variable  ${flavor_to_use}    ${result}
+    Return From Keyword If  '${result}' is not '${None}'
     Create Flavor  ${vm_flavor}  ram=768
-    ${result} =     Check Flavor Exists     ${vm_flavor}
-    Should be True      ${result}
+    ${result} =     Check Flavor Exists
+    Log    ${result}
+    Set Suite Variable  ${flavor_to_use}    ${result}
+    Should Not Be Empty    ${result}
 
 Ensure Image
     ${result} =     Check Image Exists  ${vm_image}
     Return From Keyword If  '${result}' == 'True'
-    Create Image  ${vm_image}  /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
+    Create Image  ${vm_image}  ${image_path}
     ${result} =     Check Image Exists  ${vm_image}
     Should be True      ${result}
 
@@ -75,9 +79,9 @@ Create port with ip
     [Return]    ${response.port['id']}
 
 Create vm
-    [Arguments]     ${vm_name}     ${port_ids}  ${security_groups}=${None}  ${userdata}=${None}
-    Log Many    ${vm_name}  ${vm_image}     ${vm_flavor}    ${port_ids}     ${userdata}
-    ${response} =   create server   ${vm_name}     ${vm_image}     ${vm_flavor}    ${port_ids}  ${security_groups}
+    [Arguments]     ${vm_name}     ${port_ids}    ${flavor}=${flavor_to_use}    ${security_groups}=${None}  ${userdata}=${None}
+    Log Many    ${vm_name}  ${vm_image}     ${flavor}    ${port_ids}     ${userdata}
+    ${response} =   create server   ${vm_name}     ${vm_image}     ${flavor}    ${port_ids}  ${security_groups}
     ...                             ${userdata}
     log many    ${response}
     log         ${response.id}