${nsd_name} volumes_nativecharm-ns
# NS instance name and configuration
-${flavor_name} osm.heal_02
+${flavor_name_prefix} osm.heal02
${ns_name} heal_02
-${scale_wait_time} 4min
+${ns_timeout} 6min
+${scale_wait_time} 5min
# SSH keys and username to be used
${publickey} %{HOME}/.ssh/id_rsa.pub
Create Test Flavor
- ${id}= Create Flavor ${flavor_name}
+ ${rand}= Generate Random String 6 [NUMBERS]
+ ${flavor_name}= Catenate SEPARATOR=_ ${flavor_name_prefix} ${rand}
+ ${id}= Create Flavor ${flavor_name} 1 1024 10
Set Suite Variable ${flavor_id} ${id}
Network Service Instance Test
${ns_config}= Set Variable {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}}],vnf: [ {member-vnf-index: charm_vnf, vdu: [{ id: mgmtVM, vim-flavor-id: ${flavor_id}}]}] }
- ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey}
+ ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} ${ns_timeout}
Set Suite Variable ${ns_id} ${id}
${stdout}= Execute Remote Command Check Rc Return Output ${ip} ${username} ${password} ${privatekey} sudo ls ${vnf_charm_cloudinit_file}
Log ${stdout}
Check If remote File Exists ${ip} ${username} ${password} ${privatekey} ${vnf_charm_day1_file}
- ${vim_info}= Get Vdu Attribute ${vnf_charm_id} vim_info
- Should Contain ${vim_info} flavor: {id: ${flavor_id}, msg=Flavor ID is incorrect
+ ${vim_info}= Get Vdu Attribute ${vnf_charm_id} vim_info 1
+ Should Contain ${vim_info} id: ${flavor_id} msg=Flavor ID is incorrect
Update VIM Objects
Delete Objects in VIM
[Tags] cleanup
+ Delete Flavor ${flavor_id}
${error}= Set Variable 0
FOR ${vol_id} IN @{vim_volumes}
Log Checking if volume ${vol_id} is still in VIM
END
-Delete flavor
- Delete Flavor ${flavor_id}
-
-
*** Keywords ***
Suite Cleanup
[Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim
Run Keyword If Any Tests Failed Delete VNFD ${vnfd_volumes_name}
Run Keyword If Any Tests Failed Delete VNFD ${vnfd_charm_name}
Run Keyword If Any Tests Failed Delete Objects in VIM
- Run Keyword If Any Tests Failed Delete Flavor ${flavor_id}
\ No newline at end of file