X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_02-k8scluster_creation.robot;h=3e4c7417c79aa9fb0fbb7676dbbe02bc094c47c2;hb=HEAD;hp=b27ce70c20fef1d7779c3a1f3aec06defff36499;hpb=d6a44ef1dbf18a2112af57c70d5e6294bea2c7fe;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 b27ce70..3e4c741 100644
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -1,3 +1,4 @@
+*** Comments ***
 # Copyright 2020 Canonical Ltd.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,38 +13,62 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+
 *** Settings ***
-Documentation     [K8s-02] K8s cluster addition.
+Documentation   [K8s-02] K8s cluster addition.
 
 Library   OperatingSystem
 Library   String
 Library   Collections
 Library   Process
 
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
+Resource   ../lib/k8scluster_lib.resource
+Resource   ../lib/vim_lib.resource
+
+Variables   ../resources/basic_01-crud_operations_on_vim_targets_data.py
 
-Force Tags   k8s_02   cluster_k8s   daily   regression
+Test 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 ***
-Add K8s Cluster To OSM
+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}
 
-    Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
+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}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Remove K8s Cluster from OSM
+    [Documentation]   Delete K8s cluster.
+    [Tags]   cleanup
+    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
 
-    Delete K8s Cluster  ${k8scluster_name}
+    ${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}
+
 
 *** Keywords ***
 Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting K8s Cluster
+    [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}