X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;fp=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;h=86b0e978e8aba396f1b2b9e084be59b85b374798;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hp=d278e6307e50c690f1ef58defebf5a26415616b0;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/epa_02-additional_capabilities.robot b/robot-systest/testsuite/epa_02-additional_capabilities.robot index d278e63..86b0e97 100644 --- a/robot-systest/testsuite/epa_02-additional_capabilities.robot +++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot @@ -1,4 +1,3 @@ -*** Comments *** # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -11,7 +10,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - *** Settings *** Documentation [EPA-02] Support for additional EPA capabilities. @@ -20,94 +18,106 @@ Library String Library Collections Library SSHLibrary -Resource ../lib/vnfd_lib.resource -Resource ../lib/vnf_lib.resource -Resource ../lib/nsd_lib.resource -Resource ../lib/ns_lib.resource -Resource ../lib/openstack_lib.resource +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnf_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot -Test Tags epa_02 cluster_epa daily regression +Force Tags epa_02 cluster_epa daily regression Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** # NS and VNF descriptor package folder and ids -${VNFD_PKG} epa_quota_vnf -${VNFD_NAME} epa_quota-vnf -${NSD_PKG} epa_quota_ns -${NSD_NAME} epa_quota-ns +${vnfd_pkg} epa_quota_vnf +${vnfd_name} epa_quota-vnf +${nsd_pkg} epa_quota_ns +${nsd_name} epa_quota-ns # NS instance name and configuration -${NS_NAME} epa_02-epa_quota_test -${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } +${ns_name} epa_02-epa_quota_test +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } # SSH public keys file -${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub +${publickey} %{HOME}/.ssh/id_rsa.pub -${NS_ID} ${EMPTY} -${VNF_SERVER_ID} ${EMPTY} -${FLAVOR_PROPERTIES} ${EMPTY} -${SUCCESS_RETURN_CODE} 0 +${ns_id} ${EMPTY} +${vnf_server_id} ${EMPTY} +${flavor_properties} ${EMPTY} +${success_return_code} 0 *** Test Cases *** Create VNF Descriptor - [Documentation] Upload VNF package for the testsuite. + Remove Environment Variable OVERRIDES - Create VNFD '%{PACKAGES_FOLDER}/${VNFD_PKG}' + Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' + Create NS Descriptor - [Documentation] Upload NS package for the testsuite. - Create NSD '%{PACKAGES_FOLDER}/${NSD_PKG}' + + Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' + Instantiate Network Service - [Documentation] Instantiate the NS for the testsuite. - ${id}= Create Network Service ${NSD_NAME} %{VIM_TARGET} ${NS_NAME} ${NS_CONFIG} ${PUBLICKEY} - Set Suite Variable ${NS_ID} ${id} + + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} + Set Suite Variable ${ns_id} ${id} + Get VNF Server ID - [Documentation] Get the id of the VM at the VIM and store in VNF_SERVER_ID suite variable to be used later on. - ${vnfs_list}= Get Ns Vnf List ${NS_ID} + + ${vnfs_list}= Get Ns Vnf List ${ns_id} ${vim_id}= Get VNF VIM ID ${vnfs_list}[0] Log ${vim_id} - Set Suite Variable ${VNF_SERVER_ID} ${vim_id} + Set Suite Variable ${vnf_server_id} ${vim_id} + Get Server Flavor Properties - [Documentation] Get from the VIM the flavor properties of the VM with id VNF_SERVER_ID. - ${flavor_id}= Get Server Flavor ID ${VNF_SERVER_ID} + + ${flavor_id}= Get Server Flavor ID ${vnf_server_id} ${properties}= Get Flavor Properties ${flavor_id} Log ${properties} - Set Suite Variable ${FLAVOR_PROPERTIES} ${properties} + Set Suite Variable ${flavor_properties} ${properties} + Check Flavor Quota Properties - [Documentation] Assert that the flavor properties include the expected EPA parameters included in the descriptor. - ${rc}= Run And Return Rc echo ${FLAVOR_PROPERTIES} | grep "cpu_shares_level=custom" - Should Be Equal As Integers ${rc} ${SUCCESS_RETURN_CODE} - ${rc}= Run And Return Rc echo ${FLAVOR_PROPERTIES} | grep "disk_io_shares_level=custom" - Should Be Equal As Integers ${rc} ${SUCCESS_RETURN_CODE} - ${rc}= Run And Return Rc echo ${FLAVOR_PROPERTIES} | grep "memory_shares_level=custom" - Should Be Equal As Integers ${rc} ${SUCCESS_RETURN_CODE} + + ${rc}= Run and Return RC echo ${flavor_properties} | grep "cpu_shares_level=custom" + Should Be Equal As Integers ${rc} ${success_return_code} + ${rc}= Run and Return RC echo ${flavor_properties} | grep "disk_io_shares_level=custom" + Should Be Equal As Integers ${rc} ${success_return_code} + ${rc}= Run and Return RC echo ${flavor_properties} | grep "memory_shares_level=custom" + Should Be Equal As Integers ${rc} ${success_return_code} + Delete NS Instance - [Documentation] Delete NS instance. [Tags] cleanup - Delete NS ${NS_NAME} + + Delete NS ${ns_name} + Delete NS Descriptor - [Documentation] Delete NS package from OSM. [Tags] cleanup - Delete NSD ${NSD_NAME} + + Delete NSD ${nsd_name} + Delete VNF Descriptor - [Documentation] Delete VNF package from OSM. [Tags] cleanup - Delete VNFD ${VNFD_NAME} + + Delete VNFD ${vnfd_name} *** Keywords *** Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance - Run Keyword If Any Tests Failed Delete NS ${NS_NAME} - Run Keyword If Any Tests Failed Delete NSD ${NSD_NAME} - Run Keyword If Any Tests Failed Delete VNFD ${VNFD_NAME} + + Run Keyword If Any Tests Failed Delete NS ${ns_name} + + Run Keyword If Any Tests Failed Delete NSD ${nsd_name} + + Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name} +