[dts][PATCH V2 1/2] test_plans/multicast_test_plan:remove dpdk code modification.

[dts][PATCH V2 1/2] test_plans/multicast_test_plan:remove dpdk code modification.

[Weiyuan Li]

Remove dpdk code modification from the test plan.

v2:
-Modify test plan step description.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 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
-- 
2.25.1

[dts][PATCH V2 2/2] tests/TestSuite_multicast: remove dpdk code modification.

[Weiyuan Li]

Remove dpdk code modification from the test script.

v2:
-Modify test plan step description.

Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 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']
-- 
2.25.1

RE: [dts][PATCH V2 1/2] test_plans/multicast_test_plan:remove dpdk code modification.

[Tu, Lijuan]

> -----Original Message-----
> From: Li, WeiyuanX <weiyuanx.li@intel.com>
> Sent: 2022年2月9日 1:06
> To: dts@dpdk.org; Tu, Lijuan <lijuan.tu@intel.com>
> Cc: Li, WeiyuanX <weiyuanx.li@intel.com>
> Subject: [dts][PATCH V2 1/2] test_plans/multicast_test_plan:remove dpdk code
> modification.
> 
> Remove dpdk code modification from the test plan.
> 
> v2:
> -Modify test plan step description.
> 
> Signed-off-by: Weiyuan Li <weiyuanx.li@intel.com>

Series applied.