Refactor vmware_guest_disk

[mariolenz]

SUMMARY

As @Tireg pointed out in #1321, the bug fixed in this PR might also be present in module_utils/vmware.py. Looking at get_recommended_datastore in both the module and the module util, I should say they are very similar.

Maybe we can refactor things and avoid duplicated code.

ISSUE TYPE

• Feature Idea

COMPONENT NAME

vmware_guest_disk
module_utils/vmware

ADDITIONAL INFORMATION

vmware_guest_disk:

community.vmware/plugins/modules/vmware_guest_disk.py

Lines 1009 to 1055 in c673d75

	def get_recommended_datastore(self, datastore_cluster_obj, disk_spec_obj):
	"""
	Return Storage DRS recommended datastore from datastore cluster
	Args:
	datastore_cluster_obj: datastore cluster managed object
	Returns: Name of recommended datastore from the given datastore cluster,
	Returns None if no datastore recommendation found.
	"""
	# Check if Datastore Cluster provided by user is SDRS ready
	sdrs_status = datastore_cluster_obj.podStorageDrsEntry.storageDrsConfig.podConfig.enabled
	if sdrs_status:
	# We can get storage recommendation only if SDRS is enabled on given datastorage cluster
	disk_loc = vim.storageDrs.PodSelectionSpec.DiskLocator()
	pod_config = vim.storageDrs.PodSelectionSpec.VmPodConfig()
	pod_config.storagePod = datastore_cluster_obj
	pod_config.disk = [disk_loc]
	pod_sel_spec = vim.storageDrs.PodSelectionSpec()
	pod_sel_spec.initialVmConfig = [pod_config]
	storage_spec = vim.storageDrs.StoragePlacementSpec()
	storage_spec.configSpec = vim.vm.ConfigSpec()
	storage_spec.configSpec.deviceChange.append(disk_spec_obj)
	storage_spec.resourcePool = self.vm.resourcePool
	storage_spec.podSelectionSpec = pod_sel_spec
	storage_spec.vm = self.vm
	storage_spec.type = 'reconfigure'
	try:
	rec = self.content.storageResourceManager.RecommendDatastores(storageSpec=storage_spec)
	rec_action = rec.recommendations[0].action[0]
	return rec_action.destination.name
	except Exception:
	# There is some error so we fall back to general workflow
	pass
	datastore = None
	datastore_freespace = 0
	for ds in datastore_cluster_obj.childEntity:
	if ds.summary.maintenanceMode == "inMaintenance":
	continue
	if ds.summary.freeSpace > datastore_freespace:
	# If datastore field is provided, filter destination datastores
	datastore = ds
	datastore_freespace = ds.summary.freeSpace
	if datastore:
	return datastore.name
	return None

module_utils/vmware:

community.vmware/plugins/module_utils/vmware.py

Lines 1639 to 1679 in c673d75

	def get_recommended_datastore(self, datastore_cluster_obj=None):
	"""
	Return Storage DRS recommended datastore from datastore cluster
	Args:
	datastore_cluster_obj: datastore cluster managed object
	Returns: Name of recommended datastore from the given datastore cluster
	"""
	if datastore_cluster_obj is None:
	return None
	# Check if Datastore Cluster provided by user is SDRS ready
	sdrs_status = datastore_cluster_obj.podStorageDrsEntry.storageDrsConfig.podConfig.enabled
	if sdrs_status:
	# We can get storage recommendation only if SDRS is enabled on given datastorage cluster
	pod_sel_spec = vim.storageDrs.PodSelectionSpec()
	pod_sel_spec.storagePod = datastore_cluster_obj
	storage_spec = vim.storageDrs.StoragePlacementSpec()
	storage_spec.podSelectionSpec = pod_sel_spec
	storage_spec.type = 'create'
	try:
	rec = self.content.storageResourceManager.RecommendDatastores(storageSpec=storage_spec)
	rec_action = rec.recommendations[0].action[0]
	return rec_action.destination.name
	except Exception:
	# There is some error so we fall back to general workflow
	pass
	datastore = None
	datastore_freespace = 0
	for ds in datastore_cluster_obj.childEntity:
	if isinstance(ds, vim.Datastore) and ds.summary.freeSpace > datastore_freespace:
	# If datastore field is provided, filter destination datastores
	if not self.is_datastore_valid(datastore_obj=ds):
	continue
	datastore = ds
	datastore_freespace = ds.summary.freeSpace
	if datastore:
	return datastore.name
	return None