diff mbox

[ovs-dev,patch_v2,2/2] System-tests: Improve reliability of an icmp test.

Message ID 1500580963-130560-2-git-send-email-dlu998@gmail.com
State Accepted
Headers show

Commit Message

Darrell Ball July 20, 2017, 8:02 p.m. UTC 
One SNAT test is based on a single ping being successful;
to make the result more predictable, static arp binding is now used.
To put less stress on the stack a single arp binding is used for
the reverse direction mapping.  This does not change the goal of the
test, but significantly increases the reliability; I ran the test
100 times without failure.

Signed-off-by: Darrell Ball <dlu998@gmail.com>
---

v1->v2: Increase reliability beyond V1 by using a 
        single arp binding in the reverse direction.
        This puts less stress on the stack. No
        failure was seen in 100 tries now.

 tests/system-traffic.at | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

Comments

Joe Stringer July 21, 2017, 11:49 p.m. UTC | #1 
On 20 July 2017 at 13:02, Darrell Ball <dlu998@gmail.com> wrote:
> One SNAT test is based on a single ping being successful;
> to make the result more predictable, static arp binding is now used.
> To put less stress on the stack a single arp binding is used for
> the reverse direction mapping.  This does not change the goal of the
> test, but significantly increases the reliability; I ran the test
> 100 times without failure.
>
> Signed-off-by: Darrell Ball <dlu998@gmail.com>

I'm glad you were able to further improve the reliability.

Thanks, applied to master.
diff mbox

Patch

diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index 1ebf928..d89272c 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -2693,12 +2693,16 @@  OVS_TRAFFIC_VSWITCHD_START()
 ADD_NAMESPACES(at_ns0, at_ns1)
 
 ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
-NS_CHECK_EXEC([at_ns0], [ip link set dev p0 address 80:88:88:88:88:88])
+NS_CHECK_EXEC([at_ns0], [ip link set dev p0 address e6:66:c1:11:11:11])
+NS_CHECK_EXEC([at_ns0], [arp -s 10.1.1.2 e6:66:c1:22:22:22])
+
 ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+NS_CHECK_EXEC([at_ns1], [ip link set dev p1 address e6:66:c1:22:22:22])
+NS_CHECK_EXEC([at_ns1], [arp -s 10.1.1.240 e6:66:c1:11:11:11])
 
 dnl Allow any traffic from ns0->ns1. Only allow nd, return traffic from ns1->ns0.
 AT_DATA([flows.txt], [dnl
-in_port=1,ip,action=ct(commit,zone=1,nat(src=10.1.1.240-10.1.1.255)),2
+in_port=1,ip,action=ct(commit,zone=1,nat(src=10.1.1.240)),2
 in_port=2,ct_state=-trk,ip,action=ct(table=0,zone=1,nat)
 dnl
 dnl Setting the mark fails if the datapath can't find the existing conntrack
@@ -2707,20 +2711,7 @@  dnl
 in_port=2,ct_state=+trk,ct_zone=1,ip,action=ct(table=1,commit,zone=1,exec(set_field:1->ct_mark)),1
 table=1,in_port=2,ct_mark=1,ct_state=+rpl,ct_zone=1,ip,action=1
 dnl
-dnl ARP
-priority=100 arp arp_op=1 action=move:OXM_OF_ARP_TPA[[]]->NXM_NX_REG2[[]],resubmit(,8),goto_table:10
-priority=10 arp action=normal
 priority=0,action=drop
-dnl
-dnl MAC resolution table for IP in reg2, stores mac in OXM_OF_PKT_REG0
-table=8,reg2=0x0a0101f0/0xfffffff0,action=load:0x808888888888->OXM_OF_PKT_REG0[[]]
-table=8,priority=0,action=load:0->OXM_OF_PKT_REG0[[]]
-dnl ARP responder mac filled in at OXM_OF_PKT_REG0, or 0 for normal action.
-dnl TPA IP in reg2.
-dnl Swaps the fields of the ARP message to turn a query to a response.
-table=10 priority=100 arp xreg0=0 action=normal
-table=10 priority=10,arp,arp_op=1,action=load:2->OXM_OF_ARP_OP[[]],move:OXM_OF_ARP_SHA[[]]->OXM_OF_ARP_THA[[]],move:OXM_OF_PKT_REG0[[0..47]]->OXM_OF_ARP_SHA[[]],move:OXM_OF_ARP_SPA[[]]->OXM_OF_ARP_TPA[[]],move:NXM_NX_REG2[[]]->OXM_OF_ARP_SPA[[]],move:NXM_OF_ETH_SRC[[]]->NXM_OF_ETH_DST[[]],move:OXM_OF_PKT_REG0[[0..47]]->NXM_OF_ETH_SRC[[]],move:NXM_OF_IN_PORT[[]]->NXM_NX_REG3[[0..15]],load:0->NXM_OF_IN_PORT[[]],output:NXM_NX_REG3[[0..15]]
-table=10 priority=0 action=drop
 ])
 
 AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])