Merge pull request #43 from openvstorage/cleanup_of_vdisks

Cleanup of vdisks

Author: Philippe

remove/vdisk.py

@@ -30,6 +30,24 @@ class VDiskRemover(object):
     def __init__(self):
         pass
 
+    @staticmethod
+    def remove_vdisks_with_structure(vdisks):
+        """
+        Remove many vdisks at once. Will keep the parent structure in mind
+        :param vdisks: list of vdisks 
+        :return: 
+        """
+        removed_guids = []
+        for vdisk in vdisks:
+            if vdisk.guid in removed_guids:
+                continue
+            if len(vdisk.child_vdisks_guids) > 0:
+                for vdisk_child_guid in vdisk.child_vdisks_guids:
+                    VDiskRemover.remove_vdisk(vdisk_child_guid)
+                    removed_guids.append(vdisk_child_guid)
+            VDiskRemover.remove_vdisk(vdisk.guid)
+            removed_guids.append(vdisk.guid)
+
     @staticmethod
     def remove_snapshot(snapshot_guid, vdisk_name, vpool_name, api, timeout=REMOVE_SNAPSHOT_TIMEOUT):
         """

setup/vdisk.py

@@ -86,9 +86,7 @@ def create_snapshot(snapshot_name, vdisk_name, vpool_name, api, consistent=True,
     def create_vdisk(vdisk_name, vpool_name, size, storagerouter_ip, api, timeout=CREATE_VDISK_TIMEOUT):
         """
         Create a new vDisk on a certain vPool/storagerouter
-
-        :param vdisk_name: location of a vdisk on a vpool
-                           (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
+        :param vdisk_name: location of a vdisk on a vpool (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
         :type vdisk_name: str
         :param vpool_name: name of a existing vpool
         :type vpool_name: str
@@ -171,14 +169,11 @@ def create_clone(vdisk_name, vpool_name, new_vdisk_name, storagerouter_ip, api,
                      timeout=CREATE_CLONE_TIMEOUT):
         """
         Create a new vDisk on a certain vPool/storagerouter
-
-        :param vdisk_name: location of a vdisk on a vpool
-                           (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
+        :param vdisk_name: location of a vdisk on a vpool (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
         :type vdisk_name: str
         :param vpool_name: name of a existing vpool
         :type vpool_name: str
-        :param new_vdisk_name: location of the NEW vdisk on the vpool
-                           (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
+        :param new_vdisk_name: location of the NEW vdisk on the vpool (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
         :type new_vdisk_name: str
         :param storagerouter_ip: ip address of a existing storagerouter where the clone will be deployed
         :type storagerouter_ip: str
@@ -249,7 +244,6 @@ def set_vdisk_as_template(vdisk_name, vpool_name, api, timeout=SET_VDISK_AS_TEMP
         :type api: ci.helpers.api.OVSClient
         :param timeout: time to wait for the task to complete
         """
-
         # fetch the requirements
         vdisk = VDiskHelper.get_vdisk_by_name(vdisk_name, vpool_name)
 
@@ -273,22 +267,20 @@ def create_from_template(vdisk_name, vpool_name, new_vdisk_name, storagerouter_i
         """
         Create a new vDisk on a certain vPool/storagerouter
         Set a existing vDisk as vTemplate
-
-        :param vdisk_name: location of a vdisk on a vpool
-                           (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
+        :param vdisk_name: location of a vdisk on a vpool(e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
         :type vdisk_name: str
         :param vpool_name: name of a existing vpool
         :type vpool_name: str
-        :param new_vdisk_name: location of the NEW vdisk on the vpool
-                           (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
+        :param new_vdisk_name: location of the NEW vdisk on the vpool (e.g. /mnt/vpool/test.raw = test.raw, /mnt/vpool/volumes/test.raw = volumes/test.raw )
         :type new_vdisk_name: str
         :param storagerouter_ip: ip address of a existing storagerouter where the clone will be deployed
         :type storagerouter_ip: str
         :param api: specify a valid api connection to the setup
         :type api: ci.helpers.api.OVSClient
         :param timeout: time to wait for the task to complete
+        :return: dict with info about the new vdisk {'vdisk_guid': new_vdisk.guid, 'name': new_vdisk.name, 'backingdevice': devicename}
+        :rtype: dict
         """
-
         # fetch the requirements
         vdisk = VDiskHelper.get_vdisk_by_name(vdisk_name, vpool_name)
         storagerouter_guid = StoragerouterHelper.get_storagerouter_by_ip(storagerouter_ip).guid