Replace Bierman02 with RFC8040 for OpenFlow Plugin

[integration/test.git] / csit / suites / l2switch / Address_Tracking_OF13 / 010__restconf_inv_addresses.robot

diff --git a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot
index 6347371de5f4ba997e9c32156d2f7ec46567ef7a..d3c9edd019c07c924bbd9cc62cacc7853400cf8e 100644 (file)
--- a/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot
+++ b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot
@@ -4,6 +4,7 @@ Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCON
 Suite Teardown    Delete All Sessions
 Library           RequestsLibrary
 Resource          ../../../libraries/Utils.robot
+Resource          ../../../variables/openflowplugin/Variables.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
@@ -14,20 +15,20 @@ ${IP_3}           "10.0.0.3"
 *** Test Cases ***
 Check Stats for node 1
     [Documentation]    Get the stats for a node
-    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow:1
+    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow%3A1
 
 Check Stats for node 2
     [Documentation]    Get the stats for a node
-    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow:2
+    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow%3A2
 
 Check Stats for node 3
     [Documentation]    Get the stats for a node
-    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow:3
+    Wait Until Keyword Succeeds    10s    2s    Check Nodes Stats    openflow%3A3
 
 Check No Host Is Present
     [Documentation]    Get the invnetory, should not contain any host address
     @{list}    Create List    ${IP_1}    ${IP_2}    ${IP_3}
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}    ${list}
+    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${RFC8040_OPERATIONAL_NODES_API}    ${list}
 
 Ping All
     [Documentation]    Pingall, verify no packet loss
@@ -36,20 +37,20 @@ Ping All
 Check node 1 addresses
     [Documentation]    Get the address observations for node 1
     @{list}    Create List    ${IP_2}    ${IP_3}
-    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:1    ${IP_1}    1
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}/node/openflow:1    ${list}
+    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${RFC8040_NODES_API}/node=openflow%3A1?content=nonconfig    ${IP_1}    1
+    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${RFC8040_NODES_API}/node=openflow%3A1?content=nonconfig    ${list}
 
 Check node 2 addresses
     [Documentation]    Get the address observations for node 2
     @{list}    Create List    ${IP_1}    ${IP_3}
-    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:2    ${IP_2}    1
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}/node/openflow:2    ${list}
+    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${RFC8040_NODES_API}/node=openflow%3A2?content=nonconfig    ${IP_2}    1
+    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${RFC8040_NODES_API}/node=openflow%3A2?content=nonconfig    ${list}
 
 Check node 3 addresses
     [Documentation]    Get the address observations for node 3
     @{list}    Create List    ${IP_1}    ${IP_2}
-    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}/node/openflow:3    ${IP_3}    1
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}/node/openflow:3    ${list}
+    Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${RFC8040_NODES_API}/node=openflow%3A3?content=nonconfig    ${IP_3}    1
+    Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${RFC8040_NODES_API}/node=openflow%3A3?content=nonconfig    ${list}
 
 *** Keywords ***
 Ping All Works Good