X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;h=f0d87b4853469540ac6ecf312407740bb639431e;hb=58cc2072b52a59957be00f831eaaed7fcb96217c;hp=ea6b7e108527d482b73674cf3bf9c44a2bf65e03;hpb=10320257d87adb8e007bc7bb1a5f2c7cdd77417b;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 ea6b7e1..f0d87b4 100644
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -26,25 +26,26 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/juju_lib.robot
 
-Force Tags   k8s_08   cluster_k8s   daily   regression
+Force Tags   k8s_08   cluster_k8s   regression   azure
 
 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
 
+${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}} ] }
+${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
 
@@ -54,10 +55,7 @@ ${password}   ${EMPTY}
 ${privatekey}   %{OSM_RSA_FILE}
 
 ${model_name}   ${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 ***
@@ -67,9 +65,6 @@ Create Simple K8s Scale VNF Descriptor
 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}
-
 Network Service K8s Instance Test
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
     Set Suite Variable   ${ns_id}   ${id}
@@ -87,6 +82,7 @@ Get Scale Count Before Scale Out
     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.
 
 Perform Manual KDU Scale Out
     [Documentation]   Scale out the application of network service k8s instance.
@@ -115,10 +111,6 @@ Delete NS K8s Instance Test
     [Tags]   cleanup
     Delete NS   ${ns_name}
 
-Remove K8s Cluster from OSM
-    [Tags]   cleanup
-    Delete K8s Cluster   ${k8scluster_name}
-
 Delete NS Descriptor Test
     [Tags]   cleanup
     Delete NSD   ${nsd_name}
@@ -134,4 +126,3 @@ Suite Cleanup
     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}