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

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

diff --git a/robot-systest/lib/sdnc_lib.robot b/robot-systest/lib/sdnc_lib.robot
index 0b4508b..a897675 100644 (file)
--- a/robot-systest/lib/sdnc_lib.robot
+++ b/robot-systest/lib/sdnc_lib.robot
@@ -44,7 +44,7 @@ Create SDNC
         ${osm_sdnc_create_command}=   Catenate   ${osm_sdnc_create_command}   --${param_name}=${param_value}
     END
     ${rc}   ${stdout}=   Run and Return RC and Output   ${osm_sdnc_create_command}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -60,14 +60,14 @@ Delete SDNC
     [Arguments]   ${sdnc_name}
 
     ${rc}   ${stdout}=   Run Keyword And Continue On Failure   Run and Return RC and Output   osm sdnc-delete ${sdnc_name}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}   msg=${stdout}   values=False
     Wait Until Keyword Succeeds   ${delete_max_wait_time}   ${delete_pol_time}   Check for SDNC To Be Deleted   ${sdnc_name}
 
 
 Get SDNC List
     ${rc}   ${stdout}=   Run and Return RC and Output   osm sdnc-list
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
@@ -75,14 +75,14 @@ Check for SDNC
     [Arguments]   ${sdnc_id}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm sdnc-show ${sdnc_id} | grep -io ENABLED
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
 Check for SDNC Status
-    [Arguments]   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
-    Wait Until Keyword Succeeds   ${sdnc_status_max_wait_time}   ${sdnc_status_pol_time}   Check If SDNC Is Available   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}
+    Wait Until Keyword Succeeds   ${sdnc_status_max_wait_time}   ${sdnc_status_pol_time}   Check If SDNC Is Available   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
 
 Get SDNC ID
@@ -95,7 +95,7 @@ Get SDNC ID
 
 
 Check If SDNC Is Available
-    [Arguments]   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${sdnc_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
-    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   osm_sdnc_status   sdnc_id=${sdnc_id}
+    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   osm_sdnc_status   sdnc_id=${sdnc_id}
     Should Be Equal As Integers   ${metric}   1   msg=SDNC '${sdnc_id}' is not active   values=false