From patchwork Tue Feb 8 17:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 107008 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 90715A04AD; Tue, 8 Feb 2022 10:04:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8694F4111B; Tue, 8 Feb 2022 10:04:12 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 56A3A410F6 for ; Tue, 8 Feb 2022 10:04:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644311051; x=1675847051; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PQoUmmBArIxcEuFVb6v6CTeQ8VHy/IMwuTKD1ur8sco=; b=aAbWlW8RcT9PQAYNDAqTPyAoUgJ1yeE+Fax1hDxBHk03gcwoPmS8eG2F sl++f7R2D+RozpQIWjdYs5X+hxWM+cS7MDNr4IVeu7IA3Ph9l1PA8W0Mw b07Z4LNbz9lrCvc5dIZqNbQtUNUl+ffZV8XckL1ZN4NQU33+mNHNEHH46 iE5QnJnLBVLpiTQdaY9wYyfXqNVv9cYpRbnqDnUjlXfcpXMlIdMlmAqb8 uTz4ocb2CUz5D1wNrLG+H+7nUYveC01/Lu5fiHLKdKhJSftSbFyvVzVF0 qDg49+P3W6XJkmI3cF3kbOkLdDWbzbURq0LIiOIR/0GvvoYtCo/eVLosV A==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="232472770" X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="232472770" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 01:03:55 -0800 X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="540512736" Received: from unknown (HELO localhost.localdomain) ([10.239.251.22]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 01:03:53 -0800 From: Weiyuan Li To: dts@dpdk.org, lijuan.tu@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V2 1/2] test_plans/multicast_test_plan:remove dpdk code modification. Date: Tue, 8 Feb 2022 17:06:12 +0000 Message-Id: <20220208170613.25632-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. v2: -Modify test plan step description. Signed-off-by: Weiyuan Li --- test_plans/multicast_test_plan.rst | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/test_plans/multicast_test_plan.rst b/test_plans/multicast_test_plan.rst index 368c857c..87b3dc78 100644 --- a/test_plans/multicast_test_plan.rst +++ b/test_plans/multicast_test_plan.rst @@ -195,27 +195,7 @@ 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:: +6.Compile examples/ipv4_multicast:: meson configure -Dexamples=ipv4_multicast x86_64-native-linuxapp-gcc ninja -C x86_64-native-linuxapp-gcc From patchwork Tue Feb 8 17:06:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weiyuan Li X-Patchwork-Id: 107009 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 AD5B4A04AE; Tue, 8 Feb 2022 10:04:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5735410FC; Tue, 8 Feb 2022 10:04:13 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 2029F410F6 for ; Tue, 8 Feb 2022 10:04:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644311052; x=1675847052; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UnoAeHKIhfTvxHnY7/79xRK6Plt+S/96O5GwCHDXzQs=; b=mArLLjfZaLgoECHKUann3lTjF5m4uA+yFMqeyw6YuYaA6sc4pPhnwgyL XLi+zF64QfBbP46TuRfRQw4z7txLd2VfBWFJ7D6NebSc8zj5U7BANemQ1 Y0h6kMTnuSbxumQeKoQSrnTyOhSN5mQEkQGTPYVsaW8NHGeqizidjIk19 ueqxSI3wvkXwB5oiF2FU4aEnsY1xVvSVCR8O6/CZBU/kkz0fkdlWdsu9v HuhsnhfCQE6SAayfheNzqLv8MXstrXkTEYm2+EF4MAeI1cxOuuinVemzw GtnXd0khZg6hsisE/b3fnU1E07vQU2azIA+UPq+U6lQ2fjJv65oXin9Ku g==; X-IronPort-AV: E=McAfee;i="6200,9189,10251"; a="232472773" X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="232472773" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 01:03:57 -0800 X-IronPort-AV: E=Sophos;i="5.88,352,1635231600"; d="scan'208";a="540512743" Received: from unknown (HELO localhost.localdomain) ([10.239.251.22]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 01:03:55 -0800 From: Weiyuan Li To: dts@dpdk.org, lijuan.tu@intel.com Cc: Weiyuan Li Subject: [dts][PATCH V2 2/2] tests/TestSuite_multicast: remove dpdk code modification. Date: Tue, 8 Feb 2022 17:06:13 +0000 Message-Id: <20220208170613.25632-2-weiyuanx.li@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208170613.25632-1-weiyuanx.li@intel.com> References: <20220208170613.25632-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. v2: -Modify test plan step description. 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']