X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fk8scluster_lib.robot;h=54b4225a9eb99f445cc754407522edec5d882035;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=5dd43acae05297e3363928bbd187b110376b8653;hpb=c8b46fadf755d559f4715ed7666eee789040e39a;p=osm%2Ftests.git diff --git a/robot-systest/lib/k8scluster_lib.robot b/robot-systest/lib/k8scluster_lib.robot index 5dd43ac..54b4225 100644 --- a/robot-systest/lib/k8scluster_lib.robot +++ b/robot-systest/lib/k8scluster_lib.robot @@ -25,27 +25,27 @@ Create K8s Cluster ${rc} ${stdout}= Run and Return RC and Output osm k8scluster-add --creds ${k8scluster_creds} --version ${k8scluster_version} --vim ${k8scluster_vim} --k8s-nets '{"net1": "${k8scluster_net}"}' ${k8scluster_name} --description "Robot 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} + 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 [Arguments] ${k8scluster_name} ${rc} ${stdout}= Run and Return RC and Output osm k8scluster-delete ${k8scluster_name} Should Be Equal As Integers ${rc} ${success_return_code} - WAIT UNTIL KEYWORD SUCCEEDS ${k8scluster_delete_max_wait_time} ${k8scluster_delete_pol_time} Check For K8s Cluster To Be Deleted ${k8scluster_name} + WAIT UNTIL KEYWORD SUCCEEDS ${k8scluster_delete_max_wait_time} ${k8scluster_delete_pol_time} Check For K8s Cluster To Be Deleted ${k8scluster_name} Get K8s Cluster ${rc} ${stdout}= Run and Return RC and Output osm k8scluster-list Should Be Equal As Integers ${rc} ${success_return_code} log ${stdout} - [Return] ${stdout} + [Return] ${stdout} Check for K8s Cluster [Arguments] ${k8scluster_name} ${rc} ${stdout}= Run and Return RC and Output osm k8scluster-list --filter name="${k8scluster_name}" Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Check For K8s Cluster To Be Deleted [Arguments] ${k8scluster_name} @@ -62,6 +62,8 @@ Check For K8s Cluster To Be Ready 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}