From: Xiubo Li <xiubli@redhat.com>
Date: Fri, 25 Dec 2020 01:02:14 +0000 (+0800)
Subject: qa: rename gwcli_client to iscsi_client
X-Git-Tag: v16.2.0~210^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4991d521564a042515017c45010de1f80cf46aa6;p=ceph.git

qa: rename gwcli_client to iscsi_client

This could be used for both gwcli and REST API methods.

Fixes: https://tracker.ceph.com/issues/48529
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit a18c1e66586d2a07ce343ff26105427f8c940931)
---

diff --git a/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml b/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml
index 026c6ce71da2..5d00e800903e 100644
--- a/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml
+++ b/qa/suites/rbd/iscsi/workloads/ceph_iscsi.yaml
@@ -8,6 +8,6 @@ tasks:
       a_gateway.0:
       - src/test/cli-integration/rbd/gwcli_create.t
       b_client.0:
-      - src/test/cli-integration/rbd/gwcli_client.t
+      - src/test/cli-integration/rbd/iscsi_client.t
       c_gateway.1:
       - src/test/cli-integration/rbd/gwcli_delete.t
diff --git a/src/test/cli-integration/rbd/gwcli_client.t b/src/test/cli-integration/rbd/gwcli_client.t
deleted file mode 100644
index f636d540d897..000000000000
--- a/src/test/cli-integration/rbd/gwcli_client.t
+++ /dev/null
@@ -1,30 +0,0 @@
-Login to the target
-===================
-  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'`
-  > sudo iscsiadm -m discovery -t st -p $IP -l 2&> /dev/null
-  $ sleep 10
-  $ sudo ls /dev/disk/by-path/ |grep 'iscsi-iqn.2003-01.com.redhat.iscsi-gw:ceph-gw' |wc -l
-  2
-
-Make filesystem
-===============
-  $ device=`sudo multipath -l | grep 'LIO-ORG,TCMU device' | awk '{print $1}'`
-  > sudo mkfs.xfs /dev/mapper/$device -f | grep 'meta-data=/dev/mapper/mpath' | awk '{print $2}'
-  isize=512
-
-Write/Read test
-===============
-  $ device=`sudo multipath -l | grep 'LIO-ORG,TCMU device' | awk '{print $1}'`
-  > sudo dd if=/dev/random of=/tmp/iscsi_tmpfile bs=1 count=1K status=none
-  > sudo dd if=/tmp/iscsi_tmpfile of=/dev/mapper/$device bs=1 count=1K status=none
-  > sudo dd if=/dev/mapper/$device of=/tmp/iscsi_tmpfile1 bs=1 count=1K status=none
-  $ sudo diff /tmp/iscsi_tmpfile /tmp/iscsi_tmpfile1
-
-Logout the targets
-==================
-  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'`
-  > sudo iscsiadm -m node -T iqn.2003-01.com.redhat.iscsi-gw:ceph-gw -p $IP:3260 -u | grep 'successful' | awk -F']' '{print $2}'
-   successful.
-  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $4}'`
-  > sudo iscsiadm -m node -T iqn.2003-01.com.redhat.iscsi-gw:ceph-gw -p $IP:3260 -u | grep 'successful' | awk -F']' '{print $2}'
-   successful.
diff --git a/src/test/cli-integration/rbd/iscsi_client.t b/src/test/cli-integration/rbd/iscsi_client.t
new file mode 100644
index 000000000000..f636d540d897
--- /dev/null
+++ b/src/test/cli-integration/rbd/iscsi_client.t
@@ -0,0 +1,30 @@
+Login to the target
+===================
+  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'`
+  > sudo iscsiadm -m discovery -t st -p $IP -l 2&> /dev/null
+  $ sleep 10
+  $ sudo ls /dev/disk/by-path/ |grep 'iscsi-iqn.2003-01.com.redhat.iscsi-gw:ceph-gw' |wc -l
+  2
+
+Make filesystem
+===============
+  $ device=`sudo multipath -l | grep 'LIO-ORG,TCMU device' | awk '{print $1}'`
+  > sudo mkfs.xfs /dev/mapper/$device -f | grep 'meta-data=/dev/mapper/mpath' | awk '{print $2}'
+  isize=512
+
+Write/Read test
+===============
+  $ device=`sudo multipath -l | grep 'LIO-ORG,TCMU device' | awk '{print $1}'`
+  > sudo dd if=/dev/random of=/tmp/iscsi_tmpfile bs=1 count=1K status=none
+  > sudo dd if=/tmp/iscsi_tmpfile of=/dev/mapper/$device bs=1 count=1K status=none
+  > sudo dd if=/dev/mapper/$device of=/tmp/iscsi_tmpfile1 bs=1 count=1K status=none
+  $ sudo diff /tmp/iscsi_tmpfile /tmp/iscsi_tmpfile1
+
+Logout the targets
+==================
+  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $3}'`
+  > sudo iscsiadm -m node -T iqn.2003-01.com.redhat.iscsi-gw:ceph-gw -p $IP:3260 -u | grep 'successful' | awk -F']' '{print $2}'
+   successful.
+  $ IP=`cat /etc/ceph/iscsi-gateway.cfg |grep 'trusted_ip_list' | awk -F'[, ]' '{print $4}'`
+  > sudo iscsiadm -m node -T iqn.2003-01.com.redhat.iscsi-gw:ceph-gw -p $IP:3260 -u | grep 'successful' | awk -F']' '{print $2}'
+   successful.