X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_11-simple_helm_k8s_scaling.robot;h=6731ec75b77b4315fab32589776e6390105131fe;hb=0d264a6a67af6ef72ad0c413df03bc01f71ee102;hp=e23f4ccdcb74135f8bb6449330db9051ccfc40ab;hpb=1a9cf4646bf405c737717a063950697955261179;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot index e23f4cc..6731ec7 100644 --- a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot +++ b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot @@ -11,7 +11,7 @@ # limitations under the License. *** Settings *** -Documentation [K8s-11] Simple Helm K8s Scale. +Documentation [K8s-11] Simple Helm K8s Scale. Library OperatingSystem Library String @@ -25,9 +25,8 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot Resource %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot -Resource %{ROBOT_DEVOPS_FOLDER}/lib/kubectl_lib.robot -Force Tags k8s_11 cluster_k8s daily regression +Force Tags k8s_11 cluster_k8s Suite Teardown Run Keyword And Ignore Error Suite Cleanup @@ -43,6 +42,10 @@ ${vnfd_name} openldap_scale_knf ${nsd_pkg} openldap_scale_ns ${nsd_name} openldap_scale_ns +# NS instance name and configuration +${ns_name} openldap-scale +${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } + # Username and SSH private key for accessing OSM host ${username} ubuntu ${password} ${EMPTY} @@ -51,14 +54,8 @@ ${privatekey} %{OSM_RSA_FILE} ${ns_id} ${EMPTY} ${publickey} %{HOME}/.ssh/id_rsa.pub ${vnf_member_index} openldap -${kdu_name} ldap +${kdu_name} native-kdu ${scaling_group} scale-kdu -${replica_count} 1 -${application_selector} app=openldap - -# NS instance name and configuration -${ns_name} openldap-scale -${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ {"member-vnf-index": "${vnf_member_index}", additionalParamsForKdu: [{kdu_name: "${kdu_name}", "additionalParams": {"replicaCount": "${replica_count}"}} ]} ]} *** Test Cases *** Create Simple K8s Scale VNF Descriptor @@ -68,55 +65,49 @@ Create Simple K8s Scale NS Descriptor Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Add K8s Cluster To 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} Create Network Service Instance ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} Set Suite Variable ${ns_id} ${id} Get Vnf Id - Variable Should Exist ${ns_id} msg=Network service instance is not available - ${id}= Get Vnf Id ${ns_id} ${vnf_member_index} - Set Suite Variable ${vnf_id} ${id} - -Get Vnf Namespace - Variable Should Exist ${vnf_id} msg=VNF instance is not available - ${namespace}= Get Vnf Namespace ${vnf_id} - Set Suite Variable ${vnf_namespace} ${namespace} + Variable Should Exist ${ns_id} msg=Network service instance is not available + @{vnfr_list}= Get Ns Vnfr Ids ${ns_id} + Log List ${vnfr_list} + Set Suite Variable ${vnf_id} ${vnfr_list}[0] Get Scale Count Before Scale Out - [Documentation] Get the scale count of the application of network service k8s instance + [Documentation] Get the scale count of the application of network service k8s instance - Variable Should Exist ${vnf_namespace} msg=Network service instance is not available - ${kdu_count}= Count Pod Number %{OSM_HOSTNAME} ${username} ${password} ${privatekey} ${vnf_namespace} ${application_selector} + Variable Should Exist ${ns_id} msg=Network service instance is not available + ${kdu_count}= Get Vnf Kdu Replica Count ${vnf_id} ${kdu_name} log ${kdu_count} - Set Suite Variable ${initial_kdu_count} ${kdu_count} + Set Suite Variable ${initial_kdu_count} ${kdu_count} Perform Manual KDU Scale Out - [Documentation] Scale out the application of network service k8s instance. + [Documentation] Scale out the application of network service k8s instance. - ${ns_op_id_1}= Execute Manual VNF Scale ${ns_name} ${vnf_member_index} ${scaling_group} SCALE_OUT - log ${ns_op_id_1} + ${ns_op_id_1}= Execute Manual VNF Scale ${ns_name} ${vnf_member_index} ${scaling_group} SCALE_OUT Check Scale Count After Scale Out - [Documentation] Check whether the scale count is more than one. + [Documentation] Check whether the scale count is more than one. - Variable Should Exist ${initial_kdu_count} msg=Initial KDU count is not available - ${kdu_count}= Count Pod Number %{OSM_HOSTNAME} ${username} ${password} ${privatekey} ${vnf_namespace} ${application_selector} + Variable Should Exist ${initial_kdu_count} msg=Initial KDU count is not available + ${kdu_count}= Get Vnf Kdu Replica Count ${vnf_id} ${kdu_name} log ${kdu_count} - Run Keyword Unless ${kdu_count} == ${initial_kdu_count} + 2 Fail msg=There is no new KDU in the model after Scale Out + Run Keyword If ${kdu_count} != ${initial_kdu_count} + 2 Fail msg=There is no new KDU in the model after Scale Out Perform Manual KDU Scale In - [Documentation] Scale in the application of network service k8s instance. + [Documentation] Scale in the application of network service k8s instance. - ${ns_op_id_2}= Execute Manual VNF Scale ${ns_name} ${vnf_member_index} ${scaling_group} SCALE_IN - log ${ns_op_id_2} + ${ns_op_id_2}= Execute Manual VNF Scale ${ns_name} ${vnf_member_index} ${scaling_group} SCALE_IN Check Scale Count After Scale In - [Documentation] Check whether the scale count is one less. + [Documentation] Check whether the scale count is one less. - ${kdu_count}= Count Pod Number %{OSM_HOSTNAME} ${username} ${password} ${privatekey} ${vnf_namespace} ${application_selector} - Run Keyword Unless ${kdu_count} == ${initial_kdu_count} Fail msg=There is the same number of KDU in the model after Scale In + ${kdu_count}= Get Vnf Kdu Replica Count ${vnf_id} ${kdu_name} + Run Keyword If ${kdu_count} != ${initial_kdu_count} Fail msg=There is the same number of KDU in the model after Scale In Delete NS K8s Instance Test [Tags] cleanup @@ -124,7 +115,7 @@ Delete NS K8s Instance Test Remove K8s Cluster from OSM [Tags] cleanup - Delete K8s Cluster ${k8scluster_name} + Delete K8s Cluster ${k8scluster_name} Delete NS Descriptor Test [Tags] cleanup @@ -137,8 +128,8 @@ Delete VNF Descriptor Test *** Keywords *** 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 K8s Cluster ${k8scluster_name} + [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 K8s Cluster ${k8scluster_name}