Remove deprecated _get_image_info

cbosdo · cbosdo · commit d4cfd03d78d4 · 2018-06-22T10:54:26.000+02:00
The _get_image_info() function was deprecated but still in use by
_gen_vol_xml(). Refactor to use __disk_profile() data instead.
diff --git a/salt/modules/virt.py b/salt/modules/virt.py
@@ -572,21 +572,20 @@ def _gen_xml(name,
 
 def _gen_vol_xml(vmname,
                  diskname,
+                 disktype,
                  size,
-                 hypervisor,
-                 **kwargs):
+                 pool):
     '''
     Generate the XML string to define a libvirt storage volume
     '''
     size = int(size) * 1024  # MB
-    disk_info = _get_image_info(hypervisor, vmname, **kwargs)
     context = {
         'name': vmname,
-        'filename': '{0}.{1}'.format(diskname, disk_info['disktype']),
+        'filename': '{0}.{1}'.format(diskname, disktype),
         'volname': diskname,
-        'disktype': disk_info['disktype'],
+        'disktype': disktype,
         'size': six.text_type(size),
-        'pool': disk_info['pool'],
+        'pool': pool,
     }
     fn_ = 'libvirt_volume.jinja'
     try:
@@ -784,25 +783,6 @@ def _qemu_image_create(vm_name,
     return img_dest
 
 
-# TODO: this function is deprecated, should be merged and replaced
-# with _disk_profile()
-def _get_image_info(hypervisor, name, **kwargs):
-    '''
-    Determine disk image info, such as filename, image format and
-    storage pool, based on which hypervisor is used
-    '''
-    ret = {}
-    if hypervisor in ['esxi', 'vmware']:
-        ret['disktype'] = 'vmdk'
-        ret['filename'] = '{0}{1}'.format(name, '.vmdk')
-        ret['pool'] = '[{0}] '.format(kwargs.get('pool', '0'))
-    elif hypervisor in ['kvm', 'qemu']:
-        ret['disktype'] = 'qcow2'
-        ret['filename'] = '{0}{1}'.format(name, '.qcow2')
-        ret['pool'] = __salt__['config.option']('virt.images')
-    return ret
-
-
 def _disk_profile(profile, hypervisor, **kwargs):
     '''
     Gather the disk profile from the config or apply the default based
@@ -1114,8 +1094,9 @@ def init(name,
                     vol_xml = _gen_vol_xml(
                         name,
                         disk_name,
+                        args['format'],
                         args['size'],
-                        hypervisor,
+                        args['pool']
                     )
                     define_vol_xml_str(vol_xml)
 
diff --git a/tests/unit/modules/test_virt.py b/tests/unit/modules/test_virt.py
@@ -286,28 +286,17 @@ def test_default_nic_profile_hypervisor_kvm(self):
             self.assertEqual(eth0['source'], 'br0')
             self.assertEqual(eth0['model'], 'virtio')
 
-    def test_gen_vol_xml_for_kvm(self):
+    def test_gen_vol_xml(self):
         '''
-        Test virt._get_vol_xml(), KVM case
+        Test virt._get_vol_xml()
         '''
-        xml_data = virt._gen_vol_xml('vmname', 'system', 8192, 'kvm')
+        xml_data = virt._gen_vol_xml('vmname', 'system', 'qcow2', 8192, '/path/to/image/')
         root = ET.fromstring(xml_data)
         self.assertEqual(root.find('name').text, 'vmname/system.qcow2')
         self.assertEqual(root.find('key').text, 'vmname/system')
         self.assertEqual(root.find('capacity').attrib['unit'], 'KiB')
         self.assertEqual(root.find('capacity').text, six.text_type(8192 * 1024))
 
-    def test_gen_vol_xml_for_esxi(self):
-        '''
-        Test virt._get_vol_xml(), ESXi case
-        '''
-        xml_data = virt._gen_vol_xml('vmname', 'system', 8192, 'esxi')
-        root = ET.fromstring(xml_data)
-        self.assertEqual(root.find('name').text, 'vmname/system.vmdk')
-        self.assertEqual(root.find('key').text, 'vmname/system')
-        self.assertEqual(root.find('capacity').attrib['unit'], 'KiB')
-        self.assertEqual(root.find('capacity').text, six.text_type(8192 * 1024))
-
     def test_gen_xml_for_kvm_default_profile(self):
         '''
         Test virt._gen_xml(), KVM default profile case
