VMWare: Use get_hardware_devices throughout

Instead of retrieving the hardware devices
through a get_object_property directly,
and then inconsistently handling the normalisation
in the called function or in the caller,
use get_hardware_devices everywhere and handle
the normalisation there.

Change-Id: I221013216c4bdd241a894fb0a68c95d98d649c33

Author: fwiesel

nova/tests/unit/virt/vmwareapi/test_vm_util.py

@@ -376,9 +376,8 @@ def test_get_scsi_adapter_type(self):
         devices.append(ide_controller)
         fake._update_object("VirtualMachine", vm)
         # return the scsi type, not ide
-        hardware_device = vm.get("config.hardware.device")
         self.assertEqual(constants.DEFAULT_ADAPTER_TYPE,
-                         vm_util.get_scsi_adapter_type(hardware_device))
+                         vm_util.get_scsi_adapter_type(devices))
 
     def test_get_scsi_adapter_type_with_error(self):
         vm = fake.VirtualMachine()
@@ -392,10 +391,9 @@ def test_get_scsi_adapter_type_with_error(self):
         # has exceeded SCSI_MAX_CONNECT_NUMBER
         for i in range(0, constants.SCSI_MAX_CONNECT_NUMBER):
             scsi_controller.device.append('device' + str(i))
-        hardware_device = vm.get("config.hardware.device")
         self.assertRaises(exception.StorageError,
                           vm_util.get_scsi_adapter_type,
-                          hardware_device)
+                          devices)
 
     def test_find_allocated_slots(self):
         disk1 = fake.VirtualDisk(200, 0)
@@ -1715,10 +1713,7 @@ def test_get_vm_boot_spec(self):
         self.assertEqual(expected, result)
 
     def _get_devices(self, filename):
-        devices = fake._create_array_of_type('VirtualDevice')
-        devices.VirtualDevice = self._vmdk_path_and_adapter_type_devices(
-            filename)
-        return devices
+        return self._vmdk_path_and_adapter_type_devices(filename)
 
     def test_find_rescue_device(self):
         filename = '[test_datastore] uuid/uuid-rescue.vmdk'

nova/virt/vmwareapi/vif.py

@@ -123,8 +123,6 @@ def get_vif_info(session, cluster, vif_model, network_info):
 
 def get_network_device(hardware_devices, mac_address):
     """Return the network device with MAC 'mac_address'."""
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
     for device in hardware_devices:
         if device.__class__.__name__ in vm_util.ALL_SUPPORTED_NETWORK_DEVICES:
             if hasattr(device, 'macAddress'):

nova/virt/vmwareapi/vm_util.py

@@ -744,9 +744,6 @@ def get_scsi_adapter_type(hardware_devices):
     """Selects a proper iscsi adapter type from the existing
        hardware devices
     """
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
-
     for device in hardware_devices:
         if device.__class__.__name__ in scsi_controller_classes:
             # find the controllers which still have available slots
