add get default SR when add disk

Author: lowang-bh

lib/Utils/server_utils.py

@@ -8,6 +8,7 @@
 '''
 from lib.Log.log import log
 from lib.Val.virt_factory import VirtFactory
+from lib.Utils.network_utils import IpCheck, is_IP_pingable
 
 
 def print_server_hardware_info(**kwargs):
@@ -65,7 +66,104 @@ def get_host_all_storage_info(**kwargs):
     return storage_info
 
 
+def get_default_device(host=None, user=None, passwd=None):
+    """
+    get the host's default network/Interface which has configured an IP;
+    :param kwargs:
+    :return: Interface name on host, or None
+    """
+    log.info("Get the host default network with IP configured.")
+
+    host_name = host
+    user = user if user else "root"
+    passwd = str(passwd).replace('\\', '') if passwd else ""
+
+    vnet_driver = VirtFactory.get_vnet_driver(host_name, user, passwd)
+
+    devices = vnet_driver.get_all_devices()
+    for device_name in devices:
+        # 'IP': '' or an ip,
+        device_info = vnet_driver.get_device_infor(device_name=device_name)
+        ipstr = device_info.get('IP', '')
+        if ipstr:
+            return device_name
+    else:
+        log.error("No device found with an IP configured.")
+        return None
+
+
+def get_default_storage(host=None, user=None, passwd=None):
+    """
+    get the default storage repository which has the largest volume for user
+    :param host:
+    :param user:
+    :param passwd:
+    :return: the storage name
+    """
+    log.info("Get the host default storage name which has the largest free volume.")
+
+    host_name = host
+    user = user if user else "root"
+    passwd = str(passwd).replace('\\', '') if passwd else ""
+
+    virt_driver = VirtFactory.get_virt_driver(host_name, user, passwd)
+    all_sr = virt_driver.get_host_all_storages()
+    max_volume, target_sr = 0, None
+    for sr in all_sr:
+        storage_dict = virt_driver.get_host_storage_info(storage_name=sr)
+        temp = int(storage_dict.get('size_free', 0))
+        if temp > max_volume:
+            max_volume, target_sr = temp, sr
+
+    log.info("The default storage is '%s' with volume %s GB.", target_sr, max_volume)
+    return target_sr
+
+
+def is_IP_available(vif_ip=None, vif_netmask=None, device=None, **kwargs):
+    """
+    check if a IP and Netmask usable
+    """
+    # No ip , don't need to check
+    if not vif_ip:
+        return True
+
+    dest_metmask = ""
+    dest_gateway = None
+    if device is not None:
+        try:
+            host_name = kwargs['host']
+            user = kwargs['user'] if kwargs['user'] else "root"
+            passwd = str(kwargs['passwd']).replace('\\', '') if kwargs['passwd'] else ""
+            vnet_driver = VirtFactory.get_vnet_driver(host_name, user, passwd)
+            device_info = vnet_driver.get_device_infor(device_name=device)
+            dest_metmask = device_info["netmask"]
+            dest_gateway = device_info['gateway']
+        except KeyError, error:
+            log.exception(str(error))
+
+    if vif_netmask:
+        if dest_metmask and dest_metmask != vif_netmask:
+            log.error("Netmask [%s] is not corresponding with the target network.", vif_netmask)
+            return False
+    else:  # get the netmask on device as the default one
+        vif_netmask = dest_metmask
+    log.debug("VIF IP is: %s, netmask is: %s", vif_ip, vif_netmask)
+    if not vif_netmask:  # No default netmask and no given
+        log.error("No netmask given, please specify one.")
+        return False
+
+    vif_gateway = dest_gateway if dest_gateway else None
+    if not IpCheck.is_valid_ipv4_parameter(vif_ip, vif_netmask, gateway=vif_gateway):
+        return False
+
+    if is_IP_pingable(vif_ip):
+        log.error("Ipaddress [%s] is already be used(Ping test).", vif_ip)
+        return False
+
+    return True
+
+
 if __name__ == "__main__":
     d = get_host_all_storage_info(host="10.143.248.16", user="root", passwd="Mojiti!906")
     for k, v in d.iteritems():
-        print k,"\t\t", v
+        print k, "\t\t", v

lib/Utils/vm_utils.py

@@ -8,56 +8,11 @@
         the return value of update_database, except create/delete VM
 '''
 
