Moved calls to "RequestLibrary.<action> Request" in suites/openflowplugin/

[integration/test.git] / csit / suites / openflowplugin / MD_SAL_NSF_OF10 / 020__restconf_topology.robot

diff --git a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
index f765f3c64d183c4d9906418e9eb38ba8b3485171..3616d7256d55a6b18d0f0cbe5fa7b750df6edad6 100644 (file)
--- a/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
+++ b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for RESTCONF Topology
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           RequestsLibrary
@@ -16,7 +16,7 @@ ${REST_CONTEXT}    /restconf/operational/network-topology:network-topology
 Get RESTCONF Topology
     [Documentation]    Get RESTCONF Topology and validate the result.
     Wait Until Keyword Succeeds    30s    2s    Ensure All Nodes Are In Response    ${REST_CONTEXT}    ${node_list}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}
     Log    ${resp.content}
 
 List all the links
@@ -48,7 +48,7 @@ Link Down
     # increasing the WUKS timeout to 60s to see if the CI environment might just be taking
     # longer for this test with the lithium redesign plugin
     Wait Until Keyword Succeeds    60s    2s    Verify Links    ${links}
-    # shot in the dark.  maybe the "link s1 s2 down" really didn't take the link(s) down?
+    # shot in the dark.    maybe the "link s1 s2 down" really didn't take the link(s) down?
     # hopefully this output below will show that.
     Write    sh ovs-vsctl find Interface name="s1-eth1"
     ${output}=    Read Until    mininet>
@@ -81,7 +81,7 @@ Add Port
 *** Keywords ***
 Verify Links
     [Arguments]    ${expected_links}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/topology/flow:1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/topology/flow:1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}