From patchwork Wed Jun 9 13:36:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Varghese X-Patchwork-Id: 1489885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwvPc+mq; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G0Sn45Rwwz9sRN for ; Wed, 9 Jun 2021 23:36:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 97D3A60A55; Wed, 9 Jun 2021 13:36:21 +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 Tsme7O-JvXyJ; Wed, 9 Jun 2021 13:36:20 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id BC7E960633; Wed, 9 Jun 2021 13:36:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6FBA2C000E; Wed, 9 Jun 2021 13:36:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id C4E25C000B for ; Wed, 9 Jun 2021 13:36:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A736183CA8 for ; Wed, 9 Jun 2021 13:36:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 IGz99FNlqZRv for ; Wed, 9 Jun 2021 13:36:18 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1D6A683CA7 for ; Wed, 9 Jun 2021 13:36:18 +0000 (UTC) Received: by mail-pj1-x102d.google.com with SMTP id ei4so1348142pjb.3 for ; Wed, 09 Jun 2021 06:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4RnvknT5Wk9PYAK8XIy8SHXk6df5luMRelJffkR0YTs=; b=EwvPc+mqXUd+kOCwpBIckt9kyhOGzt5nFoEm1bCUo96x0C9ZCVbhBqR3bC7E9ccvC7 xYHwtKFBHt9ZPUWNbpci9E5NGd4P+kUNUB4GZd6cCwTUOlF23+Uf6hU7SoLnLUhAJIkW TQIlUc/IhxdgnLLXO+LTMft873l1DqfnK4m7JsgHy3tB2CVfEYa5yDpZhcLlW+xIT0Z7 DV4bHOjGbqwqnobWWk4B0hMyH3TwZa18lOuLnFrmzFJvnRCsLn3Y/EXsgiggaCXlds58 CimE2G/vXPA2VuFEsC6wfZo/Go58UDyZqoCSaoZ4vtW9b3wBjYPOSMDjSnNLnFafq6iI HCdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4RnvknT5Wk9PYAK8XIy8SHXk6df5luMRelJffkR0YTs=; b=sk31zd9eLwv07yQhqWWqSKfrXZJcpTmUtvBo4vNzf4uvO69rbTxNh6NY+xboaZuXL9 m5R4fwQ7NSiArMaB5E00tjwu15ATq2760z35GVFlISpTN2Jwv9Pv/Cvkj9DNUM6cmSH9 4dPfsBkd783rs8KKDNG1KNKyHyN373sbmPU8sYuPfGDS4rdVE6RbDDke6n7J3tc8wzlZ VKSJRR3k1M63IzKWHLtuDJ5ObAAV6ybliEoM4r/TcLoXQDHlfuICa0rbp/CK+XWhgH8h M1wW3QvMndH8VQwvdC2VaFM1RZKSSBKxoj8N8sR429Z14I8xbWIkYWLShEZwqZLEk01K aFJg== X-Gm-Message-State: AOAM531aaON9CePoF7WKCnA9Zbz0HULlEf+OrY/a6ZG229O/tT24UBtD UahaloF7Tyk/+1k4+IaKtUs= X-Google-Smtp-Source: ABdhPJymaWmVlE4+k1WWxYVKOWCmxb4LzbLkdJcG1Gi/F5HKZ5SguIsJwSUCJTRT3VO+OjBJHe2eDQ== X-Received: by 2002:a17:90a:390d:: with SMTP id y13mr10471301pjb.133.1623245777557; Wed, 09 Jun 2021 06:36:17 -0700 (PDT) Received: from martin-ubuntu ([111.92.77.154]) by smtp.gmail.com with ESMTPSA id i21sm13549682pfd.219.2021.06.09.06.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:36:17 -0700 (PDT) From: Martin Varghese To: dev@openvswitch.org, i.maximets@ovn.org, jan.scheurich@ericsson.com Date: Wed, 9 Jun 2021 19:06:11 +0530 Message-Id: <20210609133611.2013-1-martinvarghesenokia@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Cc: Martin Varghese Subject: [ovs-dev] [PATCH] tests: Fixed L3 over patch port tests 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" From: Martin Varghese Normal action is replaced with output to GRE port for sending l3 packets over GRE tunnel. Normal action cannot be used with l3 packets. Fixes: d03d0cf2b71b ("tests: Extend PTAP unit tests with decap action") Signed-off-by: Martin Varghese Acked-by: Jan Scheurich --- tests/packet-type-aware.at | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/packet-type-aware.at b/tests/packet-type-aware.at index 540cf98f3..73aa14cea 100644 --- a/tests/packet-type-aware.at +++ b/tests/packet-type-aware.at @@ -697,7 +697,7 @@ AT_CHECK([ ovs-ofctl del-flows br1 && ovs-ofctl del-flows br2 && ovs-ofctl add-flow br0 in_port=n0,actions=decap,output=p0 -OOpenFlow13 && - ovs-ofctl add-flow br1 in_port=p1,actions=NORMAL && + ovs-ofctl add-flow br1 in_port=p1,actions=output=gre1 && ovs-ofctl add-flow br2 in_port=LOCAL,actions=output=n2 ], [0]) @@ -708,7 +708,7 @@ AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br0 | ofctl_strip | grep actions], AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br1 | ofctl_strip | grep actions], [0], [dnl - reset_counts in_port=20 actions=NORMAL + reset_counts in_port=20 actions=output:100 ]) AT_CHECK([ovs-ofctl -OOpenFlow13 dump-flows br2 | ofctl_strip | grep actions], @@ -726,7 +726,7 @@ ovs-appctl time/warp 1000 AT_CHECK([ ovs-appctl dpctl/dump-flows --names dummy@ovs-dummy | strip_used | grep -v ipv6 | sort ], [0], [flow-dump from the main thread: -recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),eth_type(0x0800),ipv4(tos=0/0x3,frag=no), packets:1, bytes:98, used:0.0s, actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3,eth(dst=de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(src=10.0.0.1,dst=10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x0,proto=0x800))),out_port(br2)),n2) +recirc_id(0),in_port(n0),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(tos=0/0x3,frag=no), packets:1, bytes:98, used:0.0s, actions:pop_eth,clone(tnl_push(tnl_port(gre_sys),header(size=38,type=3,eth(dst=de:af:be:ef:ba:be,src=aa:55:00:00:00:02,dl_type=0x0800),ipv4(src=10.0.0.1,dst=10.0.0.2,proto=47,tos=0,ttl=64,frag=0x4000),gre((flags=0x0,proto=0x800))),out_port(br2)),n2) ]) AT_CHECK([