Move tempest to own job

[integration/test.git] / csit / libraries / OvsManager.robot

diff --git a/csit/libraries/OvsManager.robot b/csit/libraries/OvsManager.robot
index 22299d4a1cee89ad8ae1d38b5af5bcd911eb8341..ccab7fdae3e8de86b833e6563b28527a886d7065 100644 (file)
--- a/csit/libraries/OvsManager.robot
+++ b/csit/libraries/OvsManager.robot
@@ -48,8 +48,12 @@ Execute OvsVsctl Show Command
     Log    ${output}
 
 Set Bridge Controllers
-    [Arguments]    ${bridge}    ${controllers}    ${disconnected}=${False}
+    [Arguments]    ${bridge}    ${controllers}    ${ofversion}=13    ${disconnected}=${False}
     [Documentation]    Adds controller to the bridge
+    ${cmd}=    BuiltIn.Set Variable    ${lcmd_prefix} ovs-vsctl set bridge ${bridge} protocols=OpenFlow${ofversion}
+    SSHLibrary.Write    ${cmd}
+    ${output}=    SSHLibrary.Read_Until    ${lprompt}
+    Log    ${output}
     ${cmd}=    BuiltIn.Set Variable    ${lcmd_prefix} ovs-vsctl set-controller ${bridge}
     : FOR    ${cntl}    IN    @{controllers}
     \    ${cmd}=    BuiltIn.Set Variable If    ${disconnected}==${False}    ${cmd} tcp:${cntl}:6653    ${cmd} tcp:${cntl}:6654
@@ -202,3 +206,13 @@ OvsManager__Enable_Slaves_For_Switch
     \    ${role}=    Collections.Get From Dictionary    ${cntl_value}    role
     \    ${connected}=    Collections.Get From Dictionary    ${cntl_value}    is_connected
     \    Run Keyword If    ${connected}==${False}    Reconnect Switch To Controller And Verify Connected    ${switch}    ${cntl_id}    verify_connected=${verify_connected}
+
+Get Dump Flows Count
+    [Arguments]    ${conn_id}    ${acl_sr_table_id}    ${port_mac}=""
+    [Documentation]    Count the number of dump flows for a given table id
+    ...    and grep with port_mac if provided
+    ${cmd} =    BuiltIn.Set Variable    sudo ovs-ofctl dump-flows br-int -OOpenFlow13 | grep table=${acl_sr_table_id} | grep ${port_mac} | wc -l
+    SSHLibrary.Switch Connection    ${conn_id}
+    ${output} =    Utils.Write Commands Until Expected Prompt    ${cmd}    ${DEFAULT_LINUX_PROMPT_STRICT}
+    @{list} =    String.Split String    ${output}
+    [Return]    ${list[0]}