The _UnlockedAttachInstanceDisk and _UnlockedDetachInstanceDisk functions are already used in the add and remove operations. Create wrappers that can be used by attach and detach operations in order to call only these functions.
Signed-off-by: Alex Pyrgiotis <[email protected]> diff --git a/lib/config/__init__.py b/lib/config/__init__.py index 7c595a5..c666786 100644 --- a/lib/config/__init__.py +++ b/lib/config/__init__.py @@ -403,6 +403,15 @@ class ConfigWriter(object): self._UnlockedAddDisk(disk, replace=replace) self._UnlockedAttachInstanceDisk(inst_uuid, disk.uuid, idx) + @ConfigSync() + def AttachInstanceDisk(self, inst_uuid, disk_uuid, idx=None): + """Attach an existing disk to an instance. + + This is a simple wrapper over L{_UnlockedAttachInstanceDisk}. + + """ + self._UnlockedAttachInstanceDisk(inst_uuid, disk_uuid, idx) + def _UnlockedDetachInstanceDisk(self, inst_uuid, disk_uuid): """Detach a disk from an instance. @@ -463,6 +472,14 @@ class ConfigWriter(object): self._UnlockedDetachInstanceDisk(inst_uuid, disk_uuid) self._UnlockedRemoveDisk(disk_uuid) + @ConfigSync() + def DetachInstanceDisk(self, inst_uuid, disk_uuid): + """Detach a disk from an instance. + + This is a simple wrapper over L{_UnlockedDetachInstanceDisk}. + """ + self._UnlockedDetachInstanceDisk(inst_uuid, disk_uuid) + def _UnlockedGetDiskInfo(self, disk_uuid): """Returns information about a disk. -- 1.7.10.4
