From patchwork Tue Feb 8 13:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 106993 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 92AA7A04AD; Tue, 8 Feb 2022 06:38:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E3574014E; Tue, 8 Feb 2022 06:38:25 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id A1DE840141 for ; Tue, 8 Feb 2022 06:38:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644298703; x=1675834703; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=4h4yf/feCplQ521JMojLeZK/vW96Km1EgXda7YYVqLE=; b=kDnQCfHGxAlGAROEysBv7sfqMjvtBDZzNd3Bsdi6Mkq7/tIlT1j0eMpT mGLsUJXCdZRkqoMef92bObiqId9ZSoSL42j20UQ2vYw6vhwQ3ExOHKH/W +iopy2sMiRt7uWvZ+6e46SAQ95H8B2VScTPuYu5RIV7Letg3PXu1Xqnft cr7gfPASjoI8LaFgZmGAz5RW+6TsXgcrZu5iOB2hG0cVROdWb0x8tZsaa o6c9ZLMHbW1NmFX9GAq21dfroh2vzutbMJ+1YEbxufjUvylVdqI9QybcE 9acPMsfZBSClgN55siJBbtrg3KSLhTyrScWg22MMS4MRPbudDXtGx6t5n w==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="312175260" X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="312175260" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:38:22 -0800 X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="525415185" Received: from unknown (HELO localhost.localdomain) ([10.239.251.22]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:38:21 -0800 From: Weiyuan Li To: dts@dpdk.org, lijuan.tu@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V1 1/2] test_plans/multicast_test_plan: remove dpdk code modification. Date: Tue, 8 Feb 2022 13:40:40 +0000 Message-Id: <20220208134041.9183-1-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org remove dpdk code modification from the test plan. Signed-off-by: Weiyuan Li --- test_plans/multicast_test_plan.rst | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/test_plans/multicast_test_plan.rst b/test_plans/multicast_test_plan.rst index 368c857c..7c6765cf 100644 --- a/test_plans/multicast_test_plan.rst +++ b/test_plans/multicast_test_plan.rst @@ -195,26 +195,6 @@ P0 and P2 are used on testing machine): These flows do not change across the test cases. -6.Modify multicast route table:: - - sed -i '/mcast_group_table\[\].*{/,/^\}\;/c\\static struct mcast_group_params mcast_group_table[] = {\ - {RTE_IPV4(224,0,0,101),1},\ - {RTE_IPV4(224,0,0,102),2},\ - {RTE_IPV4(224,0,0,103),3},\ - {RTE_IPV4(224,0,0,104),4},\ - {RTE_IPV4(224,0,0,105),5},\ - {RTE_IPV4(224,0,0,106),6},\ - {RTE_IPV4(224,0,0,107),7},\ - {RTE_IPV4(224,0,0,108),8},\ - {RTE_IPV4(224,0,0,109),9},\ - {RTE_IPV4(224,0,0,110),10},\ - {RTE_IPV4(224,0,0,111),11},\ - {RTE_IPV4(224,0,0,112),12},\ - {RTE_IPV4(224,0,0,113),13},\ - {RTE_IPV4(224,0,0,114),14},\ - {RTE_IPV4(224,0,0,115),15},\ - };' examples/ipv4_multicast/main.c - And re-compile examples/ipv4_multicast:: meson configure -Dexamples=ipv4_multicast x86_64-native-linuxapp-gcc From patchwork Tue Feb 8 13:40:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 106994 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85A99A04AE; Tue, 8 Feb 2022 06:38:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77AD141101; Tue, 8 Feb 2022 06:38:26 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 9455440141 for ; Tue, 8 Feb 2022 06:38:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644298704; x=1675834704; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5pMS+ZZcuT6tcRxJFa7RBlnc0b9Qw/5dgGx/do+KnsM=; b=iMAQ4sJXhiNcIhPSaomkh0MWkZqy1xwQDJr6bloomnByuT3T4dYhSoHy qZzX7QFr6s3gFi1t1Cdlyfr4PpiQQmmqZzD6fVcf6AJnzM1qSO8bHiFQI VnsJkTPpRQy2gHvf5hUDlcGIcd2sr4wfLKDb7JUnuvOdy8UWoXftHF86J xdZLXRv5yiZSYRDuUCj0gLq/Hq5Vwgy86wQ0UWdLQ5hC8xiCwyyCFh1rY p9jF/TTVSrwx4pubj13+coE1DhozMwAQkEWHf9dBpWjCkrdKXjbdfoMfW UhmZIvuf7VW7XjJZzEpb+2x+glLTtRQEmzQv9LS1mEhayxjpwNMAflv0H w==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="312175272" X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="312175272" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:38:24 -0800 X-IronPort-AV: E=Sophos;i="5.88,351,1635231600"; d="scan'208";a="525415192" Received: from unknown (HELO localhost.localdomain) ([10.239.251.22]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2022 21:38:22 -0800 From: Weiyuan Li To: dts@dpdk.org, lijuan.tu@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V1 2/2] tests/TestSuite_multicast: remove dpdk code modification. Date: Tue, 8 Feb 2022 13:40:41 +0000 Message-Id: <20220208134041.9183-2-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208134041.9183-1-weiyuanx.li@intel.com> References: <20220208134041.9183-1-weiyuanx.li@intel.com> MIME-Version: 1.0 X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Remove dpdk code modification from the test script. Signed-off-by: Weiyuan Li --- tests/TestSuite_multicast.py | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/tests/TestSuite_multicast.py b/tests/TestSuite_multicast.py index dacdb6f2..99a872f8 100644 --- a/tests/TestSuite_multicast.py +++ b/tests/TestSuite_multicast.py @@ -40,17 +40,6 @@ import time import framework.utils as utils from framework.test_case import TestCase -routeTbl = [ - ["224.0.0.101", "P1"], ["224.0.0.102", "P2"], - ["224.0.0.103", "P1,P2"], ["224.0.0.104", "P3"], - ["224.0.0.105", "P1,P3"], ["224.0.0.106", "P2,P3"], - ["224.0.0.107", "P1,P2,P3"], ["224.0.0.108", "P4"], - ["224.0.0.109", "P1,P4"], ["224.0.0.110", "P2,P4"], - ["224.0.0.111", "P1,P2,P4"], ["224.0.0.112", "P3,P4"], - ["224.0.0.113", "P1,P3,P4"], ["224.0.0.114", "P2,P3,P4"], - ["224.0.0.115", "P1,P2,P3,P4"] -] - trafficFlow = { "F1": ["TG0", "TG0", "10.100.0.1", "224.0.0.101"], "F2": ["TG0", "TG1", "10.100.0.2", "224.0.0.104"], @@ -100,18 +89,6 @@ class TestMulticast(TestCase): TG0 = self.tester.get_local_port(TGs[0]) TG1 = self.tester.get_local_port(TGs[1]) - # Prepare multicast route table, replace P(x) port pattern - repStr = "static struct mcast_group_params mcast_group_table[] = {\\\n" - for [ip, ports] in routeTbl: - mask = 0 - for _ in ports.split(','): - mask = mask | (1 << eval(_)) - entry = '{' + 'RTE_IPV4(' + ip.replace('.', ',') + '),' + str(mask) + '}' - repStr = repStr + ' ' * 4 + entry + ",\\\n" - repStr = repStr + "};" - - self.dut.send_expect(r"sed -i '/mcast_group_table\[\].*{/,/^\}\;/c\\%s' examples/ipv4_multicast/main.c" % repStr, "# ") - # make application out = self.dut.build_dpdk_apps('examples/ipv4_multicast') self.app_ipv4_multicast_path = self.dut.apps_name['ipv4_multicast']