From patchwork Fri May 25 15:03:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 920610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="faV74RNa"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40sqJn13J1z9s01 for ; Sat, 26 May 2018 01:03:52 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 26B94D7E; Fri, 25 May 2018 15:03:48 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D09934A4 for ; Fri, 25 May 2018 15:03:46 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6EAB4703 for ; Fri, 25 May 2018 15:03:46 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id i5-v6so3327120plt.2 for ; Fri, 25 May 2018 08:03:46 -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; bh=xua1tMuOt7AuK5pDn2O7MOUvV7cIdflaCzwQlahCxPA=; b=faV74RNaOESjQk1hshYGm7TuXRvtShllNduGoPVzf+g5WpEXZNnshq7rJX6dABqnrh mmsxqH8nTHt+n4RqweBPiFTbclojFeodzcnRe2rQUqFs0KjESbMXBihTun+erwQ1E6q5 D7W6WS72pxUQH3wJNOzP2cWNdUoZZsE4RVHpOQGIhV7fyz0edKdEr4ZrdBkTqkjkbpIX 6H4MoXuhWbd53JRExnkfwKm4V1mcDr+dUtWPj3h+DVB61HYwKwarbeR2s32A53SdPpEk WrAAkfIFrEq/vZmYPlCMlYr3RHA8ktlcMfvh1LjT7YZMbuOFRSk3Fbp0r0xkSMzXvuv1 xzUg== 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; bh=xua1tMuOt7AuK5pDn2O7MOUvV7cIdflaCzwQlahCxPA=; b=o3VFhURIiIqw+tjQrxwM2zzj+iuHGLemOWO78Ob5fBVpG9zDceLINO7YF9MU12g1Q7 uD7eKyeJJ51J9DoWHAYSdyOAmfjc3bFEfXuWUAspvDRb73992BP0ggNy2sTN1JLQ6BJi c93L5bwh6GxYHKX38vVkM16jI/2W4Zgt6r9w9aeYnm0YuEoa/HIgHc4TM4T7M1J+WJRn +66TedQYptb1OtzI7Y3hJc6LddgNh1VQ6IlBZThlA5JqxN5cJEAN5/mY0KwNeWRdIMzU YyWLV4a9TgPzAnM1ui9md2nIzI8s5vTYB9KVGI3AYb0f6X/bJyJV3cqz0wZJ93UpVB13 fE2A== X-Gm-Message-State: ALKqPwdlstiXS7qbh6Jako1OYxmL1tEOPvntvPyQ9zvxyBpbngs2MYio gmz+GAVzdgcWifiTGAH6BsQeXx8e X-Google-Smtp-Source: AB8JxZo9lajoXa2RvVJbPbUUQ/w7bHqDNyEqEAZXKkGQNkZkWsN7mwWnYTw/y8Ocma2pue1/0t2QBA== X-Received: by 2002:a17:902:b789:: with SMTP id e9-v6mr3026168pls.102.1527260625608; Fri, 25 May 2018 08:03:45 -0700 (PDT) Received: from sc9-mailhost3.vmware.com (c-73-231-16-221.hsd1.ca.comcast.net. [73.231.16.221]) by smtp.gmail.com with ESMTPSA id d186-v6sm40431046pfa.79.2018.05.25.08.03.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 May 2018 08:03:42 -0700 (PDT) From: William Tu To: dev@openvswitch.org Date: Fri, 25 May 2018 08:03:18 -0700 Message-Id: <1527260598-29211-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] erspan: add NXOXM_ET_ERSPAN_ field tests. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org ERSPAN is the first real-world use cases of Experimenter OXM, which introduces 4 new NXOXM_ET_ fields (ver, idx, dir, hwid). The patch adds test cases for these fields. Cc: Greg Rose Signed-off-by: William Tu --- tests/ovs-ofctl.at | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at index e1fc8299a2df..187433397a81 100644 --- a/tests/ovs-ofctl.at +++ b/tests/ovs-ofctl.at @@ -942,6 +942,12 @@ NXM_OF_ETH_TYPE(0800) NXM_NX_CT_LABEL_W(10203040506070809000a0b0c0d0e0f0/f1f2f3f NXM_NX_DP_HASH(01234567) NXOXM_ET_DP_HASH(01234567) +# ERSPAN (testing experimenter OXM). +NXOXM_ET_ERSPAN_VER(01) +NXOXM_ET_ERSPAN_IDX(01020304) +NXOXM_ET_ERSPAN_DIR(01) +NXOXM_ET_ERSPAN_HWID(12) + # Invalid field number. 01020304(1111/3333) @@ -1238,6 +1244,12 @@ NXM_OF_ETH_TYPE(0800), NXM_NX_CT_LABEL_W(10203040506070809000a0b0c0d0e0f0/f1f2f3 NXM_NX_DP_HASH(01234567) NXM_NX_DP_HASH(01234567) +# ERSPAN (testing experimenter OXM). +NXOXM_ET_ERSPAN_VER_W(01/01) +NXOXM_ET_ERSPAN_IDX(01020304) +NXOXM_ET_ERSPAN_DIR_W(01/01) +NXOXM_ET_ERSPAN_HWID_W(12/12) + # Invalid field number. nx_pull_match() returned error OFPBMC_BAD_FIELD @@ -2430,17 +2442,26 @@ NXOXM_ET_DP_HASH(01234567) NXM_NX_DP_HASH_W(01234567/0fffffff) NXOXM_ET_DP_HASH_W(01234567/0fffffff) + +NXOXM_ET_ERSPAN_VER(01) + +NXOXM_ET_ERSPAN_IDX(01020304) +NXOXM_ET_ERSPAN_IDX_W(01020304/0fffffff) + +NXOXM_ET_ERSPAN_DIR(01) + +NXOXM_ET_ERSPAN_HWID(12) ]) -# To allow for testing experimenter OXM, which doesn't really have many -# examples in the wild, we've defined a variant of NXM_NX_DP_HASH that uses -# the experimenter OXM mechanism, called NXOXM_ET_DP_HASH. We've defined +# To allow for testing experimenter OXM, we've defined a variant of NXM_NX_DP_HASH +# that uses the experimenter OXM mechanism, called NXOXM_ET_DP_HASH. We've defined # it as if it were introduced with OpenFlow 1.5, which gives us the # opportunity to see that both forms are accepted in all OpenFlow versions # but the experimenter form is used for encoding in OF1.5+. # # First verify that both forms are accepted and NXOXM_ET_DP_HASH is encoded -# in OF1.5. +# in OF1.5. Then verify the ERSPAN options, which exclusively use the +# Experimenter OXM. AT_CHECK([ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt], [0], [dnl NXOXM_ET_DP_HASH(01234567) 00000000 00 01 00 10 ff ff 00 08-00 00 23 20 01 23 45 67 @@ -2453,10 +2474,27 @@ NXOXM_ET_DP_HASH_W(01234567/0fffffff) NXOXM_ET_DP_HASH_W(01234567/0fffffff) 00000000 00 01 00 14 ff ff 01 0c-00 00 23 20 01 23 45 67 00000010 0f ff ff ff 00 00 00 00 + +NXOXM_ET_ERSPAN_VER_W(01/01) +00000000 00 01 00 0e ff ff 19 06-00 00 23 20 01 01 00 00 + +NXOXM_ET_ERSPAN_IDX(01020304) +00000000 00 01 00 10 ff ff 16 08-00 00 23 20 01 02 03 04 +NXOXM_ET_ERSPAN_IDX_W(01020304/0fffffff) +00000000 00 01 00 14 ff ff 17 0c-00 00 23 20 01 02 03 04 +00000010 0f ff ff ff 00 00 00 00 + +NXOXM_ET_ERSPAN_DIR_W(01/01) +00000000 00 01 00 0e ff ff 1b 06-00 00 23 20 01 01 00 00 + +NXOXM_ET_ERSPAN_HWID_W(12/12) +00000000 00 01 00 0e ff ff 1d 06-00 00 23 20 12 12 00 00 ]) # Then verify that both forms are accepted and NXM_NX_DP_HASH is encoded # in OF1.2. +# The NXOXM_ET_ERSPAN does not support in OF1.2, so it is +# encoded in OF1.5. AT_CHECK([ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt], [0], [dnl NXM_NX_DP_HASH(01234567) 00000000 00 01 00 0c 00 01 46 04-01 23 45 67 00 00 00 00 @@ -2467,6 +2505,21 @@ NXM_NX_DP_HASH_W(01234567/0fffffff) 00000000 00 01 00 10 00 01 47 08-01 23 45 67 0f ff ff ff NXM_NX_DP_HASH_W(01234567/0fffffff) 00000000 00 01 00 10 00 01 47 08-01 23 45 67 0f ff ff ff + +NXOXM_ET_ERSPAN_VER_W(01/01) +00000000 00 01 00 0e ff ff 19 06-00 00 23 20 01 01 00 00 + +NXOXM_ET_ERSPAN_IDX(01020304) +00000000 00 01 00 10 ff ff 16 08-00 00 23 20 01 02 03 04 +NXOXM_ET_ERSPAN_IDX_W(01020304/0fffffff) +00000000 00 01 00 14 ff ff 17 0c-00 00 23 20 01 02 03 04 +00000010 0f ff ff ff 00 00 00 00 + +NXOXM_ET_ERSPAN_DIR_W(01/01) +00000000 00 01 00 0e ff ff 1b 06-00 00 23 20 01 01 00 00 + +NXOXM_ET_ERSPAN_HWID_W(12/12) +00000000 00 01 00 0e ff ff 1d 06-00 00 23 20 12 12 00 00 ]) AT_CLEANUP