X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fk8scluster_lib.robot;h=429abda6438d4d580168d21559e9c0356d6e0e22;hb=a821f85ee46c4a5edd60e05deb43be2d1d764049;hp=b663d5236637f5d706439bddb657c0b6f3d0dd59;hpb=a07c2b3216f2cee90802e2cddc4eb06a7eae372c;p=osm%2Ftests.git

diff --git a/robot-systest/lib/k8scluster_lib.robot b/robot-systest/lib/k8scluster_lib.robot
index b663d52..429abda 100644
--- a/robot-systest/lib/k8scluster_lib.robot
+++ b/robot-systest/lib/k8scluster_lib.robot
@@ -14,7 +14,7 @@
 
 *** Variables ***
 ${success_return_code}   0
-${k8scluster_launch_max_wait_time}   5min
+${k8scluster_launch_max_wait_time}   6min
 ${k8scluster_launch_pol_time}   30sec
 ${k8scluster_delete_max_wait_time}   2min
 ${k8scluster_delete_pol_time}   15sec
@@ -26,6 +26,7 @@ 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
@@ -53,6 +54,18 @@ Check For K8s Cluster To Be Deleted
 
 Check For K8s Cluster To Be Ready
     [Arguments]   ${k8scluster_name}
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm k8scluster-list --filter name="${k8scluster_name}" --filter _admin.operationalState="ENABLED" | awk '{print $2}' | grep ${k8scluster_name}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm k8scluster-list --filter name="${k8scluster_name}" --filter _admin.operationalState="ENABLED,DEGRADED"
+    log   ${stdout}
+    ${rc}   ${stdout}=   Run and Return RC and Output   echo "${stdout}" | awk '{print $2}' | grep ${k8scluster_name}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    Should Be Equal As Strings   ${stdout}   ${k8scluster_name}
+
+Check For K8s Cluster To Be Enabled
+    [Arguments]   ${k8scluster_name}
+    ${rc2}   ${stdout2}=   Run and Return RC and Output   osm k8scluster-show ${k8scluster_name}
+    log   ${stdout2}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm k8scluster-list --filter name="${k8scluster_name}" --filter _admin.operationalState="ENABLED"
+    log   ${stdout}
+    ${rc}   ${stdout}=   Run and Return RC and Output   echo "${stdout}" | awk '{print $2}' | grep ${k8scluster_name}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Be Equal As Strings   ${stdout}   ${k8scluster_name}