Replace deprecated variables in suites/openflowplugin (1).

[integration/test.git] / csit / suites / openflowplugin / Switch_Qualification / 020_OpenFlow_Actions.robot

diff --git a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index 185662ed2d464d3b07357e27249b3133be7f6080..c02d102ab82100ef19e0ab40a88d409784ca999f 100644 (file)
--- a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -29,7 +29,7 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
 ${SWITCH_PROMPT}    ${DEFAULT_LINUX_PROMPT}
-${CONTROLLER}     null
+${ODL_SYSTEM_IP}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${ipv4_src}       11.3.0.0/16
 ${ipv4_dst}       99.0.0.0/8
@@ -107,14 +107,14 @@ OpenFlow Actions Suite Setup
     ${test_switch}=    Get Switch    ${SWITCH_CLASS}
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
-    Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_controller_ip    ${ODL_SYSTEM_IP}
     Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
-    Run Command On Remote System    ${CONTROLLER}    ps -elf | grep java
+    Run Command On Remote System    ${ODL_SYSTEM_IP}    ps -elf | grep java
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}
     Initialize Switch    ${test_switch}
     Configure OpenFlow    ${test_switch}
-    Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 
 OpenFlow Actions Suite Teardown
     Cleanup Switch    ${test_switch}