Priority is required in flow config

-  The Lithium redesign is now correctly requiring that the
priority field be present in the flow being programmed.  The
fact that this was working with the Helium codebase is a bug
there.

-  This will fix 8 failures currently seen in Li-redesign
flow-services CI

-  This also fixes some WARN messages we get in the robot
logs by using the correct namespace "SSHLibrary" in the utils
library

Change-Id: Icaef7e2c225188ea2decf8a8b15587c6e6573e13
Signed-off-by: Jamo Luhrsen <james.luhrsen@hp.com>

diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt
index 199c58e00c55b8e9b4eaaef2719d1cfd42ce5875..9ae5191a2c05749b348d0bb44990941d6c861da3 100644 (file)
--- a/test/csit/libraries/Utils.txt
+++ b/test/csit/libraries/Utils.txt
@@ -115,11 +115,11 @@ Run Command On Remote System
     ...    taking care to log in with a public key and. The command given is written and the output returned. No test conditions
     ...    are checked.
     Log    Attempting to execute ${cmd} on ${remote_system}
-    ${conn_id}=    Open Connection    ${remote_system}    prompt=${prompt}    timeout=${prompt_timeout}
+    ${conn_id}=    SSHLibrary.Open Connection    ${remote_system}    prompt=${prompt}    timeout=${prompt_timeout}
     Login With Public Key    ${user}    ${USER_HOME}/.ssh/id_rsa    any
-    Write    ${cmd}
-    ${output}=    Read Until    ${linux_prompt}
-    Close Connection
+    SSHLibrary.Write    ${cmd}
+    ${output}=    SSHLibrary.Read Until    ${linux_prompt}
+    SSHLibrary.Close Connection
     [Return]    ${output}
 
 Verify File Exists On Remote System

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index b89ff2747038c4b71418c143f83b3b902de60c1b..4a543f8ad5510709cf575a0a7ea5688e77e2a624 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -46,42 +46,42 @@ ${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
+*** Test Cases ***    output port        tableID              flowID      priority
 INPORT                [Documentation]    ${INPORT_doc}
                       [Tags]             inport
-                      ${TEST_NAME}       200                  161
+                      ${TEST_NAME}       200                  161         1
 
 TABLE                 [Documentation]    ${TABLE_doc}
                       [Tags]             table
-                      ${TEST_NAME}       200                  261
+                      ${TEST_NAME}       200                  261         65535
 
 NORMAL                [Documentation]    ${NORMAL_doc}
                       [Tags]             normal
-                      ${TEST_NAME}       200                  361
+                      ${TEST_NAME}       200                  361         9
 
 FLOOD                 [Documentation]    ${FLOOD_doc}
                       [Tags]             flood
-                      ${TEST_NAME}       200                  81
+                      ${TEST_NAME}       200                  81         255
 
 ALL                   [Documentation]    ${ALL_doc}
                       [Tags]             all
-                      ${TEST_NAME}       200                  88
+                      ${TEST_NAME}       200                  88         42
 
 CONTROLLER            [Documentation]    ${CONTROLLER_doc}
                       [Tags]             controller
-                      ${TEST_NAME}       200                  21
+                      ${TEST_NAME}       200                  21         21
 
 LOCAL                 [Documentation]    ${LOCAL_doc}
                       [Tags]             local
-                      ${TEST_NAME}       200                  32
+                      ${TEST_NAME}       200                  32         12345
 
 ANY                   [Documentation]    ${ANY_doc}
                       [Tags]             any
-                      ${TEST_NAME}       200                  111
+                      ${TEST_NAME}       200                  111         54321
 
 *** Keywords ***
 Create And Remove Flow
-    [Arguments]    ${output_port}    ${table_id}    ${flow_id}
+    [Arguments]    ${output_port}    ${table_id}    ${flow_id}    ${priority}
     ##The dictionaries here will be used to populate the match and action elements of the flow mod
     ${ethernet_match_dict}=    Create Dictionary    type=${eth_type}    destination=${eth_dst}    source=${eth_src}
     ${ipv4_match_dict}=    Create Dictionary    source=${ipv4_src}    destination=${ipv4_dst}
@@ -89,6 +89,7 @@ Create And Remove Flow
     ${flow}=    Create Inventory Flow
     Set "${flow}" "table_id" With "${table_id}"
     Set "${flow}" "id" With "${flow_id}"
+    Set "${flow}" "priority" With "${priority}"
     Clear Flow Actions    ${flow}
     Set Flow Output Action    ${flow}    0    0    ${output_port}
     Set Flow Ethernet Match    ${flow}    ${ethernet_match_dict}