Update k8s tests to check cluster creation inside testsuite

This change moves the check of the cluster creation to the testsuite.
In that way, the test can change depending on whether the juju controller
exists or doesn't exist.

Change-Id: I072c27061745ca8d8766d0dc1ded71a252cceef2
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/robot-systest/lib/k8scluster_lib.resource b/robot-systest/lib/k8scluster_lib.resource
index 0895da7..dc94046 100644 (file)
--- a/robot-systest/lib/k8scluster_lib.resource
+++ b/robot-systest/lib/k8scluster_lib.resource
@@ -35,7 +35,6 @@ Create K8s Cluster
     Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
     Wait Until Keyword Succeeds   ${K8SCLUSTER_LAUNCH_MAX_WAIT_TIME}   ${K8SCLUSTER_LAUNCH_POL_TIME}   Check For K8s Cluster To Be Ready   ${k8scluster_name}
-    Check For K8s Cluster To Be Enabled   ${k8scluster_name}
     RETURN   ${stdout}
 
 Delete K8s Cluster

diff --git a/robot-systest/testsuite/basic_22-cross_model_relations.robot b/robot-systest/testsuite/basic_22-cross_model_relations.robot
index c19f16d..625278d 100644 (file)
--- a/robot-systest/testsuite/basic_22-cross_model_relations.robot
+++ b/robot-systest/testsuite/basic_22-cross_model_relations.robot
@@ -70,6 +70,7 @@ Create Charm NS Descriptor
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Enabled   ${K8SCLUSTER_NAME}
 
 Instantiate Charm Network Service
     [Documentation]   Instantiate NS for the testsuite.

diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index cb86e37..3e4c741 100644 (file)
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -50,6 +50,7 @@ Create VIM Target Basic
 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.

diff --git a/robot-systest/testsuite/k8s_07-dummy_helm.robot b/robot-systest/testsuite/k8s_07-dummy_helm.robot
index 59c73ba..3716896 100644 (file)
--- a/robot-systest/testsuite/k8s_07-dummy_helm.robot
+++ b/robot-systest/testsuite/k8s_07-dummy_helm.robot
@@ -78,6 +78,7 @@ Create Dummy VIM
 Add K8s Cluster To OSM
     [Documentation]   Register a K8s cluster associated to the dummy VIM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   ${VIM_NAME}   ${K8SCLUSTER_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.

diff --git a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
index 14cda79..f818a04 100644 (file)
--- a/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
+++ b/robot-systest/testsuite/k8s_11-simple_helm_k8s_scaling.robot
@@ -73,6 +73,7 @@ Create Simple K8s Scale NS Descriptor
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Ready   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.

diff --git a/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
index fdf2f25..7bdb39c 100644 (file)
--- a/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
+++ b/robot-systest/testsuite/k8s_12-openldap_helm_day-2.robot
@@ -72,6 +72,7 @@ Create Package For OpenLDAP NS
 Add K8s Cluster To OSM
     [Documentation]   Register K8s cluster in OSM.
     Create K8s Cluster   %{K8S_CREDENTIALS}   ${K8SCLUSTER_VERSION}   %{VIM_TARGET}   %{VIM_MGMT_NET}   ${K8SCLUSTER_NAME}
+    Check For K8s Cluster To Be Enabled   ${K8SCLUSTER_NAME}
 
 Create Network Service Instance
     [Documentation]   Instantiate NS for the testsuite.