X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fk8s_02-k8scluster_creation.robot;h=19837822c1bd9a541cab2bf7d8e7ca5ce1effec6;hb=8ceaee06848023c31ec4a18becff9ab8ff5d517f;hp=386b8adac17f6db74424c165d263765358163a82;hpb=79fcc85bc2682f83c2d18900662d13da747db5ca;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 386b8ad..1983782 100644
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -13,27 +13,59 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation   [K8s-02] K8s cluster addition.
+
 Library   OperatingSystem
 Library   String
 Library   Collections
 Library   Process
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vim_lib.robot
+
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_01-crud_operations_on_vim_targets_data.py
+
+Force Tags   k8s_02   cluster_k8s   daily   regression
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_02-k8scluster_creation_data.py
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+
+*** Variables ***
+# K8s cluster name and version
+${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}
+
 Add K8s Cluster To OSM
-    [Tags]   k8scluster   sanity   regression
-    Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
+
+    Create K8s Cluster   %{K8S_CREDENTIALS}   ${k8scluster_version}   ${vim_name}   %{VIM_MGMT_NET}   ${k8scluster_name}
 
 Remove K8s Cluster from OSM
-    [Tags]   k8scluster   sanity   regression
-    Delete K8s Cluster  ${k8scluster_name}
+    [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
+
+    ${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 ***
-Test Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting K8s Cluster
-    Run Keyword If Test Failed  Delete K8s Cluster  ${k8scluster_name}
+Suite Cleanup
+    [Documentation]   Test Suit Cleanup: Deleting K8s Cluster
+
+    Run Keyword If Any Tests Failed   Delete K8s Cluster   ${k8scluster_name}