From patchwork Tue Oct 10 20:33:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1846078 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=YIARqE1r; 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 4S4ngy2tdTz1yq3 for ; Wed, 11 Oct 2023 07:34:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3C85D82400; Tue, 10 Oct 2023 20:34:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3C85D82400 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=YIARqE1r 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 xC_G8tlwSEXZ; Tue, 10 Oct 2023 20:34:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 0835F82350; Tue, 10 Oct 2023 20:34:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0835F82350 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 19AD9C0DEF; Tue, 10 Oct 2023 20:34:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0FDB0C0DE6 for ; Tue, 10 Oct 2023 20:34:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9540D4090E for ; Tue, 10 Oct 2023 20:34:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9540D4090E Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YIARqE1r X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vyrijpBRMIJm for ; Tue, 10 Oct 2023 20:34:10 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by smtp2.osuosl.org (Postfix) with ESMTPS id 6162C4149C for ; Tue, 10 Oct 2023 20:34:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6162C4149C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696970049; 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=hQ1dKvhNbR2mEaEdB5w6PjPfmX2Y3mo961P4Pad/Umg=; b=YIARqE1rfmz/sDKiEkh83MZW97l/VydiEevkXp3uRXzRHFxhlW0I/GAKkm3JppscYaBtNn aeo7N50DDRc/MVkc9CpGPLWuHPEBhxv08z+xw2LySdHEU1Sj4jcq0j+WTvkoixdRIQN1JY hLb877w5z0aJV2IGXQPKSDQndVoZ/Ok= 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-537-XUZgvGuQO9OWEj9Rs5759Q-1; Tue, 10 Oct 2023 16:34:07 -0400 X-MC-Unique: XUZgvGuQO9OWEj9Rs5759Q-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 A5E5A887E41 for ; Tue, 10 Oct 2023 20:34:07 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.22.48.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4777940C6F7F for ; Tue, 10 Oct 2023 20:34:07 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Tue, 10 Oct 2023 16:33:57 -0400 Message-Id: <20231010203400.1045353-12-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 11/13] tests: Use fmt_pkt in 2 HVs, 3 LRs connected via LS, static routes. 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" Execution time: 4.308s Execution time on "main" branch: 3.170s Signed-off-by: Mark Michelson --- tests/ovn.at | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/tests/ovn.at b/tests/ovn.at index 5df6740ff..2d261a9b8 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -6484,20 +6484,24 @@ wait_for_ports_up check ovn-nbctl --wait=hv sync # Send ip packets between foo1 and alice1 -src_mac="f00000010203" -dst_mac="000001010203" -src_ip=`ip_to_hex 192 168 1 2` -dst_ip=`ip_to_hex 172 16 1 2` -packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000 +src_mac="f0:00:00:01:02:03" +dst_mac="00:00:01:01:02:03" +src_ip=192.168.1.2 +dst_ip=172.16.1.2 +packet=$(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \ + IP(src='${src_ip}', dst='${dst_ip}')/ \ + UDP(sport=53, dport=4369)") as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet # Send ip packets between foo1 and bob1 -src_mac="f00000010203" -dst_mac="000001010203" -src_ip=`ip_to_hex 192 168 1 2` -dst_ip=`ip_to_hex 10 32 1 2` -packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000 +src_mac="f0:00:00:01:02:03" +dst_mac="00:00:01:01:02:03" +src_ip=192.168.1.2 +dst_ip=10.32.1.2 +packet=$(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \ + IP(src='${src_ip}', dst='${dst_ip}')/ \ + UDP(sport=53, dport=4369)") as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet echo "---------NB dump-----" @@ -6525,20 +6529,24 @@ as hv2 ovs-ofctl dump-flows br-int echo "----------------------------" # Packet to Expect at bob1 -src_mac="000003010203" -dst_mac="f00000010205" -src_ip=`ip_to_hex 192 168 1 2` -dst_ip=`ip_to_hex 10 32 1 2` -echo "${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}0035111100080000" > expected +src_mac="00:00:03:01:02:03" +dst_mac="f0:00:00:01:02:05" +src_ip=192.168.1.2 +dst_ip=10.32.1.2 +echo $(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \ + IP(src='${src_ip}', dst='${dst_ip}', ttl=0x3e)/ \ + UDP(sport=53, dport=4369)") > expected OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected]) # Packet to Expect at alice1 -src_mac="000002010203" -dst_mac="f00000010204" -src_ip=`ip_to_hex 192 168 1 2` -dst_ip=`ip_to_hex 172 16 1 2` -echo "${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}0035111100080000" > expected +src_mac="00:00:02:01:02:03" +dst_mac="f0:00:00:01:02:04" +src_ip=192.168.1.2 +dst_ip=172.16.1.2 +echo $(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \ + IP(src='${src_ip}', dst='${dst_ip}', ttl=0x3e)/ \ + UDP(sport=53, dport=4369)") > expected OVN_CHECK_PACKETS([hv1/vif2-tx.pcap], [expected])