X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_08-simple_k8s_scaling.robot;h=bfc4c2e0e2cbd1ec916b5deefaf2fb04bc013668;hb=refs%2Fchanges%2F25%2F12825%2F1;hp=a172dacf0505eb9dd7625cac9c1b380f5e4d5a8c;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;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 a172dac..bfc4c2e 100644
--- a/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_08-simple_k8s_scaling.robot
@@ -32,10 +32,6 @@ 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
@@ -67,9 +63,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}
@@ -98,7 +91,7 @@ Check Scale Count 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}
-    Run Keyword Unless   ${kdu_count} == ${initial_kdu_count} + 1   Fail   msg=There is no new KDU in the model after Scale Out
+    Run Keyword 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.
@@ -109,16 +102,12 @@ 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 Unless   ${kdu_count} == ${initial_kdu_count}   Fail   msg=There is the same number of KDU in the model after Scale In
+    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
     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 +123,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}