[ovs-git] [openvswitch/ovs] adf1b8: system-traffic: Fix conntrack per zone limit test.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: adf1b852301842a2d39ea363df816b6df183a76e
      https://github.com/openvswitch/ovs/commit/adf1b852301842a2d39ea363df816b6df183a76e
  Author: Tiago Lam <tiago.lam at intel.com>
  Date:   2018-09-06 (Thu, 06 Sep 2018)

  Changed paths:
    M tests/system-kmod-macros.at
    M tests/system-traffic.at
    M tests/system-userspace-macros.at

  Log Message:
  -----------
  system-traffic: Fix conntrack per zone limit test.

Commit 3f1087c added a per zone limit test which relied on the
CHECK_CT_DPIF_FLUSH_BY_CT_TUPLE m4 macro to skip the test when executing
in a userspace datapath (since the per zone limit feature is not yet
implemented in userspace). That macro, however, has been removed in
commit 271e48a ("conntrack: Support conntrack flush by ct 5-tuple")
which was causing the test to fail when executing in userspace.

Instead, a new m4 macro, CHECK_CT_DPIF_PER_ZONE_LIMIT, is introduced to
make the same differentiation, until userspace doesn't support the per
zone limit.

CC: Yi-Hung Wei <yihung.wei at gmail.com>
Fixes: 3f1087c ("system-traffic: Add conntrack per zone limit test case")
Signed-off-by: Tiago Lam <tiago.lam at intel.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
Acked-by: Yi-Hung Wei <yihung.wei at gmail.com>



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.