-from lib.Utils.network_utils import IpCheck, is_IP_pingable
 from lib.Val.virt_factory import VirtFactory, VM_MAC_PREFIX
 from lib.Log.log import log
 from lib.Utils.db_utils import update_vm_database_info, create_vm_database_info, delete_vm_database_info
 
 
-def is_IP_available(vif_ip=None, vif_netmask=None, device=None, **kwargs):
-    """
-    check if a IP and Netmask usable
-    """
-    # No ip , don't need to check
-    if not vif_ip:
-        return True
-
-    dest_metmask = ""
-    dest_gateway = None
-    if device is not None:
-        try:
-            host_name = kwargs['host']
-            user = kwargs['user'] if kwargs['user'] else "root"
-            passwd = str(kwargs['passwd']).replace('\\', '') if kwargs['passwd'] else ""
-            vnet_driver = VirtFactory.get_vnet_driver(host_name, user, passwd)
-            device_info = vnet_driver.get_device_infor(device_name=device)
-            dest_metmask = device_info["netmask"]
-            dest_gateway = device_info['gateway']
-        except KeyError, error:
-            log.exception(str(error))
-
-    if vif_netmask:
-        if dest_metmask and dest_metmask != vif_netmask:
-            log.error("Netmask [%s] is not corresponding with the target network.", vif_netmask)
-            return False
-    else:  # get the netmask on device as the default one
-        vif_netmask = dest_metmask
-    log.debug("VIF IP is: %s, netmask is: %s", vif_ip, vif_netmask)
-    if not vif_netmask:  # No default netmask and no given
-        log.error("No netmask given, please specify one.")
-        return False
-
-    vif_gateway = dest_gateway if dest_gateway else None
-    if not IpCheck.is_valid_ipv4_parameter(vif_ip, vif_netmask, gateway=vif_gateway):
-        return False
-
-    if is_IP_pingable(vif_ip):
-        log.error("Ipaddress [%s] is already be used(Ping test).", vif_ip)
-        return False
-
-    return True
-
-
 def create_vm(new_vm_name, template_name, **kwargs):
     """
     Create new instance with name and template
@@ -80,6 +35,7 @@ def create_vm(new_vm_name, template_name, **kwargs):
 
     return db_ret
 
+
 def delete_vm(vm_name, **kwargs):
     """
     :param vm_name:
@@ -104,6 +60,7 @@ def delete_vm(vm_name, **kwargs):
     # No matter delete vm from DB failed or not, return True
     return True
 
