[dts][PATCH V1 0/2] rename slave to worker according to dpdk20.11 change

[dts][PATCH V1 0/2] rename slave to worker according to dpdk20.11 change

[Yu Jiang]

rename slave to worker according to dpdk20.11 change

Yu Jiang (2):
  test_plans/virtio_ipsec_cryptodev_func: rename slave to worker
    according to dpdk20.11 change
  tests/l2fwd_cryptodev_func: rename slave to worker according to
    dpdk20.11 change

 .../virtio_ipsec_cryptodev_func_test_plan.rst    |  2 +-
 tests/TestSuite_l2fwd_cryptodev_func.py          | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

-- 
2.25.1

[dts][PATCH V1 1/2] test_plans/virtio_ipsec_cryptodev_func: rename slave to worker according to dpdk20.11 change

[Yu Jiang]

According to dpdk20.11 commit id:
  28f5375d83 test/crypto: rename slave to worker
  85b00824ae crypto/scheduler: rename slave to worker
rename slave to worker.

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/virtio_ipsec_cryptodev_func_test_plan.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
index cb390181..d0e109d1 100644
--- a/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
+++ b/test_plans/virtio_ipsec_cryptodev_func_test_plan.rst
@@ -101,7 +101,7 @@ In Host:
     ./x86_64-native-linuxapp-gcc/examples/dpdk-vhost_crypto \
     --socket-mem 2048,0 --legacy-mem \
     -a 1a:01.0 -a 1c:01.0 -a 1e:01.0 \
-    --vdev crypto_scheduler_pmd_1,slave=0000:1a:01.0_qat_sym,slave=0000:1c:01.0_qat_sym,slave=0000:1e:01.0_qat_sym,mode=round-robin,ordering=enable \
+    --vdev crypto_scheduler_pmd_1,worker=0000:1a:01.0_qat_sym,worker=0000:1c:01.0_qat_sym,worker=0000:1e:01.0_qat_sym,mode=round-robin,ordering=enable \
     -l 8,9,10,11,12 -n 6 \
     -- --config "(9,0,0),(10,0,0),(11,0,0),(12,0,0)" \
     --socket-file 9,/tmp/vm0_crypto0.sock  \
-- 
2.25.1

[dts][PATCH V1 2/2] tests/l2fwd_cryptodev_func: rename slave to worker according to dpdk20.11 change

[Yu Jiang]

According to dpdk20.11 commit id:
  28f5375d83 test/crypto: rename slave to worker
  85b00824ae crypto/scheduler: rename slave to worker
rename slave to worker.

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 tests/TestSuite_l2fwd_cryptodev_func.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
index 5c4634a8..58e6d8fb 100644
--- a/tests/TestSuite_l2fwd_cryptodev_func.py
+++ b/tests/TestSuite_l2fwd_cryptodev_func.py
@@ -183,7 +183,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_rr_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=3))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,worker=%s_qat_sym,\
                 mode=round-robin"
             % tuple(cc.get_qat_devices(self, num=3))
         )
@@ -195,7 +195,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a 0000:00:00.0 --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_aesni_mb2,name=aesni_mb_2"
         vdev += " --vdev crypto_aesni_mb3,name=aesni_mb_3"
-        vdev += " --vdev crypto_scheduler0,slave=aesni_mb_1,slave=aesni_mb_2,slave=aesni_mb_3,mode=round-robin"
+        vdev += " --vdev crypto_scheduler0,worker=aesni_mb_1,worker=aesni_mb_2,worker=aesni_mb_3,mode=round-robin"
         test_vectors["scheduler_AES_GCM_00"]["vdev"] = vdev
         test_vectors["scheduler_AES_GCM_00"]["mode"] = "rr"
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_GCM_00")
@@ -203,7 +203,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_psb_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,\
                 mode=packet-size-distr"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -215,7 +215,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=packet-size-distr"
             % tuple(cc.get_qat_devices(self, num=1))
         )
@@ -226,7 +226,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_fo_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,\
                 mode=fail-over"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -238,7 +238,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=fail-over"
             % tuple(cc.get_qat_devices(self, num=1))
         )
