integration: fix MTU checking for OVS>=2.9

In DPKD>=17.11.0 and OVS>=2.9 behaviour of MTU has changed. Previously
ovsdpdk_jumbo_p2p_upper_bound checked that two different MTU could be
set for a port in OVS DPDK. However due to changes in OVS a larger MTU
value is now required to create different mempools. Fix this by
increasing the MTU value requested so that a new mempool will be
created. Also output for calls to ovs-appctl has changed. This commit
fixes the expected regex to account for new spaces and reformat of the
queue listings in open vSwtich.
List of fixed tests:
ovsdpdk_mq_p2p_rxqs
ovsdpdk_mq_p2p_rxqs_same_core_affinity
ovsdpdk_mq_p2p_rxqs_multi_core_affinity
ovsdpdk_mq_pvp_rxqs
ovsdpdk_mq_pvp_rxqs_testpmd
ovsdpdk_jumbo_mtu_upper_bound_phy_port
ovsdpdk_jumbo_mtu_upper_bound_vport
ovsdpdk_jumbo_p2p_upper_bound

Co-authored-by: Ian Stokes <ian.stokes@intel.com>
Change-Id: I22e208004e5b732b4b21904809606055fbb9c0c4
Signed-off-by: Lukasz Pawlik <lukaszx.pawlik@intel.com>

diff --git a/conf/integration/01b_dpdk_regression_tests.conf b/conf/integration/01b_dpdk_regression_tests.conf
index c43f036..c6035ca 100644 (file)
--- a/conf/integration/01b_dpdk_regression_tests.conf
+++ b/conf/integration/01b_dpdk_regression_tests.conf
@@ -417,7 +417,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
             "VSWITCH_DPDK_MULTI_QUEUES" : _OVSDPDK_MQ,
         },
         "TestSteps": [
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk[01]\s+queue-id: \d+'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk[01]\s+queue-id:\s+\d+'],
                         # check that requested nr of queues was created on both NICs
                         ['tools', 'assert', 'len(#STEP[-1])=={}'.format(int(_OVSDPDK_MQ)*2)],
                     ]
@@ -439,8 +439,10 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
         },
         "TestSteps": [
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"]  -- set Interface dpdk0 other_config:pmd-rxq-affinity="0:{},1:{}"'.format(_OVSDPDK_1st_PMD_CORE, _OVSDPDK_1st_PMD_CORE)],
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id: 0 1'],
-                        ['tools', 'assert', 'len(#STEP[-1])==1'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id:\s+0'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id:\s+1'],
+                        ['tools', 'assert', 'len(#STEP[-2])==1'],
+                        ['tools', 'assert', 'len(#STEP[-2])==1'],
                     ]
     },
     {
@@ -460,8 +462,8 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
         },
         "TestSteps": [
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"]  -- set Interface dpdk0 other_config:pmd-rxq-affinity="0:{},1:{}"'.format(_OVSDPDK_1st_PMD_CORE, _OVSDPDK_2nd_PMD_CORE)],
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id: 0$'],
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id: 1$'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id:\s+0'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] dpif-netdev/pmd-rxq-show','|dpdk0\s+queue-id:\s+1'],
                         ['tools', 'assert', 'len(#STEP[-2])==1'],
                         ['tools', 'assert', 'len(#STEP[-2])==1'],
                     ]
@@ -482,12 +484,15 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
         "TestSteps": STEP_VSWITCH_PVP_INIT +
                      [
                         ['tools', 'exec_shell', "sudo $TOOLS['ovs-appctl'] dpif-netdev/pmd-rxq-show",
-                         '|dpdkvhostuserclient0\s+queue-id: \d'],
+                         '|dpdkvhostuserclient0\s+queue-id:\s+\d'],
                         ['tools', 'assert', 'len(#STEP[-1])==1'],
                         ['vnf', 'start'],
                         ['tools', 'exec_shell', "sudo $TOOLS['ovs-appctl'] dpif-netdev/pmd-rxq-show",
-                         '|dpdkvhostuserclient0\s+queue-id: 0 1'],
-                        ['tools', 'assert', 'len(#STEP[-1])==1'],
+                         '|dpdkvhostuserclient0\s+queue-id:\s+0'],
+                        ['tools', 'exec_shell', "sudo $TOOLS['ovs-appctl'] dpif-netdev/pmd-rxq-show",
+                         '|dpdkvhostuserclient0\s+queue-id:\s+1'],
+                        ['tools', 'assert', 'len(#STEP[-2])==1'],
+                        ['tools', 'assert', 'len(#STEP[-2])==1'],
                         ['vnf', 'stop'],
                      ] +
                      STEP_VSWITCH_PVP_FINIT
