Fix netvirt openstack failures as per recent changes in pipelines

    * For bug 6089 fix, new tables have been introduced.
    * It includes learn and resubmit actions.
    * Change the variables in the suites as per the above fix.

Change-Id: Ibe6065909f87b1bf49f793e123191bfc318e622a
Signed-off-by: priya.ramasubbu <priya.ramasubbu@hcl.com>
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot b/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
index fd4af5928bac698b001597de8ceb5246e4acfcbe..f307596d7baa47f7ede1477be4b4292d495c0817 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
+++ b/csit/suites/netvirt/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot
@@ -12,8 +12,8 @@ Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-@{FLOW_TABLE_LIST}    actions=goto_table:20    actions=CONTROLLER:65535    actions=goto_table:30    actions=goto_table:40    actions=goto_table:50    actions=goto_table:60    actions=goto_table:70
-...               actions=goto_table:80    actions=goto_table:90    actions=goto_table:100    actions=goto_table:110    actions=drop
+@{FLOW_TABLE_LIST}    actions=goto_table:20    actions=CONTROLLER:65535    actions=goto_table:30    actions=goto_table:31    actions=resubmit(,39),resubmit(,40)    actions=goto_table:50    actions=goto_table:60
+...               actions=goto_table:70    actions=goto_table:80    actions=goto_table:90    actions=goto_table:100    actions=goto_table:105    actions=goto_table:110    actions=drop
 
 *** Test Cases ***
 Verify Net-virt Features

diff --git a/csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot b/csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot
index 2cda368d0a2d5ac2f52ca0bad684982f8df1a8a6..522a2c47c4d41d908876e60c2d8091d73bfed6e0 100644 (file)
--- a/csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot
+++ b/csit/suites/netvirt/Openstack_Neutron/001__connection_manager.robot
@@ -23,13 +23,15 @@ ${OF_PORT}        6653
 ${FLOWS_TABLE_20}    actions=goto_table:20
 ${FLOW_CONTROLLER}    actions=CONTROLLER:65535
 ${FLOWS_TABLE_30}    actions=goto_table:30
-${FLOWS_TABLE_40}    actions=goto_table:40
+${FLOWS_TABLE_31}    actions=goto_table:31
+${FLOWS_TABLE_40}    actions=resubmit(,39),resubmit(,40)
 ${FLOWS_TABLE_50}    actions=goto_table:50
 ${FLOWS_TABLE_60}    actions=goto_table:60
 ${FLOWS_TABLE_70}    actions=goto_table:70
 ${FLOWS_TABLE_80}    actions=goto_table:80
 ${FLOWS_TABLE_90}    actions=goto_table:90
 ${FLOWS_TABLE_100}    actions=goto_table:100
+${FLOWS_TABLE_105}    actions=goto_table:105
 ${FLOWS_TABLE_110}    actions=goto_table:110
 ${FLOW_DROP}      actions=drop
 ${PING_NOT_CONTAIN}    Destination Host Unreachable
@@ -90,6 +92,7 @@ Get the bridge flows
     Should Contain    ${output}    ${FLOWS_TABLE_20}
     Should Contain    ${output}    ${FLOW_CONTROLLER}
     Should Contain    ${output}    ${FLOWS_TABLE_30}
+    Should Contain    ${output}    ${FLOWS_TABLE_31}
     Should Contain    ${output}    ${FLOWS_TABLE_40}
     Should Contain    ${output}    ${FLOWS_TABLE_50}
     Should Contain    ${output}    ${FLOWS_TABLE_60}
@@ -97,5 +100,6 @@ Get the bridge flows
     Should Contain    ${output}    ${FLOWS_TABLE_80}
     Should Contain    ${output}    ${FLOWS_TABLE_90}
     Should Contain    ${output}    ${FLOWS_TABLE_100}
+    Should Contain    ${output}    ${FLOWS_TABLE_105}
     Should Contain    ${output}    ${FLOWS_TABLE_110}
     Should Contain    ${output}    ${FLOW_DROP}