@@ -840,9 +837,6 @@ def allocate_controller_key_and_unit_number(client_factory, devices,
 
 def get_rdm_disk(hardware_devices, uuid):
     """Gets the RDM disk key."""
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
-
     for device in hardware_devices:
         if (device.__class__.__name__ == "VirtualDisk" and
             device.backing.__class__.__name__ ==
@@ -1277,9 +1271,6 @@ def propset_dict(propset):
 
 
 def get_vmdk_backed_disk_device(hardware_devices, uuid):
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
-
     for device in hardware_devices:
         if (device.__class__.__name__ == "VirtualDisk" and
                 device.backing.__class__.__name__ ==
@@ -1289,9 +1280,6 @@ def get_vmdk_backed_disk_device(hardware_devices, uuid):
 
 
 def get_vmdk_volume_disk(hardware_devices, path=None):
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
-
     for device in hardware_devices:
         if (device.__class__.__name__ == "VirtualDisk"):
             if not path or path == device.backing.fileName:
@@ -1544,7 +1532,7 @@ def find_rescue_device(hardware_devices, instance):
     :param instance: nova.objects.instance.Instance object
     :return: the rescue disk device object
     """
-    for device in hardware_devices.VirtualDevice:
+    for device in hardware_devices:
         if (device.__class__.__name__ == "VirtualDisk" and
                 device.backing.__class__.__name__ ==
                 'VirtualDiskFlatVer2BackingInfo' and
@@ -1583,13 +1571,7 @@ def detach_devices_from_vm(session, vm_ref, devices):
 
 def get_ephemerals(session, vm_ref):
     devices = []
-    hardware_devices = session._call_method(vutil,
-                                            "get_object_property",
-                                            vm_ref,
-                                            "config.hardware.device")
-
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
+    hardware_devices = get_hardware_devices(session, vm_ref)
 
     for device in hardware_devices:
         if device.__class__.__name__ == "VirtualDisk":
@@ -1601,11 +1583,7 @@ def get_ephemerals(session, vm_ref):
 
 
 def get_swap(session, vm_ref):
-    hardware_devices = session._call_method(vutil, "get_object_property",
-                                            vm_ref, "config.hardware.device")
-
-    if hardware_devices.__class__.__name__ == "ArrayOfVirtualDevice":
-        hardware_devices = hardware_devices.VirtualDevice
+    hardware_devices = get_hardware_devices(session, vm_ref)
 
     for device in hardware_devices:
         if (device.__class__.__name__ == "VirtualDisk" and

nova/virt/vmwareapi/vmops.py

@@ -885,10 +885,7 @@ def _attach_cdrom_to_vm(self, vm_ref, instance,
                             datastore, file_path):
         """Attach cdrom to VM by reconfiguration."""
         client_factory = self._session.vim.client.factory
-        devices = self._session._call_method(vutil,
-                                             "get_object_property",
-                                             vm_ref,
-                                             "config.hardware.device")
+        devices = vm_util.get_hardware_devices(self._session, vm_ref)
         (controller_key, unit_number,
          controller_spec) = vm_util.allocate_controller_key_and_unit_number(
                                                     client_factory,
@@ -1189,10 +1186,7 @@ def resume(self, instance):
             raise exception.InstanceResumeFailure(reason=reason)
 
     def _get_rescue_device(self, instance, vm_ref):
-        hardware_devices = self._session._call_method(vutil,
-                                                      "get_object_property",
-                                                      vm_ref,
-                                                      "config.hardware.device")
+        hardware_devices = vm_util.get_hardware_devices(self._session, vm_ref)
         return vm_util.find_rescue_device(hardware_devices,
                                           instance)
 
@@ -1649,8 +1643,7 @@ def live_migration(self, context, instance, dest,
         network_info = instance.get_network_info()
         client_factory = self._session.vim.client.factory
         devices = []
-        hardware_devices = self._session._call_method(
-            vutil, "get_object_property", vm_ref, "config.hardware.device")
+        hardware_devices = vm_util.get_hardware_devices(self._session, vm_ref)
         vif_model = instance.image_meta.properties.get('hw_vif_model',
             constants.DEFAULT_VIF_MODEL)
         for vif in network_info:
@@ -1959,11 +1952,8 @@ def detach_interface(self, context, instance, vif):
                         "VM") % vif['id']
                 raise exception.NotFound(msg)
 
-            hardware_devices = self._session._call_method(
-                                                    vutil,
-                                                    "get_object_property",
-                                                    vm_ref,
-                                                    "config.hardware.device")
+            hardware_devices = vm_util.get_hardware_devices(self._session,
+                                                            vm_ref)
             device = vmwarevif.get_network_device(hardware_devices,
                                                   vif['address'])
             if device is None:

nova/virt/vmwareapi/volumeops.py

@@ -46,10 +46,7 @@ def attach_disk_to_vm(self, vm_ref, instance,
         """Attach disk to VM by reconfiguration."""
         instance_name = instance.name
         client_factory = self._session.vim.client.factory
-        devices = self._session._call_method(vutil,
-                                             "get_object_property",
-                                             vm_ref,
-                                             "config.hardware.device")
+        devices = vm_util.get_hardware_devices(self._session, vm_ref)
         (controller_key, unit_number,
          controller_spec) = vm_util.allocate_controller_key_and_unit_number(
                                                               client_factory,
@@ -309,11 +306,8 @@ def _get_volume_ref(self, volume_ref_name):
 
     def _get_vmdk_base_volume_device(self, volume_ref):
         # Get the vmdk file name that the VM is pointing to
-        hardware_devices = self._session._call_method(
-                                                    vutil,
-                                                    "get_object_property",
-                                                    volume_ref,
-                                                    "config.hardware.device")
+        hardware_devices = vm_util.get_hardware_devices(self._session,
+                                                        volume_ref)
         return vm_util.get_vmdk_volume_disk(hardware_devices)
 
     def _attach_volume_vmdk(self, connection_info, instance,
@@ -364,8 +358,8 @@ def _attach_volume_iscsi(self, connection_info, instance,
                 reason=_("Unable to find iSCSI Target"))
         if adapter_type is None:
             # Get the vmdk file name that the VM is pointing to
-            hardware_devices = self._session._call_method(
-                vutil, "get_object_property", vm_ref, "config.hardware.device")
+            hardware_devices = vm_util.get_hardware_devices(self._session,
+                                                            vm_ref)
             adapter_type = vm_util.get_scsi_adapter_type(hardware_devices)
 
         self.attach_disk_to_vm(vm_ref, instance,
@@ -491,10 +485,7 @@ def _consolidate_vmdk_volume(self, instance, vm_ref, device, volume_ref,
 
     def _get_vmdk_backed_disk_device(self, vm_ref, connection_info_data):
         # Get the vmdk file name that the VM is pointing to
-        hardware_devices = self._session._call_method(vutil,
-                                                      "get_object_property",
-                                                      vm_ref,
-                                                      "config.hardware.device")
+        hardware_devices = vm_util.get_hardware_devices(self._session, vm_ref)
 
         # Get disk uuid
         disk_uuid = self._get_volume_uuid(vm_ref,
@@ -560,10 +551,7 @@ def _detach_volume_iscsi(self, connection_info, instance):
                 reason=_("Unable to find iSCSI Target"))
 
         # Get the vmdk file name that the VM is pointing to
-        hardware_devices = self._session._call_method(vutil,
-                                                      "get_object_property",
-                                                      vm_ref,
-                                                      "config.hardware.device")
+        hardware_devices = vm_util.get_hardware_devices(self._session, vm_ref)
         device = vm_util.get_rdm_disk(hardware_devices, uuid)
         if device is None:
             raise exception.DiskNotFound(message=_("Unable to find volume"))