X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FInventory_Scalability_OF10%2F020__restconf_topology.robot;h=90ced470cce727d372ae76773d3e238ef8604bb8;hb=HEAD;hp=5d8c9b20581ec1621c579be9cacb0c4ea57ca3e7;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
index 5d8c9b2058..90ced470cc 100644
--- a/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
+++ b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
@@ -1,15 +1,16 @@
 *** Settings ***
-Documentation     Test suite for RESTCONF topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           XML
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
+Documentation       Test suite for RESTCONF topology
+
+Library             Collections
+Library             XML
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+Resource            ../../../variables/openflowplugin/Variables.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown      Delete All Sessions
 
-*** Variables ***
-${REST_CONTEXT}    /restconf/operational/network-topology:network-topology/topology/flow:1
 
 *** Test Cases ***
 Get Nodes Count
@@ -17,7 +18,13 @@ Get Nodes Count
     ${TOPO_TREE_DEPTH}    Convert To Integer    ${TOPO_TREE_DEPTH}
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
-    Wait Until Keyword Succeeds    60s    2s    Verify Element Count    ${REST_CONTEXT}    node    ${numnodes}
+    Wait Until Keyword Succeeds
+    ...    60s
+    ...    2s
+    ...    Verify Element Count
+    ...    ${RFC8040_OPERATIONAL_TOPO_FLOW1_API}
+    ...    node
+    ...    ${numnodes}
 
 Get Links Count
     [Documentation]    Checks the number of links
@@ -25,13 +32,23 @@ Get Links Count
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
     ${numnodes}    Num Of Nodes    ${TOPO_TREE_DEPTH}    ${TOPO_TREE_FANOUT}
     ${numlinks}    Evaluate    (${numnodes}-1)*2
-    Wait Until Keyword Succeeds    60s    2s    Verify Element Count    ${REST_CONTEXT}    link    ${numlinks}
+    Wait Until Keyword Succeeds
+    ...    60s
+    ...    2s
+    ...    Verify Element Count
+    ...    ${RFC8040_OPERATIONAL_TOPO_FLOW1_API}
+    ...    link
+    ...    ${numlinks}
+
 
 *** Keywords ***
 Verify Element Count
     [Arguments]    ${URI}    ${xpath_location}    ${expected_count}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}    headers=${ACCEPT_XML}
-    Log    ${resp.content}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    ${count}=    Get Element Count    ${resp.content}    xpath=${xpath_location}
+    ${resp}    RequestsLibrary.GET On Session
+    ...    session
+    ...    url=${RFC8040_OPERATIONAL_TOPO_FLOW1_API}
+    ...    headers=${ACCEPT_XML}
+    ...    expected_status=200
+    Log    ${resp.text}
+    ${count}    Get Element Count    ${resp.text}    xpath=${xpath_location}
     Should Be Equal As Numbers    ${count}    ${expected_count}