Merge remote-tracking branch 'origin/master' into paas

[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 d65f93c..e67636c 100644 (file)
--- a/robot-systest/lib/ns_lib.robot
+++ b/robot-systest/lib/ns_lib.robot
@@ -39,7 +39,7 @@ Create Network Service
     ${config_file_attr}   Set Variable If   '${config_file}'!='${EMPTY}'   --config_file '${config_file}'   \
 
     ${ns_id}=   Instantiate Network Service   ${ns_name}   ${nsd}   ${vim_name}   ${config_attr} ${sshkeys_attr} ${config_file_attr}
-    log   ${ns_id}
+    Log   ${ns_id}
 
     WAIT UNTIL KEYWORD SUCCEEDS   ${ns_launch_max_wait_time}   ${ns_launch_pol_time}   Check For NS Instance To Configured   ${ns_name}
     Check For NS Instance For Failure   ${ns_name}
@@ -50,7 +50,7 @@ Instantiate Network Service
     [Arguments]   ${ns_name}   ${nsd}   ${vim_name}   ${ns_extra_args}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-create --ns_name ${ns_name} --nsd_name ${nsd} --vim_account ${vim_name} ${ns_extra_args}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -59,7 +59,7 @@ Update Network Service
     [Arguments]   ${ns_id}   ${update_type}   ${ns_update_config}   ${ns_update_timeout}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-update ${ns_id} --updatetype ${update_type} --config ${ns_update_config} --timeout ${ns_update_timeout} --wait
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -70,7 +70,7 @@ Get Vnf Management Ip Address
     Should Not Be Empty   ${ns_id}
     Should Not Be Empty   ${vnf_member_index}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnf-list --filter member-vnf-index-ref=${vnf_member_index} | grep ${ns_id} | awk '{print $14}' 2>&1
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -81,7 +81,7 @@ Get Vnf Id
     Should Not Be Empty   ${ns_id}
     Should Not Be Empty   ${vnf_member_index}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnf-list --filter member-vnf-index-ref=${vnf_member_index} | grep ${ns_id} | awk '{print $2}' 2>&1
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -91,7 +91,7 @@ Get Ns Id
 
     Should Not Be Empty   ${ns_name}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-list | grep ${ns_name} | awk '{print $4}' 2>&1
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Not Be Empty   ${stdout}
     [Return]   ${stdout}
@@ -114,7 +114,7 @@ Get Ns Ip List
     should not be empty   @{vnf_list}
     @{temp_list}=   Create List
     FOR   ${vnf_id}   IN   @{vnf_list}
-        log   ${vnf_id}
+        Log   ${vnf_id}
         @{vnf_ip_list}   Get Vnf Ip List   ${vnf_id}
         @{temp_list}=   Combine Lists   ${temp_list}   ${vnf_ip_list}
     END
@@ -130,7 +130,7 @@ Get Vnf Ip List
     # returns a string of ip addresses and needs to be converted into a list
     should not be empty   ${vnf_ip_list_string}[1]
     @{vnf_ip_list} =   split string   ${vnf_ip_list_string}[1]
-    log list   ${vnf_ip_list}
+    Log Many   ${vnf_ip_list}
     should not be empty   ${vnf_ip_list}
     [return]   @{vnf_ip_list}
 
@@ -139,9 +139,9 @@ Check For Ns Instance To Configured
     [arguments]   ${ns_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server list
-    log   ${stdout}
+    Log   ${stdout}
     ${rc}   ${stdout}=   run and return rc and output   osm ns-list --filter name="${ns_name}"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Contain Any   ${stdout}   READY   BROKEN
 
@@ -149,9 +149,9 @@ Check For NS Instance For Failure
     [Arguments]   ${ns_name}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server list
-    log   ${stdout}
+    Log   ${stdout}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-list --filter name="${ns_name}"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Not Contain   ${stdout}   BROKEN
 
@@ -159,7 +159,7 @@ Check For NS Instance To Be Deleted
     [Arguments]   ${ns}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   openstack server list
-    log   ${stdout}
+    Log   ${stdout}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-list | awk '{print $2}' | grep ${ns}
     Should Not Be Equal As Strings   ${stdout}   ${ns}
 
@@ -271,8 +271,8 @@ Get Operations List
 
     Should Not Be Empty   ${ns_name}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-list ${ns_name}
-    log   ${stdout}
-    log   ${rc}
+    Log   ${stdout}
+    Log   ${rc}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
@@ -283,7 +283,7 @@ Check For NS Operation Completed
 
     Should Not Be Empty   ${ns_operation_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \\"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Contain   ${stdout}   COMPLETED   msg=The ns-action with id ${ns_operation_id} was not completed   values=False
 
@@ -295,7 +295,7 @@ Check For NS Operation Failed
 
     Should Not Be Empty   ${ns_operation_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \\"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Contain   ${stdout}   FAILED   msg=Timeout waiting for ns-action with id ${ns_operation_id}   values=False
 
@@ -307,7 +307,7 @@ Check For NS Operation Ended
 
     Should Not Be Empty   ${ns_operation_id}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \\"
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Contain Any   ${stdout}   FAILED   COMPLETED   msg=Timeout waiting for ns-action with id ${ns_operation_id}   values=False
 
@@ -367,10 +367,10 @@ Get VDU Affinity Group Name
     [Arguments]   ${ns_name}   ${vnf_id}   ${vdur_id}
 
     ${rc}   ${affinity_group_id}=   Run and Return RC and Output   osm vnf-show ${vnf_id} --literal | yq '.vdur[] | select(.id == "'${vdur_id}'")' | yq '."affinity-or-anti-affinity-group-id"[0]' | tr -d \\" 2>&1
-    log   ${affinity_group_id}
+    Log   ${affinity_group_id}
     Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${affinity_group_id}   values=False
     ${rc}   ${affinity_group_name}=   Run and Return RC and Output   osm ns-show ${ns_name} --literal | yq '."affinity-or-anti-affinity-group"[] | select(.id == "'${affinity_group_id}'")' | yq '.name' | tr -d \\" 2>&1
-    log   ${affinity_group_name}
+    Log   ${affinity_group_name}
     Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${affinity_group_name}   values=False
     [Return]   ${affinity_group_name}
 
@@ -382,7 +382,7 @@ Get Operations By Type
     Should Not Be Empty   ${ns_id}
     Should Not Be Empty   ${type}
     ${rc}   ${stdout}=   Run and Return RC and Output   osm ns-op-list ${ns_id} | grep ${type} | awk '{print $2}' 2>&1
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     Should Not Be Empty   ${stdout}
     [Return]   ${stdout}