Append 3 more punt path protection TCs

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

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index 8fd31060d9f2132979d4a9b49a9a55a6cc4ab62a..51fab3c5758e8510347c6aecdef73e1bc1d94f7d 100644 (file)
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -2,6 +2,7 @@
 Documentation     Library to deal with mdsal data models. Initially, as a common place to show and
 ...               debug a list of data models.
 Library           RequestsLibrary
+Resource          ../variables/netvirt/Variables.robot
 
 *** Variables ***
 @{internal_data_models}    ${EMPTY}
@@ -24,12 +25,11 @@ Get Model Dump
 Verify No Ingress Dispatcher Non-Default Flow Entries
     [Arguments]    ${ovs_ip}
     [Documentation]    Verify the ingress dispatcher table has no non-default flows after neutron was cleaned up
-    ${flow_output}=    Run Command On Remote System    ${ovs_ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows br-int table=${DISPATCHER_TABLE} | grep -v "priority=0"
+    ${flow_output}=    Run Command On Remote System    ${ovs_ip}    sudo ovs-ofctl -O OpenFlow13 dump-flows ${INTEGRATION_BRIDGE} table=${DISPATCHER_TABLE} | grep -v "priority=0"
     Log    ${flow_output}
     #Should Not Contain    ${flow_output}    table=${DISPATCHER_TABLE} # Skipping test verification until bug 7451 is resolved
 
 Verify Flows Are Cleaned Up On All OpenStack Nodes
     [Documentation]    Verify flows are cleaned up from all OpenStack nodes
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_CONTROL_NODE_IP}
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_COMPUTE_1_IP}
-    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${OS_COMPUTE_2_IP}
+    : FOR    ${ip}    IN    @{OS_ALL_IPS}
+    \    Run Keyword And Continue On Failure    Verify No Ingress Dispatcher Non-Default Flow Entries    ${ip}