X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_02-k8scluster_creation.robot;h=b3b9c86e212a05c722a9209fc037dea2e2e4ef59;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=cb86e3775ad9b8b429bf60af7402a6724fd85846;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index cb86e37..b3b9c86 100644
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -1,4 +1,3 @@
-*** Comments ***
 # Copyright 2020 Canonical Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 *** Settings ***
 Documentation   [K8s-02] K8s cluster addition.
 
@@ -22,47 +20,47 @@ Library   String
 Library   Collections
 Library   Process
 
-Resource   ../lib/k8scluster_lib.resource
-Resource   ../lib/vim_lib.resource
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
 
-Variables   ../resources/basic_01-crud_operations_on_vim_targets_data.py
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_01-crud_operations_on_vim_targets_data.py
 
-Test Tags   k8s_02   cluster_k8s   daily   regression   azure
+Force Tags   k8s_02   cluster_k8s   daily   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # K8s cluster name and version
-${K8SCLUSTER_NAME}   k8s02
-${K8SCLUSTER_VERSION}   v1
-
+${k8scluster_name}   k8s02
+${k8scluster_version}   v1
 
 *** Test Cases ***
 Create VIM Target Basic
     [Documentation]   Creates a VIM for the K8s cluster to be anchored against
+
     ${rand}=   Generate Random String   6   [NUMBERS]
-    ${VIM_NAME}=   Catenate   SEPARATOR=_   ${vim_name_prefix}   ${rand}
-    Set Suite Variable   ${VIM_NAME}
-    ${CREATED_VIM_ACCOUNT_ID}=   Create VIM Target   ${VIM_NAME}   ${VIM_USER}   ${VIM_PASSWORD}   ${VIM_AUTH_URL}   ${VIM_TENANT}   ${VIM_ACCOUNT_TYPE}
-    Set Suite Variable   ${CREATED_VIM_ACCOUNT_ID}
+    ${vim_name}=   Catenate   SEPARATOR=_   ${vim_name_prefix}   ${rand}
+    Set Suite Variable   ${vim_name}
+    ${created_vim_account_id}=   Create VIM Target   ${vim_name}   ${vim_user}   ${vim_password}   ${vim_auth_url}   ${vim_tenant}   ${vim_account_type}
+    Set Suite Variable   ${created_vim_account_id}
 
 Add K8s Cluster To OSM
-    [Documentation]   Creates a VIM for the K8s cluster to be anchored against
-    Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   ${VIM_NAME}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+
+    Create K8s Cluster   %{K8S_CREDENTIALS}   ${k8scluster_version}   ${vim_name}   %{VIM_MGMT_NET}   ${k8scluster_name}
 
 Remove K8s Cluster from OSM
-    [Documentation]   Delete K8s cluster.
     [Tags]   cleanup
-    Delete K8s Cluster   ${K8SCLUSTER_NAME}
+
+    Delete K8s Cluster   ${k8scluster_name}
 
 Delete VIM Target By ID
     [Documentation]   Delete the VIM Target created in previous test-case by its ID.
     ...               Checks whether the VIM Target was created or not before perform the deletion.
     [Tags]   cleanup
 
-    ${vim_account_id}=   Get VIM Target ID   ${VIM_NAME}
-    Should Be Equal As Strings   ${vim_account_id}   ${CREATED_VIM_ACCOUNT_ID}
+    ${vim_account_id}=   Get VIM Target ID   ${vim_name}
+    Should Be Equal As Strings   ${vim_account_id}   ${created_vim_account_id}
     Delete VIM Target   ${vim_account_id}
 
 
@@ -70,4 +68,4 @@ Delete VIM Target By ID
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting K8s Cluster
 
-    Run Keyword If Any Tests Failed   Delete K8s Cluster   ${K8SCLUSTER_NAME}
+    Run Keyword If Any Tests Failed   Delete K8s Cluster   ${k8scluster_name}