From patchwork Mon Nov 9 18:56:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 541960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id BE3101413F6 for ; Tue, 10 Nov 2015 05:56:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=Q2wqMfCk; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 2995110565; Mon, 9 Nov 2015 10:56:28 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 281EC10561 for ; Mon, 9 Nov 2015 10:56:26 -0800 (PST) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 736321E00F2 for ; Mon, 9 Nov 2015 11:56:25 -0700 (MST) X-ASG-Debug-ID: 1447095384-03dc53088317eb50001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id CecpcG5dzEha2CKV (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 09 Nov 2015 11:56:24 -0700 (MST) X-Barracuda-Envelope-From: joestringer@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f41.google.com) (209.85.220.41) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 9 Nov 2015 18:56:23 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.41 Received: by padhx2 with SMTP id hx2so198900528pad.1 for ; Mon, 09 Nov 2015 10:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3d1aTab9eBd6zF2gtZGofDimNDF2PvdgtwSZNthLb/Y=; b=Q2wqMfCk7L5SllwhHlraPtoY63SnOuu+vfAb3nxKKNhkAMQobr3gVVbjmqoiIpEoPA miDIoPLWkXW8IpibWs5xPaaiO+FoLIm85hcpx3Px7iAD+G0yJW91ogNWjmOm4DXEar9i 76gNLmuzpTLkUBTn6qdimfdFhndeBrlQUmtp3AVY1kK6rswKdx+iEdswq7dvAV35HNL0 V8F6SNICPQJfW/K4Z+yDeGlWNGrcZXWlX4Prq5yU7F2aIXdaIJllLOwj4ttIU2b872Vv 9tjM/g3GniWt96wzyDloNELb4LH3XlsfaVuWcrkhsASIZTHvAacVYQ3z974MJckC5axl KCqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3d1aTab9eBd6zF2gtZGofDimNDF2PvdgtwSZNthLb/Y=; b=ev4H0sVaIkuBbUH53xhubwwK54jum0Ths6GOuxa34ckLUtbgMqlIDPhr62S4WOZCov eYOLeIbf6JzH/zzdcqJwgvWz4KG0oJ5NDzkMr63cbyNTbyHX9JjDJjDhPsdagQq1nVNX OG9eSdhIOuyjMd7v/Lu12ToREeOMzWsuayrieiewIxG18J1T4EWd3I2WBNXzTwio4gdT B/hfPgAYjd3BJAPxdHH1YFJ6yC/1MenLDxXXi/CusflsDTG4jYAP3gaw2GxeKJOG3F+o s8PP1I7mtHaPXe8sDZCShVKmEoWj1iQlGbLPFBlhjbBPqBkpTeWeKTo3Y8Z5qpyW/SZi ZcNg== X-Gm-Message-State: ALoCoQlLUqLZOhom//5l+G/TzXLjbHaoTidJRRj2k8Jvgdp8ia54awMa1r/Xg7XszNqNF+ykp3CN X-Received: by 10.68.143.40 with SMTP id sb8mr42631237pbb.107.1447095383328; Mon, 09 Nov 2015 10:56:23 -0800 (PST) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id c6sm12616766pbu.51.2015.11.09.10.56.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Nov 2015 10:56:21 -0800 (PST) X-CudaMail-Envelope-Sender: joestringer@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.2.4 From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-1108062732 X-CudaMail-DTE: 110915 X-CudaMail-Originating-IP: 209.85.220.41 Date: Mon, 9 Nov 2015 10:56:08 -0800 X-ASG-Orig-Subj: [##CM-E2-1108062732##][PATCH 2/2] system-traffic: Add resubmit conntrack test. Message-Id: <1447095368-35700-2-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447095368-35700-1-git-send-email-joestringer@nicira.com> References: <1447095368-35700-1-git-send-email-joestringer@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1447095384 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: russell@ovn.org Subject: [ovs-dev] [PATCH 2/2] system-traffic: Add resubmit conntrack test. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" From: Russell Bryant This tests that resubmits return as expected when conntrack is used with recirculation to another table. Signed-off-by: Joe Stringer Signed-off-by: Russell Bryant --- Russell, I just tidied the test up a bit but I didn't see a sign-off on the original. Can you provide that? --- tests/system-traffic.at | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index 3b2de83f4c0d..162474d8e030 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -1266,3 +1266,42 @@ NS_CHECK_EXEC([at_ns0], [ping -s 3200 -q -c 3 -i 0.3 -w 2 10.1.1.100 | FORMAT_PI OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP + +AT_SETUP([conntrack - resubmit to ct multiple times]) +CHECK_CONNTRACK() + +OVS_TRAFFIC_VSWITCHD_START( + [set-fail-mode br0 secure -- ]) + +ADD_NAMESPACES(at_ns0, at_ns1) + +ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") +ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24") + +AT_DATA([flows.txt], [dnl +table=0,priority=150,arp,action=normal +table=0,priority=100,ip,in_port=1,action=resubmit(,1),resubmit(,2) + +table=1,priority=100,ip,action=ct(table=3) +table=2,priority=100,ip,action=ct(table=3) + +table=3,ip,action=drop +]) + +AT_CHECK([ovs-ofctl add-flows br0 flows.txt]) + +NS_CHECK_EXEC([at_ns0], [ping -q -c 1 10.1.1.2 | FORMAT_PING], [0], [dnl +1 packets transmitted, 0 received, 100% packet loss, time 0ms +]) + +AT_CHECK([ovs-ofctl dump-flows br0 | ofctl_strip | sort], [0], [dnl + n_packets=1, n_bytes=98, priority=100,ip,in_port=1 actions=resubmit(,1),resubmit(,2) + n_packets=2, n_bytes=84, priority=150,arp actions=NORMAL + table=1, n_packets=1, n_bytes=98, priority=100,ip actions=ct(table=3) + table=2, n_packets=1, n_bytes=98, priority=100,ip actions=ct(table=3) + table=3, n_packets=2, n_bytes=196, ip actions=drop +NXST_FLOW reply: +]) + +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP