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

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

diff --git a/robot-systest/lib/vim_lib.robot b/robot-systest/lib/vim_lib.robot
index 8fd7e51..c1eaf91 100644 (file)
--- a/robot-systest/lib/vim_lib.robot
+++ b/robot-systest/lib/vim_lib.robot
@@ -46,7 +46,7 @@ Create VIM Target
         ${osm_vim_create_command}=   Catenate   ${osm_vim_create_command}   --${param_name}=${param_value}
     END
     ${rc}   ${stdout}=   Run and Return RC and Output   ${osm_vim_create_command}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     [Return]   ${stdout}
 
@@ -55,13 +55,13 @@ Delete VIM Target
     [Arguments]   ${vim_name}
 
     ${rc}   ${stdout}=   Run Keyword And Continue On Failure   Run and Return RC and Output   osm vim-delete ${vim_name}
-    log   ${stdout}
+    Log   ${stdout}
     Wait Until Keyword Succeeds   ${delete_max_wait_time}   ${delete_pol_time}   Check for VIM Target   ${vim_name}
 
 
 Get VIM Targets
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vim-list
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
@@ -73,17 +73,17 @@ Check for VIM Target
 
 
 Check for VIM Target Metric
-    [Arguments]   ${vim_name}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${vim_name}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
     ${vim_account_id}=   Get VIM Target ID   ${vim_name}
-    Wait Until Keyword Succeeds   ${vim_status_max_wait_time}   ${vim_status_pol_time}   Check If VIM Target Has Metric   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}
+    Wait Until Keyword Succeeds   ${vim_status_max_wait_time}   ${vim_status_pol_time}   Check If VIM Target Has Metric   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
 
 Check for VIM Target Status
-    [Arguments]   ${vim_name}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${vim_name}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
     ${vim_account_id}=   Get VIM Target ID   ${vim_name}
-    Wait Until Keyword Succeeds   ${vim_status_max_wait_time}   ${vim_status_pol_time}   Check If VIM Target Is Available   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}
+    Wait Until Keyword Succeeds   ${vim_status_max_wait_time}   ${vim_status_pol_time}   Check If VIM Target Is Available   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
 
 Get VIM Target ID
@@ -110,14 +110,14 @@ Check If VIM Target Is Enabled
 
 
 Check If VIM Target Is Available
-    [Arguments]   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
-    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   osm_vim_status   vim_account_id=${vim_account_id}
+    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   osm_vim_status   vim_account_id=${vim_account_id}
     Should Be Equal As Integers   ${metric}   1   msg=VIM Target '${vim_account_id}' is not active   values=false
 
 
 Check If VIM Target Has Metric
-    [Arguments]   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}
+    [Arguments]   ${vim_account_id}   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}
 
-    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   osm_vim_status   vim_account_id=${vim_account_id}
+    ${metric}=   Get Metric   ${prometheus_host}   ${prometheus_port}   ${prometheus_user}   ${prometheus_password}   osm_vim_status   vim_account_id=${vim_account_id}
     Should Be True   ${metric} <2   msg=VIM Target '${vim_account_id}' has no metric