Replace deprecated variables in suites/openflowplugin (1).

[integration/test.git] / csit / suites / openflowplugin / Performance_Flow_Config / 080_Rpc_100k_Flows_Configuration_Time_Measure.robot

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
index 51be2416b9aecdf828e0243f10504185fd431322..c794ef9a50a114cb04bca9553714e6bea7e94227 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
@@ -17,8 +17,8 @@ ${fpr}            25
 ${nrthreads}      5
 ${swspread}       linear
 ${tabspread}      first
-@{cntls}          ${CONTROLLER}
-${start_cmd}      sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
+@{cntls}          ${ODL_SYSTEM_IP}
+${start_cmd}      sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13
 ${getf_cmd}       sh ./get-total-found.sh
 ${getr_cmd}       sh ./get-total-reported.sh
 ${iperiod}        1s
@@ -77,7 +77,7 @@ Connect Switches
     Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
 
 Create Http Session And Upload Files
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=600
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/*    ./
@@ -107,7 +107,7 @@ Are Switches Connected Topo
 Check Flows Inventory
     [Arguments]    ${rswitches}    ${rflows}
     [Documentation]    Checks in inventory has required state
-    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${repf}    ${foundf}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${rswitches}    ${sw}
     Should Be Equal As Numbers    ${rflows}    ${foundf}