X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;fp=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;h=034a70240c36b0665f0cc5ce7be4a7fb12aed2da;hp=f0d87b4853469540ac6ecf312407740bb639431e;hb=7a9e031926d2fa7ed5041485b3d41b0c1e85d2a9;hpb=23ff8f980f66ef57fb4d254336a018e3a697a187

diff --git a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
index f0d87b4..034a702 100644
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -1,3 +1,4 @@
+*** 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
@@ -10,6 +11,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
 Documentation   [K8s-08] Simple K8s Scale.
 
@@ -19,110 +21,115 @@ Library   Collections
 Library   Process
 Library   SSHLibrary
 
-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
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
+Resource   ../lib/vnfd_lib.resource
+Resource   ../lib/nsd_lib.resource
+Resource   ../lib/ns_lib.resource
+Resource   ../lib/ns_operation_lib.resource
+Resource   ../lib/ssh_lib.resource
+Resource   ../lib/k8scluster_lib.resource
+Resource   ../lib/juju_lib.resource
 
-Force Tags   k8s_08   cluster_k8s   regression   azure
+Test Tags   k8s_08   cluster_k8s   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/native_k8s_scale_charm_vnf
-${vnfd_name}   native_k8s_scale_charm-vnf
-${nsd_pkg}   charm-packages/native_k8s_scale_charm_ns
-${nsd_name}   native_k8s_scale_charm-ns
+${VNFD_PKG}   charm-packages/native_k8s_scale_charm_vnf
+${VNFD_NAME}   native_k8s_scale_charm-vnf
+${NSD_PKG}   charm-packages/native_k8s_scale_charm_ns
+${NSD_NAME}   native_k8s_scale_charm-ns
 
-${kdu_name}   native-kdu
-${application_name}   nginx
-${vnf_member_index}   native_k8s_scale_charm-vnf
-${instantiation_count}   2
+${KDU_NAME}   native-kdu
+${APPLICATION_NAME}   nginx
+${VNF_MEMBER_INDEX}   native_k8s_scale_charm-vnf
+${INSTANTIATION_COUNT}   2
 
 # NS instance name and configuration
-${ns_name}   native-k8s-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: { overlay: { applications: { ${application_name}: { scale: ${instantiation_count} } }}}}]}]}
-${ns_id}   ${EMPTY}
-${publickey}   %{HOME}/.ssh/id_rsa.pub
+${NS_NAME}   native-k8s-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: { overlay: { applications: { ${APPLICATION_NAME}: { scale: ${INSTANTIATION_COUNT} } }}}}]}]}
+${NS_ID}   ${EMPTY}
+${PUBLICKEY}   %{HOME}/.ssh/id_rsa.pub
 
 # Username and SSH private key for accessing OSM host
-${username}   ubuntu
-${password}   ${EMPTY}
-${privatekey}   %{OSM_RSA_FILE}
+${USERNAME}   ubuntu
+${PASSWORD}   ${EMPTY}
+${PRIVATEKEY}   %{OSM_RSA_FILE}
+
+${MODEL_NAME}   ${EMPTY}
+${ACTION_NAME}   changecontent
+${SCALING_GROUP}   scale-kdu
 
-${model_name}   ${EMPTY}
-${action_name}   changecontent
-${scaling_group}   scale-kdu
 
 *** Test Cases ***
 Create Simple K8s Scale VNF Descriptor
-    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    [Documentation]   Upload VNF package for the testsuite.
+    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
 
 Create Simple K8s Scale NS Descriptor
-    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    [Documentation]   Upload NS package for the testsuite.
+    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
 
 Network Service K8s Instance Test
-    ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
-    Set Suite Variable   ${ns_id}   ${id}
+    [Documentation]   Instantiate NS for the testsuite.
+    ${id}=   Create Network Service   ${NSD_NAME}   %{VIM_TARGET}   ${NS_NAME}   ${NS_CONFIG}   ${PUBLICKEY}
+    Set Suite Variable   ${NS_ID}   ${id}
 
 Get KDU Model Name
     [Documentation]   Get the model name of the network service k8s instance
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    ${name}=   Get Model Name   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${ns_id}   ${kdu_name}
-    Set Suite Variable   ${model_name}   ${name}
+    Variable Should Exist   ${NS_ID}   msg=Network service instance is not available
+    ${name}=   Get Model Name   %{OSM_HOSTNAME}   ${USERNAME}   ${PASSWORD}   ${PRIVATEKEY}   ${NS_ID}   ${KDU_NAME}
+    Set Suite Variable   ${MODEL_NAME}   ${name}
 
 Get Scale Count Before Scale Out
     [Documentation]   Get the scale count of the application of network service k8s instance
-
-    Variable Should Exist   ${model_name}   msg=Model name is not available
-    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Set Suite Variable   ${initial_kdu_count}   ${kdu_count}
-    Run Keyword If   ${initial_kdu_count} != ${instantiation_count}   Fail   msg=Instantiation parameters were not applied.
+    Variable Should Exist   ${MODEL_NAME}   msg=Model name is not available
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${USERNAME}   ${PASSWORD}   ${PRIVATEKEY}   ${APPLICATION_NAME}   ${MODEL_NAME}
+    Set Suite Variable   ${INITIAL_KDU_COUNT}   ${kdu_count}
+    IF   ${INITIAL_KDU_COUNT} != ${INSTANTIATION_COUNT}   Fail   msg=Instantiation parameters were not applied.
 
 Perform Manual KDU Scale Out
     [Documentation]   Scale out the application of network service k8s instance.
-
-    ${ns_op_id_2}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_OUT
+    ${ns_op_id_2}=   Execute Manual VNF Scale   ${NS_NAME}   ${VNF_MEMBER_INDEX}   ${SCALING_GROUP}   SCALE_OUT
+    Log   ${ns_op_id_2}
 
 Check Scale Count After Scale Out
     [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}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Run Keyword If   ${kdu_count} != ${initial_kdu_count} + 1   Fail   msg=There is no new KDU in the model after Scale Out
+    Variable Should Exist   ${INITIAL_KDU_COUNT}   msg=Initial KDU count is not available
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${USERNAME}   ${PASSWORD}   ${PRIVATEKEY}   ${APPLICATION_NAME}   ${MODEL_NAME}
+    IF   ${kdu_count} != ${INITIAL_KDU_COUNT} + 1   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.
-
-    ${ns_op_id_3}=   Execute Manual VNF Scale   ${ns_name}   ${vnf_member_index}   ${scaling_group}   SCALE_IN
+    ${ns_op_id_3}=   Execute Manual VNF Scale   ${NS_NAME}   ${VNF_MEMBER_INDEX}   ${SCALING_GROUP}   SCALE_IN
+    Log   ${ns_op_id_3}
 
 Check Scale Count After Scale In
     [Documentation]   Check whether the scale count is one less.
-
-    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
-    Run Keyword If   ${kdu_count} != ${initial_kdu_count}   Fail   msg=There is the same number of KDU in the model after Scale In
+    ${kdu_count}=   Get Scale Number   %{OSM_HOSTNAME}   ${USERNAME}   ${PASSWORD}   ${PRIVATEKEY}   ${APPLICATION_NAME}   ${MODEL_NAME}
+    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
+    [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 NF package from OSM.
     [Tags]   cleanup
-    Delete VNFD   ${vnfd_name}
+    Delete VNFD   ${VNFD_NAME}
 
 
 *** 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 NS   ${NS_NAME}
+    Run Keyword If Any Tests Failed   Delete NSD   ${NSD_NAME}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_NAME}