summaryrefslogtreecommitdiffstats
path: root/testing/robot/lib/Keywords.robot
diff options
context:
space:
mode:
authorTomas Cechvala <tcechval@cisco.com>2017-03-13 15:18:39 +0100
committerJuraj LinkeŇ° <jlinkes@cisco.com>2017-03-28 09:06:49 +0000
commit069e5ac29e445ca4141033009bd870a74860472a (patch)
tree277749bb97dfd905163ca22486e83baf62068bee /testing/robot/lib/Keywords.robot
parente98d863ae414a55b1d306f66f0b54aa659a2c9ae (diff)
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> (cherry picked from commit a717a49967f77ede476da582b6d3bb2c6359da1b)
Diffstat (limited to 'testing/robot/lib/Keywords.robot')
-rw-r--r--testing/robot/lib/Keywords.robot20
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}