@@ -609,7 +614,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                      [
                         ['vnf', 'start'],
                         ['tools', 'exec_shell', "sudo $TOOLS['ovs-appctl'] dpif-netdev/pmd-rxq-show",
-                         '|dpdk\w+\s+queue-id: \d'],
+                         '|dpdk\w+\s+queue-id:\s+\d'],
                         # there must be two standalone queue records for every interface (2x4)
                         ['tools', 'assert', 'len(#STEP[-1])==8'],
                         ['trafficgen', 'send_traffic', {}],
@@ -1024,9 +1029,9 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
         "TestSteps": [
                         ['vswitch', 'add_switch', 'int_br0'],
                         ['vswitch', 'add_phy_port', 'int_br0'],
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdk0 mtu_request=9710'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdk0 mtu_request=9702'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] get Interface dpdk0 mtu'],
-                        ['tools', 'assert', 'int(#STEP[-1])==9710'],
+                        ['tools', 'assert', 'int(#STEP[-1])==9702'],
                         # get line number of next log file entry
                         ['tools', 'exec_shell', 'echo $((1+`wc -l $_OVSDPDK_VSWITCH_LOG | cut -d" " -f1`))', '(\d+)'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdk0 mtu_request=9711'],
@@ -1034,7 +1039,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                         ['tools', 'exec_shell', "sed -n '#STEP[-2][0],$ p' $_OVSDPDK_VSWITCH_LOG",
                          '|unsupported MTU 9711'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] get Interface dpdk0 mtu'],
-                        ['tools', 'assert', 'int(#STEP[-1])==9710'],
+                        ['tools', 'assert', 'int(#STEP[-1])==9702'],
                     ]
     },
     {
@@ -1048,9 +1053,9 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
         "TestSteps": [
                         ['vswitch', 'add_switch', 'int_br0'],
                         ['vswitch', 'add_vport', 'int_br0'],
-                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdkvhostuserclient0 mtu_request=9710'],
+                        ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdkvhostuserclient0 mtu_request=9702'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] get Interface dpdkvhostuserclient0 mtu'],
-                        ['tools', 'assert', 'int(#STEP[-1])==9710'],
+                        ['tools', 'assert', 'int(#STEP[-1])==9702'],
                         # get line number of next log file entry
                         ['tools', 'exec_shell', 'echo $((1+`wc -l $_OVSDPDK_VSWITCH_LOG | cut -d" " -f1`))', '(\d+)'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] set Interface dpdkvhostuserclient0 mtu_request=9711'],
@@ -1059,7 +1064,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                          '|unsupported MTU 9711'],
                         ['tools', 'assert', 'len(#STEP[-1])'],
                         ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] get Interface dpdkvhostuserclient0 mtu'],
-                        ['tools', 'assert', 'int(#STEP[-1])==9710'],
+                        ['tools', 'assert', 'int(#STEP[-1])==9702'],
                     ]
     },
     {
@@ -1207,8 +1212,8 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
                         ['trafficgen', 'get_results'],
                         # all traffic should pass through (i.e. 0% frame loss)
                         ['tools', 'assert', 'float(#STEP[-1][0]["frame_loss_percent"])==0'],
-                        # set packetsize to 9019 and send traffic
-                        ['settings', 'setValue', 'TRAFFICGEN_PKT_SIZES', (9019,)],
+                        # set packetsize to 9702 and send traffic
+                        ['settings', 'setValue', 'TRAFFICGEN_PKT_SIZES', (9702,)],
                         # disable verification of send_traffic "!" prefix, otherwise vsperf
                         # will fail when 100% packet loss is detected
                         ['!trafficgen', 'send_traffic', {}],