refector rbd volume to seperate builder and cleaner

This commit is contained in:
jiangyaoguo
2015-07-24 17:20:42 +08:00
parent 5bd82ffe6d
commit 72e899e1b5
4 changed files with 105 additions and 92 deletions

View File

@@ -47,8 +47,8 @@ type fakeDiskManager struct{}
func (fake *fakeDiskManager) MakeGlobalPDName(disk rbd) string {
return "/tmp/fake_rbd_path"
}
func (fake *fakeDiskManager) AttachDisk(disk rbd) error {
globalPath := disk.manager.MakeGlobalPDName(disk)
func (fake *fakeDiskManager) AttachDisk(b rbdBuilder) error {
globalPath := b.manager.MakeGlobalPDName(*b.rbd)
err := os.MkdirAll(globalPath, 0750)
if err != nil {
return err
@@ -56,8 +56,8 @@ func (fake *fakeDiskManager) AttachDisk(disk rbd) error {
return nil
}
func (fake *fakeDiskManager) DetachDisk(disk rbd, mntPath string) error {
globalPath := disk.manager.MakeGlobalPDName(disk)
func (fake *fakeDiskManager) DetachDisk(c rbdCleaner, mntPath string) error {
globalPath := c.manager.MakeGlobalPDName(*c.rbd)
err := os.RemoveAll(globalPath)
if err != nil {
return err