From patchwork Tue Oct 10 20:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1846073 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=VaNRcwMc; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4S4ngc6MVBz1yq7 for ; Wed, 11 Oct 2023 07:34:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 99C0941DF5; Tue, 10 Oct 2023 20:34:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 99C0941DF5 Authentication-Results: smtp4.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=VaNRcwMc X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DY7USDHzFU6c; Tue, 10 Oct 2023 20:34:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9E189419D6; Tue, 10 Oct 2023 20:34:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9E189419D6 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A978BC0DDB; Tue, 10 Oct 2023 20:34:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 364D1C0032 for ; Tue, 10 Oct 2023 20:34:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 28C5841B5D for ; Tue, 10 Oct 2023 20:34:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 28C5841B5D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j9is3zy0bpUv for ; Tue, 10 Oct 2023 20:34:06 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0522941B66 for ; Tue, 10 Oct 2023 20:34:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0522941B66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696970045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n/hy0B3ukYlYk0sRcy3wCerkOKEbFZ5gXTsG0/KtbxE=; b=VaNRcwMcLboCqW9BdDOPzJXeWCTHR9Fn+Hn3yyH90Ng229Mehgia/+47QP1E5/oJKL/6MK XHEp8D9/N/yxtNdQTuWHiXSXKC+TxA3lD+EyhBSIIIJCv9MPCw6o1X71PUs2Qd7Q9M+ZP2 l3Hi6hEJwLH1FfprOjio48sWtHxyH6M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-nxKf-TUTPHKeadBc71jq3g-1; Tue, 10 Oct 2023 16:34:03 -0400 X-MC-Unique: nxKf-TUTPHKeadBc71jq3g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 080B6101A59B for ; Tue, 10 Oct 2023 20:34:03 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EBAE40C6F79 for ; Tue, 10 Oct 2023 20:34:02 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 10 Oct 2023 16:33:49 -0400 Message-Id: <20231010203400.1045353-4-mmichels@redhat.com> In-Reply-To: <20231010203400.1045353-1-mmichels@redhat.com> References: <20231010203400.1045353-1-mmichels@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn 03/13] tests: Use fmt_pkt in VLAN transparency, ... 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" ...passthru=true, ARP responder disabled Execution time: 2.466s Execution time on "main" branch: 1.751s Signed-off-by: Mark Michelson --- tests/ovn.at | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index a8c483098..df2b0c774 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -3701,12 +3701,15 @@ done test_arp() { local inport=$1 outport=$2 sha=$3 spa=$4 tpa=$5 reply_ha=$6 - tag=8100fefe - local request=ffffffffffff${sha}${tag}08060001080006040001${sha}${spa}ffffffffffff${tpa} + local request=$(fmt_pkt "Ether(dst='ff:ff:ff:ff:ff:ff', src='${sha}')/ \ + Dot1Q(vlan=0xefe)/ \ + ARP(hwsrc='${sha}', hwdst='ff:ff:ff:ff:ff:ff', psrc='${spa}', pdst='${tpa}')") as hv-$inport ovs-appctl netdev-dummy/receive vif$inport $request echo $request >> $outport.expected - local reply=${sha}${reply_ha}${tag}08060001080006040002${reply_ha}${tpa}${sha}${spa} + local reply=$(fmt_pkt "Ether(dst='${sha}', src='${reply_ha}')/ \ + Dot1Q(vlan=0xefe)/ \ + ARP(op=2, hwsrc='${reply_ha}', hwdst='${sha}', psrc='${tpa}', pdst='${spa}')") as hv-$outport ovs-appctl netdev-dummy/receive vif$outport $reply echo $reply >> $inport.expected } @@ -3716,8 +3719,8 @@ test_arp() { # for ARP resolution). OVN_POPULATE_ARP -test_arp 1 2 f00000000001 0a000001 0a000002 f00000000002 -test_arp 2 1 f00000000002 0a000002 0a000001 f00000000001 +test_arp 1 2 f0:00:00:00:00:01 10.0.0.1 10.0.0.1 f0:00:00:00:00:02 +test_arp 2 1 f0:00:00:00:00:02 10.0.0.2 10.0.0.1 f0:00:00:00:00:01 for i in 1 2; do OVN_CHECK_PACKETS([vif$i-tx.pcap], [$i.expected])