Fix bug 1536: incorrect check SDNC status in EPA03

[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 13cb6dc..6c16b43 100644 (file)
--- a/robot-systest/lib/sdnc_lib.robot
+++ b/robot-systest/lib/sdnc_lib.robot
@@ -61,6 +61,7 @@ Delete SDNC
 
     ${rc}  ${stdout}=  Run Keyword And Continue On Failure  Run and Return RC and Output  osm sdnc-delete ${sdnc_name}
     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}
 
 
@@ -71,16 +72,16 @@ Get SDNC List
 
 
 Check for SDNC
-    [Arguments]  ${sdnc_name}
+    [Arguments]  ${sdnc_id}
 
-    ${rc}  ${stdout}=  Run and Return RC and Output  osm sdnc-list | awk '{print $2}' | grep ${sdnc_name}
-    Should Be Equal As Strings  ${stdout}  ${sdnc_name}
+    ${rc}  ${stdout}=  Run and Return RC and Output  osm sdnc-show ${sdnc_id} | grep -io ENABLED
+    log  ${stdout}
+    Should Be Equal As Integers  ${rc}  ${success_return_code}
 
 
 Check for SDNC Status
-    [Arguments]  ${sdnc_name}  ${prometheus_host}  ${prometheus_port}
+    [Arguments]  ${sdnc_id}  ${prometheus_host}  ${prometheus_port}
 
-    ${sdnc_id}=  Get SDNC ID  ${sdnc_name}
     Wait Until Keyword Succeeds  ${sdnc_status_max_wait_time}  ${sdnc_status_pol_time}  Check If SDNC Is Available  ${sdnc_id}  ${prometheus_host}  ${prometheus_port}
 
 
@@ -97,4 +98,4 @@ Check If SDNC Is Available
     [Arguments]  ${sdnc_id}  ${prometheus_host}  ${prometheus_port}
 
     ${metric}=  Get Metric  ${prometheus_host}  ${prometheus_port}  osm_sdnc_status  sdnc_id=${sdnc_id}
-    Should Be Equal As Integers  ${metric}  0  msg=SDNC '${sdnc_id}' is not active  values=false
+    Should Be Equal As Integers  ${metric}  1  msg=SDNC '${sdnc_id}' is not active  values=false