Tal Nisan has uploaded a new change for review. Change subject: core: Add method to determine if StorageDomainType is of type ISO or Export ......................................................................
core: Add method to determine if StorageDomainType is of type ISO or Export The checks if a storage domain is of ISO/Export or Data/Master repeats itself throughout the code base, there is already a method on the StorageDomainType enum to determine if the type is Data/Master, added another method to determine if the type is ISO/Export and replaced the checks for each combination with the respected method Change-Id: I8d10d0eca9127b3e0e6fbf89484301e61bf233b2 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainType.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java 15 files changed, 23 insertions(+), 42 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/24135/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java index 908f85b..ceed1b5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java @@ -15,7 +15,6 @@ import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.errors.VdcBllMessages; @@ -52,7 +51,7 @@ new Predicate<StorageDomain>() { @Override public boolean eval(StorageDomain a) { - return (a.getStorageDomainType() != StorageDomainType.ISO && a.getStorageDomainType() != StorageDomainType.ImportExport) + return (!a.getStorageDomainType().isIsoOrImportExportDomain()) && (a.getStatus() != null) && (a.getStatus() == StorageDomainStatus.Active); } }); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index ba652e7..3d71e02 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -41,7 +41,6 @@ import org.ovirt.engine.core.common.businessentities.Permissions; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmDevice; @@ -416,8 +415,7 @@ return false; } - if (storage.getStorageDomainType() == StorageDomainType.ImportExport - || storage.getStorageDomainType() == StorageDomainType.ISO) { + if (storage.getStorageDomainType().isIsoOrImportExportDomain()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java index 7dfe9ff..e1f04fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java @@ -28,7 +28,6 @@ import org.ovirt.engine.core.common.businessentities.EditableOnVmStatusField; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; @@ -690,8 +689,7 @@ long reservedSizeForDisks = domain2reservedSpaceInDomain.containsKey(currDomain) ? domain2reservedSpaceInDomain.get(currDomain) : 0; long sizeNeeded = sizeRequested + reservedSizeForDisks; - if ((currDomain.getStorageDomainType().equals(StorageDomainType.Master) - || currDomain.getStorageDomainType().equals(StorageDomainType.Data)) + if (currDomain.getStorageDomainType().isDataDomain() && currDomain.getStatus() == StorageDomainStatus.Active && doesStorageDomainHaveSpaceForRequest(currDomain, sizeNeeded)) { return currDomain; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java index 91fd054..c4c4899 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStoragePoolCommand.java @@ -326,7 +326,7 @@ } for (StorageDomain domain : poolDomains) { // check that there are no images on data domains - if ((domain.getStorageDomainType() == StorageDomainType.Data || domain.getStorageDomainType() == StorageDomainType.Master) + if (domain.getStorageDomainType().isDataDomain() && getDbFacade().getDiskImageDao().getAllSnapshotsForStorageDomain(domain.getId()).size() != 0) { return failCanDoAction(VdcBllMessages.ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_IMAGES); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java index ca7923e..cd56fbb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java @@ -241,7 +241,7 @@ private boolean isStorageDomainOfTypeIsoOrExport(StorageDomain storageDomain) { - return storageDomain.getStorageDomainType() == StorageDomainType.ISO || storageDomain.getStorageDomainType() == StorageDomainType.ImportExport; + return storageDomain.getStorageDomainType().isIsoOrImportExportDomain(); } /** @@ -379,8 +379,7 @@ * @return */ protected boolean isStorageDomainFormatCorrectForDC(StorageDomain storageDomain, StoragePool storagePool) { - if (storageDomain.getStorageDomainType() == StorageDomainType.ISO - || storageDomain.getStorageDomainType() == StorageDomainType.ImportExport) { + if (storageDomain.getStorageDomainType().isIsoOrImportExportDomain()) { return true; } Set<StorageFormatType> supportedFormatsSet = diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java index 55c8f63..2cbb7b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStorageServerConnectionCommand.java @@ -17,7 +17,6 @@ import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainSharedStatus; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -197,7 +196,7 @@ } protected boolean isDomainInEditState(StorageDomain storageDomain) { - boolean isEditable = (storageDomain.getStorageDomainType() == StorageDomainType.Data || storageDomain.getStorageDomainType() == StorageDomainType.Master) + boolean isEditable = storageDomain.getStorageDomainType().isDataDomain() && (storageDomain.getStatus() == StorageDomainStatus.Maintenance || storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached); return isEditable; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java index 3f40f9b..3ded5cf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/StorageDomainValidator.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainDynamic; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.config.Config; @@ -42,8 +41,7 @@ } public ValidationResult domainIsValidDestination() { - if (storageDomain.getStorageDomainType() == StorageDomainType.ISO - || storageDomain.getStorageDomainType() == StorageDomainType.ImportExport) { + if (storageDomain.getStorageDomainType().isIsoOrImportExportDomain()) { return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_TYPE_ILLEGAL); } return ValidationResult.VALID; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainType.java index 26e0368..e52848f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainType.java @@ -20,4 +20,8 @@ public boolean isDataDomain() { return (this == Data || this == Master); } + + public boolean isIsoOrImportExportDomain() { + return (this == ISO || this == ImportExport); + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index a43f2b4..a917bbe 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -285,8 +285,7 @@ public static boolean isDataActiveStorageDomain(StorageDomain storageDomain) { - boolean isData = storageDomain.getStorageDomainType() == StorageDomainType.Data || - storageDomain.getStorageDomainType() == StorageDomainType.Master; + boolean isData = storageDomain.getStorageDomainType().isDataDomain(); boolean isActive = isActiveStorageDomain(storageDomain); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index a0369e4..abb6f9b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -6,7 +6,6 @@ import org.ovirt.engine.core.common.businessentities.AuditLog; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.StorageDomain; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.compat.RefObject; import org.ovirt.engine.core.compat.Regex; @@ -385,9 +384,7 @@ if (type == SystemTreeItemType.Storage && entity != null) { StorageDomain storage = (StorageDomain) entity; - isDataStorage = - storage.getStorageDomainType() == StorageDomainType.Data - || storage.getStorageDomainType() == StorageDomainType.Master; + isDataStorage = storage.getStorageDomainType().isDataDomain(); } diskList.setIsAvailable(type == SystemTreeItemType.DataCenter diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 91a0c15..6a79670 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -355,8 +355,7 @@ ArrayList<StorageDomain> attachedDataStorages = new ArrayList<StorageDomain>(); for (StorageDomain a : attachedStorageDomains) { - if (a.getStorageDomainType() == StorageDomainType.Data - || a.getStorageDomainType() == StorageDomainType.Master) + if (a.getStorageDomainType().isDataDomain()) { attachedDataStorages.add(a); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java index 74835b3..d3858a7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.businessentities.QuotaStorage; import org.ovirt.engine.core.common.businessentities.QuotaVdsGroup; import org.ovirt.engine.core.common.businessentities.StorageDomain; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.interfaces.SearchType; @@ -231,8 +230,7 @@ ArrayList<QuotaStorage> quotaStorageList = new ArrayList<QuotaStorage>(); QuotaStorage quotaStorage; for (StorageDomain storage : storageList) { - if (!storage.getStorageDomainType().equals(StorageDomainType.Master) - && !storage.getStorageDomainType().equals(StorageDomainType.Data)) { + if (!storage.getStorageDomainType().isDataDomain()) { continue; } quotaStorage = new QuotaStorage(); @@ -494,8 +492,7 @@ ArrayList<QuotaStorage> quotaStorageList = new ArrayList<QuotaStorage>(); QuotaStorage quotaStorage; for (StorageDomain storage : storageList) { - if (!storage.getStorageDomainType().equals(StorageDomainType.Master) - && !storage.getStorageDomainType().equals(StorageDomainType.Data)) { + if (!storage.getStorageDomainType().isDataDomain()) { continue; } quotaStorage = new QuotaStorage(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 2678d8f..c557ca3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -799,8 +799,7 @@ removeStorageModel.getHostList().setItems(hosts); removeStorageModel.getHostList().setSelectedItem(Linq.firstOrDefault(hosts)); removeStorageModel.getFormat() - .setIsAvailable(storage.getStorageDomainType() == StorageDomainType.ISO - || storage.getStorageDomainType() == StorageDomainType.ImportExport); + .setIsAvailable(storage.getStorageDomainType().isIsoOrImportExportDomain()); if (hosts.isEmpty()) { UICommand tempVar = createCancelCommand("Cancel"); //$NON-NLS-1$ @@ -836,7 +835,7 @@ RemoveStorageDomainParameters tempVar = new RemoveStorageDomainParameters(storage.getId()); tempVar.setVdsId(host.getId()); - tempVar.setDoFormat((storage.getStorageDomainType() == StorageDomainType.Data || storage.getStorageDomainType() == StorageDomainType.Master) ? true + tempVar.setDoFormat(storage.getStorageDomainType().isDataDomain() ? true : (Boolean) model.getFormat().getEntity()); Frontend.getInstance().runAction(VdcActionType.RemoveStorageDomain, tempVar, null, this); @@ -1072,8 +1071,7 @@ StorageDomain storage = (StorageDomain) getSelectedItem(); boolean isBackupStorage = storage.getStorageDomainType() == StorageDomainType.ImportExport; boolean isDataStorage = - storage.getStorageDomainType() == StorageDomainType.Data - || storage.getStorageDomainType() == StorageDomainType.Master; + storage.getStorageDomainType().isDataDomain(); boolean isImageStorage = storage.getStorageDomainType() == StorageDomainType.Image || storage.getStorageDomainType() == StorageDomainType.ISO; @@ -1151,7 +1149,7 @@ || storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Mixed; boolean isInMaintenance = (storageDomain.getStatus() == StorageDomainStatus.Maintenance); boolean isUnattached = (storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached); - boolean isDataDomain = (storageDomain.getStorageDomainType() == StorageDomainType.Data) || (storageDomain.getStorageDomainType() == StorageDomainType.Master); + boolean isDataDomain = storageDomain.getStorageDomainType().isDataDomain(); boolean isBlockStorage = storageDomain.getStorageType().isBlockDomain(); isEditAvailable = isActive || isBlockStorage || ((isInMaintenance || isUnattached) && isDataDomain); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index 60dde15..11a384a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.ScsiGenericIO; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; @@ -370,9 +369,7 @@ ArrayList<StorageDomain> filteredStorageDomains = new ArrayList<StorageDomain>(); for (StorageDomain a : storageDomains) { - if (a.getStorageDomainType() != StorageDomainType.ISO - && a.getStorageDomainType() != StorageDomainType.ImportExport - && a.getStatus() == StorageDomainStatus.Active) + if (!a.getStorageDomainType().isIsoOrImportExportDomain() && a.getStatus() == StorageDomainStatus.Active) { filteredStorageDomains.add(a); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index a19fd7b..ab3df19 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -12,7 +12,6 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; @@ -359,7 +358,7 @@ for (StorageDomain storageDomain : (ArrayList<StorageDomain>) returnValue) { if (storageDomain.getStatus() == StorageDomainStatus.Active - && (storageDomain.getStorageDomainType() == StorageDomainType.Data || storageDomain.getStorageDomainType() == StorageDomainType.Master)) + && storageDomain.getStorageDomainType().isDataDomain()) { activeStorageDomainList.add(storageDomain); } -- To view, visit http://gerrit.ovirt.org/24135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d10d0eca9127b3e0e6fbf89484301e61bf233b2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
