[ovs-git] [openvswitch/ovs] 74f205: system-traffic: Collapse FTP NAT tests.

GitHub noreply at github.com
Wed Sep 28 21:26:57 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 74f205f6cc66a15f6b8e194bfcb4d4f144088583
      https://github.com/openvswitch/ovs/commit/74f205f6cc66a15f6b8e194bfcb4d4f144088583
  Author: Joe Stringer <joe at ovn.org>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M tests/system-traffic.at

  Log Message:
  -----------
  system-traffic: Collapse FTP NAT tests.

Previously we had the following tests:
* FTP with NAT
* FTP with NAT (seq-adj)
* FTP with NAT 2

Tests 1 and 2 share everything, except use different IP addresses. Test
3 has a different flow table, but shares the topology with 1 and 2.

This commit creates macros:
* CHECK_FTP_NAT(title, ip, flow_table)
* CHECK_FTP_NAT_PRE_RECIRC(title, ip, ip-as-hex)
* CHECK_FTP_NAT_POST_RECIRC(title, ip, ip-as-hex)

The second macro represents tests 1 and 2, while the third macro
represents two variations on test 3: with and without TCP sequence
adjustment.

By using these macros to declare the tests, much of the code may be
reused and shared rather than copying/pasting. As a result, the
differences between tests are easier to identify.

Signed-off-by: Joe Stringer <joe at ovn.org>
Acked-by: Jarno Rajahalme <jarno at ovn.org>




More information about the git mailing list