cleaning up system variables

[integration/test.git] / csit / suites / didm / discovery / device_discovery.robot

diff --git a/csit/suites/didm/discovery/device_discovery.robot b/csit/suites/didm/discovery/device_discovery.robot
index 39fd9192da6e778e3b141db01736496729b12986..7b0c7cdb7e8bbcb27491dd82a9ca0c81a1f9cf76 100644 (file)
--- a/csit/suites/didm/discovery/device_discovery.robot
+++ b/csit/suites/didm/discovery/device_discovery.robot
@@ -10,7 +10,7 @@ Suite Teardown    DIDM Suite Teardown
 Library           SSHLibrary
 Library           Collections
 Library           RequestsLibrary
-Resource          ../../../variables/Variables.robot
+Resource          ../../../variables/DIDM/Variables.robot
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/MininetKeywords.robot
@@ -87,9 +87,9 @@ Setup DIDM Environment
     Verify Feature Is Installed    odl-openflowplugin-all-li
     ${message}=    Set Variable    org.opendaylight.didm.ovs - 0.2.0.SNAPSHOT | Device-type Listener registered
     Wait For Karaf Log    ${message}
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
     Log    Start device
     ${mininet_topo_opt}=    Set Variable    --topo linear,1 --switch ovsk,protocols=OpenFlow13
-    ${mininet_conn_id}=    Start Mininet Single Controller    ${DEVICE_IP}    ${CONTROLLER}    ${mininet_topo_opt}
+    ${mininet_conn_id}=    Start Mininet Single Controller    ${TOOLS_SYSTEM_IP}    ${ODL_SYSTEM_IP}    ${mininet_topo_opt}
     Wait Until Keyword Succeeds    11s    1s    Check DIDM Registered With Device
     Set Suite Variable    ${mininet_conn_id}