@@ -249,7 +249,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_mm_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym\
                 mode=multi-core"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -261,7 +261,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=multi-core"
             % tuple(cc.get_qat_devices(self, num=1))
         )
-- 
2.25.1

RE: [dts][PATCH V1 2/2] tests/l2fwd_cryptodev_func: rename slave to worker according to dpdk20.11 change

[S, Varalakshmi]

Tested-by: varalakshmi.s@intel.com

Regards,
S Varalakshmi

-----Original Message-----
From: Jiang, YuX <yux.jiang@intel.com> 
Sent: Friday, April 14, 2023 11:14 AM
To: S, Varalakshmi <varalakshmi.s@intel.com>; dts@dpdk.org
Cc: Jiang, YuX <yux.jiang@intel.com>
Subject: [dts][PATCH V1 2/2] tests/l2fwd_cryptodev_func: rename slave to worker according to dpdk20.11 change

According to dpdk20.11 commit id:
  28f5375d83 test/crypto: rename slave to worker
  85b00824ae crypto/scheduler: rename slave to worker rename slave to worker.

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 tests/TestSuite_l2fwd_cryptodev_func.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
index 5c4634a8..58e6d8fb 100644
--- a/tests/TestSuite_l2fwd_cryptodev_func.py
+++ b/tests/TestSuite_l2fwd_cryptodev_func.py
@@ -183,7 +183,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_rr_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=3))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,worker=%s_qat_sy
+ m,\
                 mode=round-robin"
             % tuple(cc.get_qat_devices(self, num=3))
         )
@@ -195,7 +195,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a 0000:00:00.0 --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += " --vdev crypto_aesni_mb2,name=aesni_mb_2"
         vdev += " --vdev crypto_aesni_mb3,name=aesni_mb_3"
-        vdev += " --vdev crypto_scheduler0,slave=aesni_mb_1,slave=aesni_mb_2,slave=aesni_mb_3,mode=round-robin"
+        vdev += " --vdev crypto_scheduler0,worker=aesni_mb_1,worker=aesni_mb_2,worker=aesni_mb_3,mode=round-robin"
         test_vectors["scheduler_AES_GCM_00"]["vdev"] = vdev
         test_vectors["scheduler_AES_GCM_00"]["mode"] = "rr"
         self.__execute_l2fwd_crypto_test(test_vectors, "scheduler_AES_GCM_00") @@ -203,7 +203,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_psb_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,\
                 mode=packet-size-distr"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -215,7 +215,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=packet-size-distr"
             % tuple(cc.get_qat_devices(self, num=1))
         )
@@ -226,7 +226,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_fo_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym,\
                 mode=fail-over"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -238,7 +238,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=fail-over"
             % tuple(cc.get_qat_devices(self, num=1))
         )
@@ -249,7 +249,7 @@ class TestL2fwdCrypto(TestCase):
     def test_scheduler_mm_AES_CBC_auto(self):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=2))
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=%s_qat_sym\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=%s_qat_sym\
                 mode=multi-core"
             % tuple(cc.get_qat_devices(self, num=2))
         )
@@ -261,7 +261,7 @@ class TestL2fwdCrypto(TestCase):
         vdev = "-a " + " -a ".join(cc.get_qat_devices(self, num=1))
         vdev += " --vdev crypto_aesni_mb1,name=aesni_mb_1"
         vdev += (
-            " --vdev crypto_scheduler0,slave=%s_qat_sym,slave=aesni_mb_1,\
+            " --vdev 
+ crypto_scheduler0,worker=%s_qat_sym,worker=aesni_mb_1,\
                 mode=multi-core"
             % tuple(cc.get_qat_devices(self, num=1))
         )
--
2.25.1

[dts][PATCH V1 2/2] tests/l2fwd_cryptodev_func: rename slave to worker according to dpdk20.11 change

[lijuan.tu]

On Fri, 14 Apr 2023 13:44:07 +0800, Yu Jiang <yux.jiang@intel.com> wrote:
> According to dpdk20.11 commit id:
>   28f5375d83 test/crypto: rename slave to worker
>   85b00824ae crypto/scheduler: rename slave to worker
> rename slave to worker.
> 
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>


Series applied, thanks