[ovs-git] [openvswitch/ovs] a00a72: tests: Strip more variable output from conntrack o...

GitHub noreply at github.com
Thu Nov 5 02:45:54 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: a00a72a6cd54ee2721e89570c61e969c5fabe4ae
      https://github.com/openvswitch/ovs/commit/a00a72a6cd54ee2721e89570c61e969c5fabe4ae
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M tests/system-common-macros.at

  Log Message:
  -----------
  tests: Strip more variable output from conntrack output.

'conntrack' output format varies depending on the system
configuration, i.e., conntrack accounting or timestamping is enabled.
Modify the FORMAT_CT() macro to hide these differences.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Joe Stringer <joestringer at nicira.com>


  Commit: f3abc57bbfc581eb399a388e94db1a8923243fb4
      https://github.com/openvswitch/ovs/commit/f3abc57bbfc581eb399a388e94db1a8923243fb4
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M ofproto/ofproto-dpif-upcall.c

  Log Message:
  -----------
  upcall: Eliminate dead code.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Joe Stringer <joestringer at nicira.com>


  Commit: 76e3e6695ef0ac8f97f950a1fff4ef4ec23afe97
      https://github.com/openvswitch/ovs/commit/76e3e6695ef0ac8f97f950a1fff4ef4ec23afe97
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M lib/ofp-actions.c

  Log Message:
  -----------
  ofp-actions: Fix conntrack action usable_protocols handling.

Restrictions from embedded actions should be folded in rather than
discarded.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Joe Stringer <joestringer at nicira.com>


  Commit: 994fcc5a15d32b16e249eaa97c7948a75ba370bd
      https://github.com/openvswitch/ovs/commit/994fcc5a15d32b16e249eaa97c7948a75ba370bd
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2015-11-04 (Wed, 04 Nov 2015)

  Changed paths:
    M ofproto/ofproto-dpif-upcall.c

  Log Message:
  -----------
  upcall: Check for recirc_id in ukey_create_from_dpif_flow()

Filter out not only flows with recirculation actions, but also flows
with non-zero recirculation id in flow key when creating ukeys from
datapath flows, as such flows also depend on the recirculation
context, which have been lost after a restart.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>
Acked-by: Joe Stringer <joestringer at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/0df6430eda56...994fcc5a15d3


More information about the git mailing list