import quincy beta 17.1.0

[ceph.git] / ceph / src / test / cli-integration / rbd / gwcli_delete.t

diff --git a/ceph/src/test/cli-integration/rbd/gwcli_delete.t b/ceph/src/test/cli-integration/rbd/gwcli_delete.t
index 5aef9d0e960ec54454d868f6c3de7f5299ba0fab..e973d87a39f0b0101680f9b92fba8ef48f62c2b5 100644 (file)
--- a/ceph/src/test/cli-integration/rbd/gwcli_delete.t
+++ b/ceph/src/test/cli-integration/rbd/gwcli_delete.t
@@ -1,27 +1,31 @@
+Podman find iSCSI container
+===========================
+  $ ISCSI_CONTAINER=$(sudo podman ps -a | grep -F 'iscsi' | grep -Fv 'tcmu' | awk '{print $1}')
+
 Dismiss the "could not load preferences file .gwcli/prefs.bin" warning
 ======================================================================
-  $ sudo gwcli ls >/dev/null 2>&1
+  $ sudo podman exec $ISCSI_CONTAINER gwcli ls >/dev/null 2>&1
 
 Delete the host
 ===============
-  $ sudo gwcli iscsi-targets/iqn.2003-01.com.redhat.iscsi-gw:ceph-gw/hosts delete client_iqn=iqn.1994-05.com.redhat:client
-  $ sudo gwcli ls iscsi-targets/ | grep 'o- hosts' | awk -F'[' '{print $2}'
+  $ sudo podman exec $ISCSI_CONTAINER gwcli iscsi-targets/iqn.2003-01.com.redhat.iscsi-gw:ceph-gw/hosts delete client_iqn=iqn.1994-05.com.redhat:client
+  $ sudo podman exec $ISCSI_CONTAINER gwcli ls iscsi-targets/ | grep 'o- hosts' | awk -F'[' '{print $2}'
   Auth: ACL_ENABLED, Hosts: 0]
 
 Delete the iscsi-targets disk
 =============================
-  $ sudo gwcli iscsi-targets/iqn.2003-01.com.redhat.iscsi-gw:ceph-gw/disks/ delete disk=datapool/block0
-  $ sudo gwcli ls iscsi-targets/ | grep 'o- disks' | awk -F'[' '{print $2}'
+  $ sudo podman exec $ISCSI_CONTAINER gwcli iscsi-targets/iqn.2003-01.com.redhat.iscsi-gw:ceph-gw/disks/ delete disk=datapool/block0
+  $ sudo podman exec $ISCSI_CONTAINER gwcli ls iscsi-targets/ | grep 'o- disks' | awk -F'[' '{print $2}'
   Disks: 0]
 
 Delete the target IQN
 =====================
-  $ sudo gwcli iscsi-targets/ delete target_iqn=iqn.2003-01.com.redhat.iscsi-gw:ceph-gw
-  $ sudo gwcli ls iscsi-targets/ | grep 'o- iscsi-targets' | awk -F'[' '{print $2}'
+  $ sudo podman exec $ISCSI_CONTAINER gwcli iscsi-targets/ delete target_iqn=iqn.2003-01.com.redhat.iscsi-gw:ceph-gw
+  $ sudo podman exec $ISCSI_CONTAINER gwcli ls iscsi-targets/ | grep 'o- iscsi-targets' | awk -F'[' '{print $2}'
   DiscoveryAuth: None, Targets: 0]
 
 Delete the disks
 ================
-  $ sudo gwcli disks/ delete image_id=datapool/block0
-  $ sudo gwcli ls disks/ | grep 'o- disks' | awk -F'[' '{print $2}'
+  $ sudo podman exec $ISCSI_CONTAINER gwcli disks/ delete image_id=datapool/block0
+  $ sudo podman exec $ISCSI_CONTAINER gwcli ls disks/ | grep 'o- disks' | awk -F'[' '{print $2}'
   0.00Y, Disks: 0]