Fix bugs in test [epa-03], ignored environment variable OVERRIDES in test [epa-02...

[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 f1744b0..13cb6dc 100644 (file)
--- 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,19 @@ 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}
+    Wait Until Keyword Succeeds  ${delete_max_wait_time}  ${delete_pol_time}  Check for SDNC To Be Deleted  ${sdnc_name}
 
 
 Get SDNC List