Replace deprecated variables in suites/openflowplugin (2).

[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 71e6f3c2fe74854cd600263c91a9ce696aaac800..8f7c5919b740fdb13af44e177a27cbc28e6219d7 100644 (file)
--- a/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -27,9 +27,9 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
-${SWITCH_IP}      ${MININET}
+${SWITCH_IP}      ${TOOLS_SYSTEM_IP}
 ${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
@@ -46,38 +46,38 @@ ${CONTROLLER_doc}    OF1.3 OFPP_CONTROLLER = 0xfffffffd, /* Send to controller.
 ${LOCAL_doc}      OF1.3 OFPP_LOCAL = 0xfffffffe, /* Local openflow "port". */
 ${ANY_doc}        OF1.3 OFPP_ANY = 0xffffffff /* Wildcard port used only for flow mod (delete) and flow stats requests. Selects all flows regardless of output port (including flows with no output port). */
 
-*** Test Cases ***    output port        tableID              flowID      priority
+*** Test Cases ***    output port        tableID              flowID    priority
 INPORT                [Documentation]    ${INPORT_doc}
                       [Tags]             inport
-                      ${TEST_NAME}       200                  161         1
+                      ${TEST_NAME}       200                  161       1
 
 TABLE                 [Documentation]    ${TABLE_doc}
                       [Tags]             table
-                      ${TEST_NAME}       200                  261         65535
+                      ${TEST_NAME}       200                  261       65535
 
 NORMAL                [Documentation]    ${NORMAL_doc}
                       [Tags]             normal
-                      ${TEST_NAME}       200                  361         9
+                      ${TEST_NAME}       200                  361       9
 
 FLOOD                 [Documentation]    ${FLOOD_doc}
                       [Tags]             flood
-                      ${TEST_NAME}       200                  81         255
+                      ${TEST_NAME}       200                  81        255
 
 ALL                   [Documentation]    ${ALL_doc}
                       [Tags]             all
-                      ${TEST_NAME}       200                  88         42
+                      ${TEST_NAME}       200                  88        42
 
 CONTROLLER            [Documentation]    ${CONTROLLER_doc}
                       [Tags]             controller
-                      ${TEST_NAME}       200                  21         21
+                      ${TEST_NAME}       200                  21        21
 
 LOCAL                 [Documentation]    ${LOCAL_doc}
                       [Tags]             local
-                      ${TEST_NAME}       200                  32         12345
+                      ${TEST_NAME}       200                  32        12345
 
 ANY                   [Documentation]    ${ANY_doc}
                       [Tags]             any
-                      ${TEST_NAME}       200                  111         54321
+                      ${TEST_NAME}       200                  111       54321
 
 *** Keywords ***
 Create And Remove Flow
@@ -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}