Remove usage of removed RPC add-entry

[integration/test.git] / csit / suites / sxp / basic / 020_Restconf_CRUD.robot

diff --git a/csit/suites/sxp/basic/020_Restconf_CRUD.robot b/csit/suites/sxp/basic/020_Restconf_CRUD.robot
index 00c5b1ad3e2feb29aca5c673d1f1f63c0a2b247d..af518e67b2ea52cb2cc13fd030bd39ba75a9b296 100644 (file)
--- a/csit/suites/sxp/basic/020_Restconf_CRUD.robot
+++ b/csit/suites/sxp/basic/020_Restconf_CRUD.robot
@@ -10,63 +10,56 @@ Resource          ../../../libraries/SxpLib.robot
 *** Variables ***
 
 *** Test Cases ***
-Test Add Binding
+Test Add Bindings
     [Documentation]    Test if bindings are added to Master DB
     [Tags]    Restconf CRUD    SXP
     ${resp}    Get Bindings
-    Add Binding    5230    1.1.1.1/32
-    ${resp}    Get Bindings
-    Should Contain Binding    ${resp}    5230    1.1.1.1/32
-    Add Binding    30    2001:0:0:0:0:0:0:0/128
-    ${resp}    Get Bindings
-    Should Contain Binding    ${resp}    30    2001:0:0:0:0:0:0:0/128
+    Add Bindings    5230    1.1.1.1/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    5230    1.1.1.1/32
+    Add Bindings    30    2001:0:0:0:0:0:0:0/128
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    30    2001:0:0:0:0:0:0:0/128
 
 Test Add Connection
     [Documentation]    Test if connections are added to Node
     [Tags]    Restconf CRUD    SXP
     Add Connection    version4    speaker    10.1.0.0    60000
-    ${resp}    Get Connections
-    Should Contain Connection    ${resp}    10.1.0.0    60000    speaker    version4
+    Wait Until Keyword Succeeds    3x    250ms    Connections Should Contain    10.1.0.0    60000    speaker
+    ...    version4
     Add Connection    version1    listener    105.12.0.50    64000
-    ${resp}    Get Connections
-    Should Contain Connection    ${resp}    105.12.0.50    64000    listener    version1
+    Wait Until Keyword Succeeds    3x    250ms    Connections Should Contain    105.12.0.50    64000    listener
+    ...    version1
 
 Test Delete Binding
     [Documentation]    Test if bindings are deleted from Master DB
     [Tags]    Restconf CRUD    SXP
-    Add Binding    52301    12.1.1.1/32
-    ${resp}    Get Bindings
-    Should Contain Binding    ${resp}    52301    12.1.1.1/32
-    Delete Binding    2631    12.1.1.1/32
-    ${resp}    Get Bindings
-    Should Contain Binding    ${resp}    52301    12.1.1.1/32
+    Add Bindings    52301    12.1.1.1/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    52301    12.1.1.1/32
+    Run Keyword And Expect Error    *    Delete Binding    2631    12.1.1.1/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    52301    12.1.1.1/32
     Delete Binding    52301    12.1.1.1/32
-    ${resp}    Get Bindings
-    Should Not Contain Binding    ${resp}    52301    12.1.1.1/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Not Contain    52301    12.1.1.1/32
 
 Test Delete Connection
     [Documentation]    Test if conncetions are removed from Node
     [Tags]    Restconf CRUD    SXP
     Add Connection    version4    speaker    127.1.0.30    60000
-    ${resp}    Get Connections
-    Should Contain Connection    ${resp}    127.1.0.30    60000    speaker    version4
-    Delete Connections    127.1.0.30    65000
-    ${resp}    Get Connections
-    Should Contain Connection    ${resp}    127.1.0.30    60000    speaker    version4
+    Wait Until Keyword Succeeds    3x    250ms    Connections Should Contain    127.1.0.30    60000    speaker
+    ...    version4
+    Run Keyword And Expect Error    *    Delete Connections    127.1.0.30    65000
+    Wait Until Keyword Succeeds    3x    250ms    Connections Should Contain    127.1.0.30    60000    speaker
+    ...    version4
     Delete Connections    127.1.0.30    60000
-    ${resp}    Get Connections
-    Should Not Contain Connection    ${resp}    127.1.0.30    60000    speaker    version4
+    Wait Until Keyword Succeeds    3x    250ms    Connections Should Not Contain    127.1.0.30    60000    speaker
+    ...    version4
 
 Test Update Binding
     [Documentation]    Test if bindings can be updated to different values
     [Tags]    Restconf CRUD    SXP
-    Add Binding    3230    1.1.1.10/32
-    ${resp}    Get Bindings
-    Should Contain Binding    ${resp}    3230    1.1.1.10/32
+    Add Bindings    3230    1.1.1.10/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    3230    1.1.1.10/32
     Update Binding    3230    1.1.1.10/32    623    10.10.10.10/32
-    ${resp}    Get Bindings
-    Should Not Contain Binding    ${resp}    3230    1.1.1.10/32
-    Should Contain Binding    ${resp}    623    10.10.10.10/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Not Contain    3230    1.1.1.10/32
+    Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    623    10.10.10.10/32
 
 *** Keywords ***
 Clean Node