Fix policer related integration tests

From DPDK >=18.02.0 when setting policer information about
CIR is no longer available in the logs. Returned error when creating
policer with invalid parameters was also changed.
This patch removes checking information about CIR setting in OVS log
and fix error string checking.

Signed-off-by: Lukasz Pawlik <lukaszx.pawlik@intel.com>
Change-Id: I1753bf8ebc66e12ce3bf9dc38f07b61f6500095f

diff --git a/conf/integration/01b_dpdk_regression_tests.conf b/conf/integration/01b_dpdk_regression_tests.conf
index c6035ca..960f47f 100644 (file)
--- a/conf/integration/01b_dpdk_regression_tests.conf
+++ b/conf/integration/01b_dpdk_regression_tests.conf
@@ -1256,10 +1256,6 @@ _OVSDPDK_RATE_set_rate_limiter = [
      'set Interface $_OVSDPDK_RATE_PORT$_OVSDPDK_RATE_NICID '
      'ingress_policing_burst=$_OVSDPDK_RATE_BURST '
      'ingress_policing_rate=$_OVSDPDK_RATE_RATE'],
-    # check vswitchd log file, that rate limiter was created
-    ['tools', 'exec_shell', "sed -n '#STEP[-2][0],$ p' $_OVSDPDK_VSWITCH_LOG",
-     '|CIR period'],
-    ['tools', 'assert', '("CIR period" in #STEP[-1])==$_OVSDPDK_RATE_LIMITER_CREATED'],
     # verify that interface has correct rate limiter configuration
     ['tools', 'exec_shell', 'sudo $TOOLS["ovs-vsctl"] '
      'list interface $_OVSDPDK_RATE_PORT$_OVSDPDK_RATE_NICID',
@@ -1503,11 +1499,6 @@ _OVSDPDK_QOS_set_qos = [
      'other-config:cbs=$_OVSDPDK_QOS_CBS','|\w{8}-\w{4}-\w{4}-\w{4}-\w{12}'],
     ['tools', 'assert', 'len(#STEP[-1])==1'],
 
-    # Check the OVS logs
-    ['tools', 'exec_shell', "sed -n '#STEP[-3][0],$ p' $_OVSDPDK_VSWITCH_LOG",
-     '|CIR period'],
-    ['tools', 'assert', '"CIR period" in #STEP[-1]'],
-
     # Check the QoS policy and attributes
     ['tools', 'exec_shell', 'sudo $TOOLS["ovs-appctl"] -t ovs-vswitchd qos/show '
      '$_OVSDPDK_QOS_PORT$_OVSDPDK_QOS_NICID', '.+'],
@@ -1627,7 +1618,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
 
                         # Check the OVS logs
                         ['tools', 'exec_shell', "sed -n '#STEP[LOG_MARK][0],$ p' $_OVSDPDK_VSWITCH_LOG",
-                         'Failed to set QoS type egress-policer on port #STEP[1][0]: No such file or directory'],
+                         'Failed to set QoS type egress-policer on port #STEP[1][0]: Invalid argument'],
                         ['tools', 'assert', 'len(#STEP[-1])==1'],
 
                         # Check the attributes for vhost0
@@ -1657,7 +1648,7 @@ INTEGRATION_TESTS = INTEGRATION_TESTS + [
 
                         # Check the OVS logs
                         ['tools', 'exec_shell', "sed -n '#STEP[LOG_MARK][0],$ p' $_OVSDPDK_VSWITCH_LOG",
-                         'Failed to set QoS type egress-policer on port #STEP[1][0]: No such file or directory'],
+                         'Failed to set QoS type egress-policer on port #STEP[1][0]: Invalid argument'],
                         ['tools', 'assert', 'len(#STEP[-1])==1'],
 
                         # Check the attributes for vhost0