X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_04-openldap_helm.robot;h=5ce9ea3a7ceda5c2891d5d51db5b5d0df9dfbcdd;hb=b356eec6c46ac58228321f1ab6c307720e306a8c;hp=d5bac7693becf24833c26a7eea4c50686dbd73bd;hpb=4cf45d797499817b5f639bd6245c3f84e762de14;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 d5bac76..5ce9ea3 100644
--- a/robot-systest/testsuite/k8s_04-openldap_helm.robot
+++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot
@@ -25,59 +25,91 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_04-openldap_helm_data.py
-
 Force Tags   k8s_04   cluster_k8s   daily   regression   sanity
 
 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_name}   openldap_knf
+${nsd_pkg}   openldap_primitives_ns
+${nsd_name}   openldap_ns
+
+# NS instance name and configuration
+${ns_name}   ldap
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}}], additionalParamsForVnf: [ {member-vnf-index: openldap, additionalParamsForKdu: [ {kdu_name: ldap, additionalParams: {service: {type: LoadBalancer }, adminPassword: admin}} ] } ] }
+
 ${ns_id}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${publickey}   ${EMPTY}
 ${vnf_member_index}   openldap
 ${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
+    [Tags]  prepare
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 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}
+
+Get Ns Id
+    [Tags]   verify
+    ${id}=   Get Ns Id   ${ns_name}
     Set Suite Variable   ${ns_id}   ${id}
 
 Get Vnf Id
+    [Tags]   verify
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     @{vnfr_list}=  Get Ns Vnfr Ids  ${ns_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
     ${ns_op_id}=  Execute NS K8s Action   ${ns_name}   ${upgrade_action}   ${vnf_member_index}   ${kdu_name}   replicaCount=${replica_count}
 
 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}
     Should Be Equal As Integers   ${count}   ${replica_count}
 
 Execute Rollback Operation
+    [Tags]   verify
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     ${ns_op_id}=  Execute NS K8s Action   ${ns_name}   ${rollback_action}   ${vnf_member_index}   ${kdu_name}
 
 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}