mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-26 08:10:20 +00:00
cleanup: correct createORDeleteCephfsResources() function name
Along with correcing the name of the function, other typos are also addressed Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
parent
a9fa108959
commit
4302e5ee67
@ -55,17 +55,17 @@ func deployCephfsPlugin() {
|
|||||||
e2elog.Failf("failed to delete nodeplugin rbac %s with error %v", cephfsDirPath+cephfsNodePluginRBAC, err)
|
e2elog.Failf("failed to delete nodeplugin rbac %s with error %v", cephfsDirPath+cephfsNodePluginRBAC, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
createORDeleteCephfsResouces("create")
|
createORDeleteCephfsResources("create")
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteCephfsPlugin() {
|
func deleteCephfsPlugin() {
|
||||||
createORDeleteCephfsResouces("delete")
|
createORDeleteCephfsResources("delete")
|
||||||
}
|
}
|
||||||
|
|
||||||
func createORDeleteCephfsResouces(action string) {
|
func createORDeleteCephfsResources(action string) {
|
||||||
csiDriver, err := ioutil.ReadFile(cephfsDirPath + csiDriverObject)
|
csiDriver, err := ioutil.ReadFile(cephfsDirPath + csiDriverObject)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// createORDeleteRbdResouces is used for upgrade testing as csidriverObject is
|
// createORDeleteRbdResources is used for upgrade testing as csidriverObject is
|
||||||
// newly added, discarding file not found error.
|
// newly added, discarding file not found error.
|
||||||
if !os.IsNotExist(err) {
|
if !os.IsNotExist(err) {
|
||||||
e2elog.Failf("failed to read content from %s with error %v", cephfsDirPath+csiDriverObject, err)
|
e2elog.Failf("failed to read content from %s with error %v", cephfsDirPath+csiDriverObject, err)
|
||||||
@ -214,7 +214,7 @@ var _ = Describe("cephfs", func() {
|
|||||||
if CurrentGinkgoTestDescription().Failed {
|
if CurrentGinkgoTestDescription().Failed {
|
||||||
// log pods created by helm chart
|
// log pods created by helm chart
|
||||||
logsCSIPods("app=ceph-csi-cephfs", c)
|
logsCSIPods("app=ceph-csi-cephfs", c)
|
||||||
// log provisoner
|
// log provisioner
|
||||||
logsCSIPods("app=csi-cephfsplugin-provisioner", c)
|
logsCSIPods("app=csi-cephfsplugin-provisioner", c)
|
||||||
// log node plugin
|
// log node plugin
|
||||||
logsCSIPods("app=csi-cephfsplugin", c)
|
logsCSIPods("app=csi-cephfsplugin", c)
|
||||||
@ -512,7 +512,7 @@ var _ = Describe("cephfs", func() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to delete storageclass with error %v", err)
|
e2elog.Failf("failed to delete storageclass with error %v", err)
|
||||||
}
|
}
|
||||||
// verify subvolumegroup creation.
|
// verify subvolume group creation.
|
||||||
err = validateSubvolumegroup(f, "subvolgrp1")
|
err = validateSubvolumegroup(f, "subvolgrp1")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e2elog.Failf("failed to validate subvolume group with error %v", err)
|
e2elog.Failf("failed to validate subvolume group with error %v", err)
|
||||||
@ -876,7 +876,7 @@ var _ = Describe("cephfs", func() {
|
|||||||
|
|
||||||
parentPVCCount := totalSubvolumes - totalCount
|
parentPVCCount := totalSubvolumes - totalCount
|
||||||
validateSubvolumeCount(f, parentPVCCount, fileSystemName, subvolumegroup)
|
validateSubvolumeCount(f, parentPVCCount, fileSystemName, subvolumegroup)
|
||||||
// create clones from different snapshosts and bind it to an
|
// create clones from different snapshots and bind it to an
|
||||||
// app
|
// app
|
||||||
wg.Add(totalCount)
|
wg.Add(totalCount)
|
||||||
for i := 0; i < totalCount; i++ {
|
for i := 0; i < totalCount; i++ {
|
||||||
|
Loading…
Reference in New Issue
Block a user