Replace deprecated variables in suites/openflowplugin (1).

[integration/test.git] / csit / suites / openflowplugin / Performance_Flow_Config / 020_Stats_Collection_Gauss.robot

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
index 233ff08df2a4625501e6e85cd4448533e4204967..8e0679c1b5cacf2bcd47b6a2a4ffcc5e16acb500 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
@@ -18,7 +18,7 @@ ${swspread}       gauss
 ${tabspread}      gauss
 ${topourl}        /restconf/operational/network-topology:network-topology/topology/flow:1
 ${invurl}         /restconf/operational/opendaylight-inventory:nodes
-@{cntls}          ${CONTROLLER}
+@{cntls}          ${ODL_SYSTEM_IP}
 
 *** Test Cases ***
 Configure Flows
@@ -29,7 +29,7 @@ Configure Flows
     Set Suite Variable    ${flows}
 
 Check Configured Are Operational
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${flows}    ${ODL_SYSTEM_IP}
 
 Deconfigure Flows
     ${res}=    Deconfigure Flows    flow_details=${flows}    controllers=@{cntls}    nrthreads=5
@@ -37,7 +37,7 @@ Deconfigure Flows
 
 Check No Flows In Operational
     ${noflows}=    Create List
-    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${CONTROLLER}
+    Wait Until Keyword Succeeds    110s    20s    Check Flows Inventory    ${noflows}    ${ODL_SYSTEM_IP}
 
 *** Keywords ***
 Connect Switches
@@ -48,9 +48,9 @@ Connect Switches
     Write    sudo ovs-vsctl set-manager ptcp:6644
     Write    sudo mn -c
     Read Until    ${DEFAULT_LINUX_PROMPT}
-    Write    sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+    Write    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
     Read Until    mininet>
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Stop Switches