+
 def create_new_vif(inst_name, vif_index, device_name=None, network=None, ip=None, **kwargs):
     """
     create a new virtual interface on the target VM
@@ -124,7 +81,7 @@ def create_new_vif(inst_name, vif_index, device_name=None, network=None, ip=None
     else:
         mac_addr = None
 
-    log.debug("Create VIF [%s] with IP: %s,  MAC: %s.",vif_index, ip, mac_addr)
+    log.debug("Create VIF [%s] with IP: %s,  MAC: %s.", vif_index, ip, mac_addr)
     new_vif = vnet_driver.create_new_vif(inst_name, vif_index, device_name, network, MAC=mac_addr)
     if new_vif is not None:
         # TODO: sync DB when success

lib/Val/Xen/virt_driver_xen.py

@@ -560,6 +560,42 @@ def add_vdisk_to_vm(self, inst_name, storage_name='Local storage', size=2):
 
         return True
 
+    def _delete_virtual_disk_unused(self, storage_name, inst_name):
+        """
+        delete those VDI (virtual disk) which is not used by any VM; When delete a vm, the VDI is not deleted.
+        :param storage_name:
+        :param inst_name: the instance name to which virtual disk belongs. The VDI created by the api include the inst name
+        :return:
+        """
+        if self._hypervisor_handler is None:
+            self._hypervisor_handler = self.get_handler()
+
+        try:
+            sr_ref = self._hypervisor_handler.xenapi.SR.get_by_name_label(storage_name)[0]
+            all_vdis = self._hypervisor_handler.xenapi.SR.get_VDIs(sr_ref)
+            for vdi_ref in all_vdis:
+                #  If there are VBDs attached with the VDI, don't delete; Deleted VM has no VBD attached to the VDI
+                #  VDI.get_record(vdi), record['VBDs'], record['allowed_operations'], record['name_label']
+                if self._hypervisor_handler.xenapi.VDI.get_VBDs(vdi_ref):
+                    continue
+
+                if not "destroy" in self._hypervisor_handler.xenapi.VDI.get_allowed_operations(vdi_ref):
+                    continue
+                #  Delete those vdi created by the api
+                name_label = self._hypervisor_handler.xenapi.VDI.get_name_label(vdi_ref)
+                if not str(name_label).startswith(inst_name):
+                    continue
+
+                try:
+                    self._hypervisor_handler.xenapi.VDI.destroy(vdi_ref)
+                except Exception:
+                    log.warn("Destroy virtual disk [%s] failed.", vdi_ref)
+        except Exception:
+            log.exception("Except when delete VDI: %s", storage_name)
+            return False
+
+        return True
+
     ####    Host information  API  ####
     def get_host_cpu_info(self):
         """

scripts/config_vm.py

@@ -9,7 +9,8 @@
 from optparse import OptionParser
 from lib.Log.log import log
 from lib.Val.virt_factory import VirtFactory
-from lib.Utils.vm_utils import is_IP_available, create_new_vif, destroy_old_vif, config_vif, add_vm_disk, config_vcpus
+from lib.Utils.vm_utils import create_new_vif, destroy_old_vif, config_vif, add_vm_disk, config_vcpus
+from lib.Utils.server_utils import is_IP_available, get_default_storage
 
 if __name__ == "__main__":
     usage = """usage: %prog [options] vm_name\n
@@ -181,9 +182,14 @@
             exit(1)
 
     elif options.disk_size is not None:
+        option_dic = {"host": host_name, "user": user, "passwd": passwd}
+
         if not options.storage_name:
-            log.fail("Please specify a storage name for the new virtual disk.")
-            exit(1)
+            options.storage_name = get_default_storage(**option_dic)
+            if not options.storage_name:
+                log.fail("Failed to get default SR, please specify a storage name for the new virtual disk.")
+                exit(1)
+
         size = int(options.disk_size)
         storage_info = virt_driver.get_host_storage_info(storage_name=options.storage_name)
         if not storage_info:
@@ -194,7 +200,6 @@
                      options.storage_name, storage_info['size_free'] - 1)
             exit(1)
 
-        option_dic = {"host": host_name, "user": user, "passwd": passwd}
         ret = add_vm_disk(inst_name, storage_name=options.storage_name, size=size, **option_dic)
         if ret:
             log.success("Successfully add a new disk with size [%s]GB to VM [%s].", size, inst_name)

scripts/create_vm.py

@@ -8,7 +8,8 @@
 from optparse import OptionParser
 from lib.Log.log import log
 from lib.Val.virt_factory import VirtFactory
-from lib.Utils.vm_utils import is_IP_available, config_vif, power_on_vm, create_vm
+from lib.Utils.vm_utils import config_vif, power_on_vm, create_vm
+from lib.Utils.server_utils import is_IP_available
 
 if __name__ == "__main__":
     usage = """usage: %prog [options] arg1 arg2\n