From patchwork Tue Mar 19 06:50:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ales Musil X-Patchwork-Id: 1913379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Wo5lEGz5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TzMn31Ty1z1yWv for ; Tue, 19 Mar 2024 17:50:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D616181434; Tue, 19 Mar 2024 06:50:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yyR1RKUNEVX3; Tue, 19 Mar 2024 06:50:42 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E81F481765 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Wo5lEGz5 Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id E81F481765; Tue, 19 Mar 2024 06:50:41 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 899CEC0077; Tue, 19 Mar 2024 06:50:41 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 02384C0037 for ; Tue, 19 Mar 2024 06:50:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D05186085D for ; Tue, 19 Mar 2024 06:50:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1tWyKjOd4kZ9 for ; Tue, 19 Mar 2024 06:50:39 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=amusil@redhat.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org BDC5660776 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BDC5660776 Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Wo5lEGz5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id BDC5660776 for ; Tue, 19 Mar 2024 06:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710831037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UW10DbClFEitMqWMv86fgl/I2v2HqQ3FD8lioh1md8M=; b=Wo5lEGz5ovB/s2H5gQNeLWG6mJqhN8rWeKHX/x3USkXfmsskxZTiHiHDiG3+QjbnY3342n dWtOB+dMD0IACa7g/VeegpbblBA6UJPHODCV2Jdm9/nDREbrk7l0DVnD4TbuVttwefjZrs 8mj2BPFDk4Gsf45j6klwYmgFQ6X28RM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-NAGypAxqPjaFUBIn7sg8aw-1; Tue, 19 Mar 2024 02:50:35 -0400 X-MC-Unique: NAGypAxqPjaFUBIn7sg8aw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4FB04101A56C for ; Tue, 19 Mar 2024 06:50:35 +0000 (UTC) Received: from amusil.brq.redhat.com (unknown [10.43.17.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id B92061C060A6; Tue, 19 Mar 2024 06:50:34 +0000 (UTC) From: Ales Musil To: dev@openvswitch.org Date: Tue, 19 Mar 2024 07:50:32 +0100 Message-ID: <20240319065032.274398-2-amusil@redhat.com> In-Reply-To: <20240319065032.274398-1-amusil@redhat.com> References: <20240319065032.274398-1-amusil@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: dceara@redhat.com Subject: [ovs-dev] [PATCH ovn v4 2/2] tests: Address netcat 7.94 changes. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Fedora received an update of netcat to version 7.94, this version brings ability for UDP to accept multiple connections without closing (-k/--keep-open) [0]. That had negative impact on the tests as the UDP netcat server was closing sooner that expected. Make sure that the server is alive when we expect it to and avoid checking kill of server that might be already finished. [0] https://github.com/nmap/nmap/issues/1223 Signed-off-by: Ales Musil --- v4: Rebase on top of current main. --- tests/system-ovn-kmod.at | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/system-ovn-kmod.at b/tests/system-ovn-kmod.at index fed31114c..63ecc7ff4 100644 --- a/tests/system-ovn-kmod.at +++ b/tests/system-ovn-kmod.at @@ -684,7 +684,7 @@ test_fragmented_traffic() { NS_CHECK_EXEC([client], [$PYTHON3 ./client.py]) OVS_WAIT_UNTIL([test "$(cat tcpdump-server.tcpdump | wc -l)" = "4"]) - check kill $(cat tcpdump-client.pid) $(cat tcpdump-server.pid) $(cat server.pid) + kill $(cat tcpdump-client.pid) $(cat tcpdump-server.pid) $(cat server.pid) } AS_BOX([LB on router without port and protocol]) @@ -821,8 +821,7 @@ wait_for_ports_up check ovn-nbctl --wait=hv sync # Create service that listens for TCP and UDP -NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc0.pid]) -NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc1.pid]) +NETNS_DAEMONIZE([vm2], [nc -l -k 1235], [nc0.pid]) test_icmp() { # Make sure that a ping works as expected @@ -846,7 +845,9 @@ icmp,orig=(src=173.0.1.2,dst=172.16.0.102,id=,type=8,code=0),reply=(src } test_udp() { + NETNS_DAEMONIZE([vm2], [nc -l -u 1234], [nc1.pid]) NS_CHECK_EXEC([vm1], [nc -u 30.0.0.1 1234 -p 1222 -z]) + kill $(cat nc1.pid) AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(30.0.0.1) | \ sed -e 's/zone=[[0-9]]*/zone=/'], [0], [dnl