X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;h=e8d23158fdb2970911530eb42f925a22935d0eb9;hb=refs%2Fchanges%2F80%2F11180%2F2;hp=9b7f0f27de258d30bdcc47d284d2561b3038a0d9;hpb=f47542be165ebd69b91945041697181b4df63954;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
index 9b7f0f2..e8d2315 100644
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -17,32 +17,48 @@ Library   OperatingSystem
 Library   String
 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/package_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/juju_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_08-simple_k8s_scaling_data.py
-
-Force Tags   k8s_08   cluster_k8s   daily   regression   sanity
+Force Tags   k8s_08   cluster_k8s   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# K8s cluster name and version
+${k8scluster_name}   k8s08
+${k8scluster_version}   v1
+
+# 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
+
+# NS instance name and configuration
+${ns_name}   native-k8s-scale
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${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}
+
 ${model_name}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${publickey}   ${EMPTY}
 ${vnf_member_index}   native_k8s_scale_charm-vnf
 ${action_name}   changecontent
 ${kdu_name}   native-kdu
 ${application_name}   nginx
+${scaling_group}   scale-kdu
 
 *** Test Cases ***
 Create Simple K8s Scale VNF Descriptor
@@ -62,14 +78,14 @@ 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   ${ns_id}   ${kdu_name}
+    ${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   ${application_name}   ${model_name}
+    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
     Set Suite Variable  ${initial_kdu_count}  ${kdu_count}
 
 Perform Manual KDU Scale Out
@@ -81,7 +97,7 @@ 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   ${application_name}   ${model_name}
+    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
     Run Keyword Unless  ${kdu_count} == ${initial_kdu_count} + 1  Fail  msg=There is no new KDU in the model after Scale Out
 
 Perform Manual KDU Scale In
@@ -92,7 +108,7 @@ Perform Manual KDU Scale In
 Check Scale Count After Scale In
     [Documentation]     Check whether the scale count is one less.
 
-    ${kdu_count}=  Get Scale Number   ${application_name}   ${model_name}
+    ${kdu_count}=  Get Scale Number   %{OSM_HOSTNAME}   ${username}   ${password}   ${privatekey}   ${application_name}   ${model_name}
     Run Keyword Unless  ${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
@@ -111,11 +127,6 @@ Delete VNF Descriptor Test
     [Tags]   cleanup
     Delete VNFD   ${vnfd_name}
 
-Delete VNF NS Packages
-    [Tags]   cleanup
-    Delete Package   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
-    Delete Package   '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
 
 *** Keywords ***
 Suite Cleanup