Changed cluster name in some k8s tests

[osm/tests.git] / robot-systest / testsuite / k8s_02-k8scluster_creation.robot

diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index 386b8ad..b27ce70 100644 (file)
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -13,6 +13,8 @@
 #   limitations under the License.
 
 *** Settings ***
+Documentation     [K8s-02] K8s cluster addition.
+
 Library   OperatingSystem
 Library   String
 Library   Collections
@@ -20,20 +22,28 @@ Library   Process
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_02-k8scluster_creation_data.py
+Force Tags   k8s_02   cluster_k8s   daily   regression
+
+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 ***
 Add K8s Cluster To OSM
-    [Tags]   k8scluster   sanity   regression
+
     Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
 
 Remove K8s Cluster from OSM
-    [Tags]   k8scluster   sanity   regression
+    [Tags]   cleanup
+
     Delete K8s Cluster  ${k8scluster_name}
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting K8s Cluster
-    Run Keyword If Test Failed  Delete K8s Cluster  ${k8scluster_name}
+
+    Run Keyword If Any Tests Failed  Delete K8s Cluster  ${k8scluster_name}