X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fsdnc_lib.robot;h=6c16b43ea6f712c3c625e31e6e09483038b74d69;hb=c94328245f72787c9354f782097ebb87487e7bee;hp=f1744b0f20fd1a62cb0074cbc856d53c25f20e60;hpb=6403533bdacfc641c6a23810e6f9e8f912cd3831;p=osm%2Ftests.git

diff --git a/robot-systest/lib/sdnc_lib.robot b/robot-systest/lib/sdnc_lib.robot
index f1744b0..6c16b43 100644
--- a/robot-systest/lib/sdnc_lib.robot
+++ b/robot-systest/lib/sdnc_lib.robot
@@ -36,7 +36,7 @@ Create SDNC
     ...                 Example of execution:
     ...                     \${sdnc_id}=  Create SDNC  \${sdnc_name}  \${sdnc_user}  \${sdnc_password}  \${sdnc_url}  \${sdnc_type}  switch_dpid='{...}'
 
-    [Arguments]  ${sdcn_name}  ${sdnc_user}  ${sdnc_password}  ${sdnc_url}  ${sdnc_type}  @{optional_parameters}
+    [Arguments]  ${sdnc_name}  ${sdnc_user}  ${sdnc_password}  ${sdnc_url}  ${sdnc_type}  @{optional_parameters}
 
     ${osm_sdnc_create_command}=  Set Variable  osm sdnc-create --name ${sdnc_name} --user ${sdnc_user} --password ${sdnc_password} --url ${sdnc_url} --type ${sdnc_type}
     FOR  ${param}  IN  @{optional_parameters}
@@ -49,12 +49,20 @@ Create SDNC
     [Return]  ${stdout}
 
 
+Check for SDNC To Be Deleted
+    [Arguments]  ${sdnc_name}
+
+    ${rc}  ${stdout}=  Run and Return RC and Output  osm sdnc-list | awk '{print $2}' | grep ${sdnc_name}
+    Should Not Be Equal As Strings   ${stdout}   ${sdnc_name}
+
+
 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}
-    Wait Until Keyword Succeeds  ${delete_max_wait_time}  ${delete_pol_time}  Check for SDNC  ${sdnc_name}
+    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
@@ -64,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}
 
 
@@ -90,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