X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_22-cross_model_relations.robot;h=cd38e7d492e3d6490a71f8e5b41d988b018f52de;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=c19f16df78ba1f3bd56a431264b87f36f74834b2;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/basic_22-cross_model_relations.robot b/robot-systest/testsuite/basic_22-cross_model_relations.robot index c19f16d..cd38e7d 100644 --- a/robot-systest/testsuite/basic_22-cross_model_relations.robot +++ b/robot-systest/testsuite/basic_22-cross_model_relations.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,103 +10,108 @@ # See the License for the specific language governing permissions and # limitations under the License. - *** Settings *** Documentation [BASIC-22] Cross-model relations Library OperatingSystem Library SSHLibrary -Resource ../lib/vnfd_lib.resource -Resource ../lib/nsd_lib.resource -Resource ../lib/ns_lib.resource -Resource ../lib/ssh_lib.resource -Resource ../lib/k8scluster_lib.resource +Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot +Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot -Test Tags basic_22 cluster_ee_config cluster_relations regression +Force Tags basic_22 cluster_ee_config cluster_relations regression Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** # K8s cluster name and version -${K8SCLUSTER_NAME} k8sbasic_22 -${K8SCLUSTER_VERSION} v1 +${k8scluster_name} k8sbasic_22 +${k8scluster_version} v1 # NS and VNF descriptor package folder and ids -${VNFD_PKG1} charm-packages/cmr_relation_vnf -${VNFD_PKG2} charm-packages/cmr_no_relation_vnf -${NSD_PKG} charm-packages/cmr_relation_ns -${VNFD_NAME1} cross_model_relation-vnf -${VNFD_NAME2} cross_model_no_relation-vnf -${NSD_NAME} cross_model_relation-ns +${vnfd_pkg_1} charm-packages/cmr_relation_vnf +${vnfd_pkg_2} charm-packages/cmr_no_relation_vnf +${nsd_pkg} charm-packages/cmr_relation_ns +${vnfd_name_1} cross_model_relation-vnf +${vnfd_name_2} cross_model_no_relation-vnf +${nsd_name} cross_model_relation-ns # NS instance name and configuration -${NS_NAME} basic_22 -${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } -${NS_TIMEOUT} 15min +${ns_name} basic_22 +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } +${ns_timeout} 15min # SSH keys and username to be used -${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub -${PRIVATEKEY} %{HOME}/.ssh/id_rsa -${USERNAME} ubuntu -${PASSWORD} ${EMPTY} +${publickey} %{HOME}/.ssh/id_rsa.pub +${privatekey} %{HOME}/.ssh/id_rsa +${username} ubuntu +${password} ${EMPTY} *** Test Cases *** Create Charm VNF Descriptor 1 - [Documentation] Upload first VNF package for the testsuite. - Create VNFD '%{PACKAGES_FOLDER}/${VNFD_PKG1}' + + Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg_1}' Create Charm VNF Descriptor 2 - [Documentation] Upload second VNF package for the testsuite. - Create VNFD '%{PACKAGES_FOLDER}/${VNFD_PKG2}' + + Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg_2}' Create Charm NS Descriptor - [Documentation] Upload NS package for the testsuite. - Create NSD '%{PACKAGES_FOLDER}/${NSD_PKG}' + + Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Add K8s Cluster To OSM - [Documentation] Register K8s cluster in OSM. - Create K8s Cluster %{K8S_CREDENTIALS} ${K8SCLUSTER_VERSION} %{VIM_TARGET} %{VIM_MGMT_NET} ${K8SCLUSTER_NAME} + Create K8s Cluster %{K8S_CREDENTIALS} ${k8scluster_version} %{VIM_TARGET} %{VIM_MGMT_NET} ${k8scluster_name} Instantiate Charm Network Service - [Documentation] Instantiate NS for the testsuite. - ${id}= Create Network Service ${NSD_NAME} %{VIM_TARGET} ${NS_NAME} ${NS_CONFIG} ${PUBLICKEY} ${NS_TIMEOUT} - Set Suite Variable ${NS_ID} ${id} -# TODO: Check juju status for relations + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} ${ns_timeout} + Set Suite Variable ${ns_id} ${id} + + +# TODO Check juju status for relations + Delete NS Instance - [Documentation] Delete NS instance. [Tags] cleanup - Delete NS ${NS_NAME} + + Delete NS ${ns_name} Remove K8s Cluster from OSM - [Documentation] Unregister K8s cluster from OSM. [Tags] cleanup - Delete K8s Cluster ${K8SCLUSTER_NAME} + Delete K8s Cluster ${k8scluster_name} Delete NS Descriptor - [Documentation] Delete NS package from OSM. [Tags] cleanup - Delete NSD ${NSD_NAME} + + Delete NSD ${nsd_name} + Delete VNF Descriptor 1 - [Documentation] Delete first VNF package from OSM. [Tags] cleanup - Delete VNFD ${VNFD_NAME1} + + Delete VNFD ${vnfd_name_1} Delete VNF Descriptor 2 - [Documentation] Delete second VNF package from OSM. [Tags] cleanup - Delete VNFD ${VNFD_NAME2} + + Delete VNFD ${vnfd_name_2} *** 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 1 ${VNFD_NAME1} - Run Keyword If Any Tests Failed Delete VNFD 2 ${VNFD_NAME2} + + 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 1 ${vnfd_name_1} + + Run Keyword If Any Tests Failed Delete VNFD 2 ${vnfd_name_2} +