mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: Add a new function to run commands in toolboxpod

Browse Source 
Updated code to use new function execCommandInToolBoxPod
to run commands in toolboxpod.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna
2020-05-15 14:19:38 +05:30
committed by mergify[bot]
parent 0f6c6c15a8
commit 7a5e064f50
3 changed files with 36 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/staticpvc.go
View File

@ -91,11 +91,7 @@ func validateRBDStaticPV(f *framework.Framework, appPath string, isBlock bool) e
c := f.ClientSet
listOpt := metav1.ListOptions{
LabelSelector: "app=rook-ceph-tools",
}
fsID, e := execCommandInPod(f, "ceph fsid", rookNamespace, &listOpt)
fsID, e := execCommandInToolBoxPod(f, "ceph fsid", rookNamespace)
if e != "" {
return fmt.Errorf("failed to get fsid from ceph cluster %s", e)
}
@ -105,7 +101,7 @@ func validateRBDStaticPV(f *framework.Framework, appPath string, isBlock bool) e
// create rbd image
cmd := fmt.Sprintf("rbd create %s --size=%d --pool=%s --image-feature=layering", rbdImageName, 4096, defaultRBDPool)
_, e = execCommandInPod(f, cmd, rookNamespace, &listOpt)
_, e = execCommandInToolBoxPod(f, cmd, rookNamespace)
if e != "" {
return fmt.Errorf("failed to create rbd image %s", e)
}
@ -156,7 +152,7 @@ func validateRBDStaticPV(f *framework.Framework, appPath string, isBlock bool) e
}
cmd = fmt.Sprintf("rbd rm %s --pool=%s", rbdImageName, defaultRBDPool)
execCommandInPod(f, cmd, rookNamespace, &listOpt)
execCommandInToolBoxPod(f, cmd, rookNamespace)
return nil
}