X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_32-volume_with_different_az.robot;h=2b41c788744f165011f90b9a4b713344881e1bcd;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=6ea3e92066031d4eee4117f326aa5c261e4cc2a0;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/basic_32-volume_with_different_az.robot b/robot-systest/testsuite/basic_32-volume_with_different_az.robot index 6ea3e92..2b41c78 100644 --- a/robot-systest/testsuite/basic_32-volume_with_different_az.robot +++ b/robot-systest/testsuite/basic_32-volume_with_different_az.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 [BASIC-32] Basic NS with a volume in different availability zone @@ -21,32 +19,32 @@ Library Collections Library Process Library SSHLibrary -Resource ../lib/vim_lib.resource -Resource ../lib/prometheus_lib.resource -Resource ../lib/vnfd_lib.resource -Resource ../lib/nsd_lib.resource -Resource ../lib/ns_lib.resource +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot -Variables ../resources/basic_32-volume_with_different_az.py +Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_32-volume_with_different_az.py -Test Tags basic_32 +Force Tags basic_32 Suite Setup Run Keyword And Ignore Error Suite Preparation - *** Variables *** # NS and VNF descriptor package folder and ids -${VNFD_PKG} several_volumes_vnf -${VNFD_NAME} several_volumes-vnf -${NSD_PKG} several_volumes_ns -${NSD_NAME} several_volumes-ns +${vnfd_pkg} several_volumes_vnf +${vnfd_name} several_volumes-vnf +${nsd_pkg} several_volumes_ns +${nsd_name} several_volumes-ns # NS instance name and configuration -${NS_NAME} basic_32 -${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } +${ns_name} basic_32 +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } # SSH keys and username to be used -${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub +${publickey} %{HOME}/.ssh/id_rsa.pub +${privatekey} %{HOME}/.ssh/id_rsa *** Test Cases *** @@ -54,60 +52,64 @@ Create VIM Target Basic [Documentation] Create a VIM Target only with the az parameters. ... Checks the status of the VIM in Prometheus after it creation. - Pass Execution If '${VIM_ACCOUNT_TYPE}' != 'openstack' Not applicable for ${VIM_ACCOUNT_TYPE} VIM + Pass Execution If '${vim_account_type}' != 'openstack' Not applicable for ${vim_account_type} VIM ${rand}= Generate Random String 6 [NUMBERS] - ${VIM_NAME_AZ}= Catenate SEPARATOR=_ ${VIM_NAME_PREFIX} ${rand} - Set Suite Variable ${VIM_NAME_AZ} - ${CREATED_VIM_ACCOUNT_ID}= Create VIM Target ${VIM_NAME_AZ} ${VIM_USER} ${VIM_PASSWORD} ${VIM_AUTH_URL} ${VIM_TENANT} ${VIM_ACCOUNT_TYPE} config=${VIM_CONFIG} - Set Suite Variable ${CREATED_VIM_ACCOUNT_ID} + ${vim_name_az}= Catenate SEPARATOR=_ ${vim_name_prefix} ${rand} + Set Suite Variable ${vim_name_az} + ${created_vim_account_id}= Create VIM Target ${vim_name_az} ${vim_user} ${vim_password} ${vim_auth_url} ${vim_tenant} ${vim_account_type} config=${vim_config} + Set Suite Variable ${created_vim_account_id} + Create VNF Descriptor - [Documentation] Upload VNF package for the testsuite. - 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}' + Network Service Instance Test - [Documentation] Instantiate NS for the testsuite. [Tags] prepare - ${id}= Create Network Service ${NSD_NAME} ${VIM_NAME_AZ} ${NS_NAME} ${NS_CONFIG} ${PUBLICKEY} - Set Suite Variable ${NS_ID} ${id} + ${id}= Create Network Service ${nsd_name} ${vim_name_az} ${ns_name} ${ns_config} ${publickey} + Set Suite Variable ${ns_id} ${id} + Delete NS Instance Test - [Documentation] Delete NS instance. [Tags] cleanup - Delete NS ${NS_NAME} + + Delete NS ${ns_name} + Delete NS Descriptor Test - [Documentation] Delete NS package from OSM. [Tags] cleanup - Delete NSD ${NSD_NAME} + + Delete NSD ${nsd_name} + Delete VNF Descriptor Test - [Documentation] Delete VNF package from OSM. [Tags] cleanup - Delete VNFD ${VNFD_NAME} + Delete VNFD ${vnfd_name} + Delete VIM Target By ID [Documentation] Delete the VIM Target created in previous test-case by its ID. ... Checks whether the VIM Target was created or not before perform the deletion. [Tags] cleanup - ${vim_account_id}= Get VIM Target ID ${VIM_NAME_AZ} - Should Be Equal As Strings ${vim_account_id} ${CREATED_VIM_ACCOUNT_ID} + ${vim_account_id}= Get VIM Target ID ${vim_name_az} + Should Be Equal As Strings ${vim_account_id} ${created_vim_account_id} Delete VIM Target ${vim_account_id} *** Keywords *** -Suite Preparation - [Documentation] Test Suite Preparation: Setting Prometheus Testsuite Variables - Set Testsuite Prometheus Variables - Suite Cleanup [Documentation] Test Suit Cleanup: Deleting Descriptor, instance and vim - 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} \ No newline at end of file