X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=robot-systest%2Flib%2Fk8scluster_lib.robot;h=8f642a345efc2a87e31e8bdfbf6183f15b6a1138;hb=8ceaee06848023c31ec4a18becff9ab8ff5d517f;hp=429abda6438d4d580168d21559e9c0356d6e0e22;hpb=661ba4f167f7c68eeb87cb97ae254a0034a48dbb;p=osm%2Ftests.git diff --git a/robot-systest/lib/k8scluster_lib.robot b/robot-systest/lib/k8scluster_lib.robot index 429abda..8f642a3 100644 --- a/robot-systest/lib/k8scluster_lib.robot +++ b/robot-systest/lib/k8scluster_lib.robot @@ -23,29 +23,29 @@ ${k8scluster_delete_pol_time} 15sec Create K8s Cluster [Arguments] ${k8scluster_creds} ${k8scluster_version} ${k8scluster_vim} ${k8scluster_net} ${k8scluster_name} ${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} + 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} + Log ${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} @@ -55,7 +55,7 @@ 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,DEGRADED" - log ${stdout} + 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} @@ -63,9 +63,9 @@ 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} + Log ${stdout2} ${rc} ${stdout}= Run and Return RC and Output osm k8scluster-list --filter name="${k8scluster_name}" --filter _admin.operationalState="ENABLED" - log ${stdout} + 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}