X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_04-openldap_helm.robot;h=214bbc6839fb0ee9831d086fbfb176d67d791ad3;hb=c1dc4d643a6995d58ccbbacf9ed24abfae80da3e;hp=96a1caa68c2699630715452922083b319d891b32;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_04-openldap_helm.robot b/robot-systest/testsuite/k8s_04-openldap_helm.robot
index 96a1caa..214bbc6 100644
--- a/robot-systest/testsuite/k8s_04-openldap_helm.robot
+++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot
@@ -31,14 +31,10 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# K8s cluster name and version
-${k8scluster_name}   k8s04
-${k8scluster_version}   v1
-
 # NS and VNF descriptor package folder and ids
-${vnfd_pkg}   openldap_primitives_knf
+${vnfd_pkg}   openldap_knf
 ${vnfd_name}   openldap_knf
-${nsd_pkg}   openldap_primitives_ns
+${nsd_pkg}   openldap_ns
 ${nsd_name}   openldap_ns
 
 # NS instance name and configuration
@@ -52,9 +48,6 @@ ${kdu_name}   ldap
 ${upgrade_action}   upgrade
 ${rollback_action}   rollback
 ${replica_count}   3
-${action_name}   get-user-info
-${action_param_cn}   admin
-${action_param_dc}   example.org
 
 *** Test Cases ***
 Create Package For OpenLDAP CNF
@@ -65,10 +58,6 @@ Create Package For OpenLDAP NS
     [Tags]   prepare
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
-Add K8s Cluster To OSM
-    [Tags]   prepare
-    Create K8s Cluster   %{K8S_CREDENTIALS}   ${k8scluster_version}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${k8scluster_name}
-
 Create Network Service Instance
     [Tags]   prepare
     ${id}=   Create Network Service   ${nsd_name}   %{VIM_TARGET}   ${ns_name}   ${ns_config}   ${publickey}
@@ -85,12 +74,6 @@ Get Vnf Id
     Log List   ${vnfr_list}
     Set Suite Variable   ${vnf_id}   ${vnfr_list}[0]
 
-Execute Day 2 Operations
-    [Documentation]   Performs one Day 2 operation.
-
-    Variable Should Exist   ${ns_id}   msg=Network service instance is not available
-    ${ns_op_id}=   Execute NS K8s Action   ${ns_name}   ${action_name}   ${vnf_member_index}   ${kdu_name}   cn=${action_param_cn}   dc=${action_param_dc}
-
 Execute Upgrade Operation
     [Tags]   verify
     Variable Should Exist   ${ns_id}   msg=Network service instance is not available
@@ -100,7 +83,7 @@ Check Replicas After Upgrade Operation
     [Tags]   verify
     Variable Should Exist   ${ns_id}   msg=Network service instance is not available
     ${count}=   Get Vnf Kdu Replica Count   ${vnf_id}   ${kdu_name}
-    log   ${count}
+    Log   ${count}
     Should Be Equal As Integers   ${count}   ${replica_count}
 
 Execute Rollback Operation
@@ -112,17 +95,13 @@ Check Replicas After Rollback Operation
     [Tags]   verify
     Variable Should Exist   ${ns_id}   msg=Network service instance is not available
     ${count}=   Get Vnf Kdu Replica Count   ${vnf_id}   ${kdu_name}
-    log   ${count}
+    Log   ${count}
     Should Be Empty   ${count}
 
 Delete Network Service Instance
     [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}
@@ -138,4 +117,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}