Fixes for bug 1496

[osm/tests.git] / robot-systest / lib / ns_lib.robot

diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot
index 148e381..8cb6098 100644 (file)
--- a/robot-systest/lib/ns_lib.robot
+++ b/robot-systest/lib/ns_lib.robot
@@ -10,21 +10,30 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+*** Settings ***
+Documentation     Library to deploy and delete NS, and run operations on them.
+
+Library   DateTime
+
+
 *** Variables ***
 ${success_return_code}   0
 ${ns_launch_pol_time}   30sec
-${ns_delete_max_wait_time}   4min
 ${ns_delete_pol_time}   15sec
 ${ns_action_max_wait_time}   1min
 ${ns_action_pol_time}   15sec
 ${vnf_scale_max_wait_time}   2min
 ${vnf_scale_pol_time}   15sec
+${vim_timeout_multiplier}   %{OSM_VIM_MULTIPLIER_TIMEOUT=1.0}
 
 
 *** Keywords ***
 Create Network Service
-    [Arguments]   ${nsd}   ${vim_name}   ${ns_name}   ${ns_config}   ${publickey}  ${ns_launch_max_wait_time}=5min  ${config_file}=${EMPTY}
+    [Arguments]   ${nsd}   ${vim_name}   ${ns_name}   ${ns_config}   ${publickey}   ${ns_launch_max_wait_time}=5min   ${config_file}=${EMPTY}
 
+    ${ns_launch_max_wait_time}=   Convert Time   ${ns_launch_max_wait_time}   result_format=number
+    ${ns_launch_max_wait_time}=   Evaluate   ${ns_launch_max_wait_time} * ${vim_timeout_multiplier}
+    Log   ${ns_launch_max_wait_time}
     ${config_attr}   Set Variable If   '${ns_config}'!='${EMPTY}'   --config '${ns_config}'   \
     ${sshkeys_attr}   Set Variable If   '${publickey}'!='${EMPTY}'   --ssh_keys ${publickey}   \
     ${config_file_attr}   Set Variable If   '${config_file}'!='${EMPTY}'   --config_file '${config_file}'   \
@@ -129,11 +138,14 @@ Check For NS Instance To Be Deleted
     Should Not Be Equal As Strings   ${stdout}   ${ns}
 
 Delete NS
-    [Documentation]  Delete ns
-    [Arguments]  ${ns}
+    [Documentation]   Delete ns
+    [Arguments]   ${ns}   ${ns_delete_max_wait_time}=4min
 
+    ${ns_delete_max_wait_time}=   Convert Time   ${ns_delete_max_wait_time}   result_format=number
+    ${ns_delete_max_wait_time}=   Evaluate   ${ns_delete_max_wait_time} * ${vim_timeout_multiplier}
+    Log   ${ns_delete_max_wait_time}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-delete ${ns}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
     WAIT UNTIL KEYWORD SUCCEEDS  ${ns_delete_max_wait_time}   ${ns_delete_pol_time}   Check For NS Instance To Be Deleted   ${ns}
@@ -220,7 +232,7 @@ Check For NS Operation Completed
 
     [Arguments]  ${ns_operation_id}
 
-    ${rc}  ${stdout}=  Run and Return RC and Output  osm ns-op-show ${ns_operation_id} --literal | yq r - operationState
+    ${rc}  ${stdout}=  Run and Return RC and Output  osm ns-op-show ${ns_operation_id} --literal | yq .operationState
     log  ${stdout}
     Should Be Equal As Integers  ${rc}  ${success_return_code}
     Should Contain  ${stdout}  COMPLETED  msg=Timeout waiting for ns-action with id ${ns_operation_id}  values=False
@@ -242,7 +254,7 @@ Get Vnf Vdur Names
 
     [Arguments]  ${vnf_id}
 
-    ${rc}  ${stdout}=  Run and Return RC and Output  osm vnf-show ${vnf_id} --literal | yq r - vdur.*.name
+    ${rc}  ${stdout}=  Run and Return RC and Output  osm vnf-show ${vnf_id} --literal | yq .vdur[].name
     Should Be Equal As Integers  ${rc}  ${success_return_code}  msg=${stdout}  values=False
     @{vdur} =  Split String  ${stdout}
     [Return]  @{vdur}
@@ -253,7 +265,7 @@ Get Vnf Kdu Replica Count
 
     [Arguments]   ${vnf_id}   ${kdu_name}
 
-    ${rc}  ${stdout}=  Run and Return RC and Output  osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq r - config.replicaCount
+    ${rc}  ${stdout}=  Run and Return RC and Output  osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount
     Should Be Equal As Integers  ${rc}  ${success_return_code}  msg=${stdout}  values=False
     [Return]  ${stdout}