Tal Nisan has uploaded a new change for review. Change subject: core,webadmin: Added flag on storage pool that marks a local fs pool ......................................................................
core,webadmin: Added flag on storage pool that marks a local fs pool As a part of the effort to allow mixed domains pool, the checks on a storage pool to check if it's local will now be with a designated method isLocal() which return true if the pool is local Relates-To: https://bugzilla.redhat.com/1038053 Change-Id: I4f1067fd1d299a93b9555c4714b4e85ff980a830 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.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/StorageDomainCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.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/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 21 files changed, 31 insertions(+), 40 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/23582/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java index f160018..b77a890 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java @@ -31,7 +31,6 @@ import org.ovirt.engine.core.common.action.VdsOperationActionParameters.AuthenticationMethod; import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VdsDynamic; @@ -486,7 +485,7 @@ StoragePool storagePool = DbFacade.getInstance().getStoragePoolDao().getForVdsGroup( getParameters().getVdsStaticData().getVdsGroupId()); - if (storagePool != null && storagePool.getStorageType() == StorageType.LOCALFS) { + if (storagePool != null && storagePool.isLocal()) { if (!DbFacade.getInstance() .getVdsStaticDao() .getAllForVdsGroup(getParameters().getVdsStaticData().getVdsGroupId()) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java index 2d1bb1c..6f5e667 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdsGroupOperationParameters; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; import org.ovirt.engine.core.common.businessentities.network.NetworkStatus; @@ -112,7 +111,7 @@ VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST .toString()); result = false; - } else if (storagePool.getStorageType() == StorageType.LOCALFS) { + } else if (storagePool.isLocal()) { // we allow only one cluster in localfs data center if (!DbFacade.getInstance() .getVdsGroupDao().getAllForStoragePool(getVdsGroup().getStoragePoolId()) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index 3ff94c0..47ad5aa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VdsStatic; @@ -87,7 +86,7 @@ } targetStoragePool = DbFacade.getInstance().getStoragePoolDao().getForVdsGroup(getTargetCluster().getId()); - if (targetStoragePool != null && targetStoragePool.getStorageType() == StorageType.LOCALFS) { + if (targetStoragePool != null && targetStoragePool.isLocal()) { if (!DbFacade.getInstance().getVdsStaticDao().getAllForVdsGroup(getParameters().getClusterId()).isEmpty()) { addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_ADD_MORE_THEN_ONE_HOST_TO_LOCAL_STORAGE); return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java index bebd2b5..ba12b85 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.RemoveVdsParameters; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.gluster.GlusterServerInfo; @@ -86,7 +85,7 @@ boolean returnValue = canRemoveVds(getVdsId(), getReturnValue().getCanDoActionMessages()); StoragePool storagePool = getStoragePoolDAO().getForVds(getParameters().getVdsId()); - if (returnValue && storagePool != null && storagePool.getStorageType() == StorageType.LOCALFS) { + if (returnValue && storagePool != null && storagePool.isLocal()) { if (!getStorageDomainDAO().getAllForStoragePool(storagePool.getId()).isEmpty()) { returnValue = failCanDoAction(VdcBllMessages.VDS_CANNOT_REMOVE_HOST_WITH_LOCAL_STORAGE); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index db6ad5a..6fe0134 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -14,7 +14,6 @@ import org.ovirt.engine.core.common.action.VdsGroupOperationParameters; import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; @@ -296,7 +295,7 @@ } if (result && getVdsGroup().getStoragePoolId() != null) { StoragePool storagePool = getStoragePoolDAO().get(getVdsGroup().getStoragePoolId()); - if (oldGroup.getStoragePoolId() == null && storagePool.getStorageType() == StorageType.LOCALFS) { + if (oldGroup.getStoragePoolId() == null && storagePool.isLocal()) { // we allow only one cluster in localfs data center if (!getVdsGroupDAO().getAllForStoragePool(getVdsGroup().getStoragePoolId()).isEmpty()) { getReturnValue() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java index 91d0688..47763b1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddLocalStorageDomainCommand.java @@ -47,7 +47,7 @@ if (retVal && getStorageDomain().getStorageType() == StorageType.LOCALFS && - storagePool.getStorageType() != StorageType.LOCALFS) { + !storagePool.isLocal()) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_IS_NOT_LOCAL); retVal = false; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java index cfbdbb4..e554acf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; @@ -73,7 +72,7 @@ // check problematic vds status if (IsLegalStatus(_problematicVds.getStatus())) { if (_problematicVds.getSpmStatus() == VdsSpmStatus.SPM) { - if(getStoragePool().getStorageType() != StorageType.LOCALFS) { + if(!getStoragePool().isLocal()) { returnValue = returnValue && initializeVds(); } if (returnValue && getStoragePool().getStatus() != StoragePoolStatus.NotOperational @@ -178,7 +177,7 @@ && masterDomain.getStatus() != null && (masterDomain.getStatus() == StorageDomainStatus.Active || masterDomain.getStatus() == StorageDomainStatus.Unknown || masterDomain.getStatus() == StorageDomainStatus.InActive)) { - if (getStoragePool().getStorageType() != StorageType.LOCALFS) { + if (!getStoragePool().isLocal()) { for (VDS vds : getAllRunningVdssInPool()) { try { SpmStatusResult statusResult = (SpmStatusResult) Backend 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 4fb1ef8..0907702 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 @@ -199,7 +199,7 @@ }); setSucceeded(true); - if (getStoragePool().getStorageType() != StorageType.LOCALFS) { + if (!getStoragePool().isLocal()) { for (VDS vds : vdss) { StorageHelperDirector.getInstance().getItem(getStoragePool().getStorageType()) .disconnectStorageFromDomainByVdsId(masterDomain, vds.getId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java index ed51ebb..57a27a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageDomainCommandBase.java @@ -108,7 +108,7 @@ protected boolean isNotLocalData(final boolean isInternal) { boolean returnValue = true; - if (this.getStoragePool().getStorageType() == StorageType.LOCALFS + if (this.getStoragePool().isLocal() && getStorageDomain().getStorageDomainType() == StorageDomainType.Data && !isInternal) { returnValue = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java index ffac493..ac756d7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java @@ -59,7 +59,7 @@ } public ValidationResult isNotLocalfsWithDefaultCluster() { - if (storagePool.getStorageType() == StorageType.LOCALFS && containsDefaultCluster()) { + if (storagePool.isLocal() && containsDefaultCluster()) { return new ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_POOL_WITH_DEFAULT_VDS_GROUP_CANNOT_BE_LOCALFS); } return ValidationResult.VALID; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java index 57d1179..a796a988 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java @@ -106,7 +106,13 @@ public StorageType getStorageType() { return storageType; + } + /** + * @return True is the Storage Pool is local, false if it's shared + */ + public boolean isLocal() { + return getStorageType() == StorageType.LOCALFS; } public void setStorageType(StorageType value) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index 306bc5d..4b02f46 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; @@ -229,7 +228,7 @@ model.dataCenter = (StoragePool) returnValue; if (model.dataCenter == null - || model.dataCenter.getStorageType() != StorageType.LOCALFS) + || !model.dataCenter.isLocal()) { model.updateOptionsNonLocalFSData(); } @@ -280,7 +279,7 @@ public void onSuccess(Object target, Object returnValue) { dataCenter = (StoragePool) returnValue; - boolean isMultiHostDC = dataCenter.getStorageType() == StorageType.LOCALFS; + boolean isMultiHostDC = dataCenter.isLocal(); if (isMultiHostDC) { model.setMultiSelection(false); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index 2a4bfcb..71e3b1c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -11,7 +11,6 @@ import org.ovirt.engine.core.common.businessentities.MigrateOnErrorOptions; import org.ovirt.engine.core.common.businessentities.ServerCpu; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; @@ -1422,7 +1421,7 @@ { return; } - if (selectedDataCenter.getStorageType() == StorageType.LOCALFS) + if (selectedDataCenter.isLocal()) { setIsResiliencePolicyTabAvailable(false); } 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 fe83e2f..630e97b 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 @@ -23,7 +23,6 @@ import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VDSStatus; @@ -538,7 +537,7 @@ { startProgress(null); - if (getEntity().getStorageType() != StorageType.LOCALFS) + if (!getEntity().isLocal()) { updateOptionsNonLocalFSData(); } @@ -1430,7 +1429,7 @@ // In case of local storage, do not show the cluster selection in host select menu as there can be only one cluster in that case //also only one host is allowed in the cluster so we should disable multi selection - boolean isMultiHostDC = getEntity().getStorageType() == StorageType.LOCALFS; + boolean isMultiHostDC = getEntity().isLocal(); if (isMultiHostDC) { model.getCluster().setIsAvailable(false); model.setMultiSelection(false); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index 0392755..747e887 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -859,7 +859,7 @@ } getRecoveryStorageCommand().setIsExecutionAllowed(items != null && items.size() == 1 - && !items.iterator().next().getStorageType().equals(StorageType.LOCALFS)); + && !items.iterator().next().isLocal()); // System tree dependent actions. boolean isAvailable = diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java index 9f42ed4..1d4dc92 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java @@ -692,7 +692,7 @@ if (getEntity() != null) { - getAttachStorageCommand().setIsExecutionAllowed(getEntity().getStorageType() != StorageType.LOCALFS); + getAttachStorageCommand().setIsExecutionAllowed(!getEntity().isLocal()); } boolean isMasterPresents = false; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java index bed1f29..ffd974d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/ConfigureLocalStorageModel.java @@ -235,7 +235,7 @@ useCurrentSettings = true; } else { - if (tempCandidate != null && tempCandidate.getStorageType() == StorageType.LOCALFS) { + if (tempCandidate != null && tempCandidate.isLocal()) { setMessage(ConstantsManager.getInstance() .getConstants() .noteLocalStorageAlreadyConfiguredForThisHostMsg() @@ -571,7 +571,7 @@ private boolean isLocalDataCenterEmpty(StoragePool dataCenter) { - if (dataCenter != null && dataCenter.getStorageType() == StorageType.LOCALFS + if (dataCenter != null && dataCenter.isLocal() && dataCenter.getStatus() == StoragePoolStatus.Uninitialized) { return true; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java index 4bb6f3b..b5c6e51 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java @@ -79,7 +79,7 @@ private boolean isItemSelectable(IStorageModel item, StoragePool dataCenter, boolean isNoStorageAttached) { // Local SD can be attached to a local DC only - if (isLocalStorage(item) && !isLocalDataCenter(dataCenter)) { + if (isLocalStorage(item) && !dataCenter.isLocal()) { return false; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java index 2c4861e..2dfa026 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java @@ -82,12 +82,11 @@ return true; } - if (isLocalStorage(item) && !isLocalDataCenter(dataCenter)) { + if (isLocalStorage(item) != dataCenter.isLocal()) { return false; } - boolean isNoneDataCenter = dataCenter != null && - dataCenter.getId().equals(StorageModel.UnassignedDataCenterId); + boolean isNoneDataCenter = dataCenter.getId().equals(StorageModel.UnassignedDataCenterId); boolean isDataDomain = item.getRole() == StorageDomainType.Data; if (isNoneDataCenter) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java index d004a99..3fd6a2b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java @@ -112,8 +112,4 @@ protected boolean isLocalStorage(IStorageModel storage) { return storage.getType() == StorageType.LOCALFS; } - - protected boolean isLocalDataCenter(StoragePool dataCenter) { - return dataCenter.getStorageType() == StorageType.LOCALFS; - } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 99458e4..85097c5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -16,7 +16,6 @@ import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StoragePool; -import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; @@ -100,7 +99,7 @@ protected void updateMigrationForLocalSD() { boolean isLocalSD = getModel().getSelectedDataCenter() != null - && StorageType.LOCALFS.equals(getModel().getSelectedDataCenter().getStorageType()); + && getModel().getSelectedDataCenter().isLocal(); if(isLocalSD) { getModel().getIsAutoAssign().setEntity(false); getModel().getMigrationMode().setSelectedItem(MigrationSupport.PINNED_TO_HOST); @@ -753,7 +752,7 @@ VDSGroup cluster = getModel().getSelectedCluster(); String compatibilityVersion = cluster.getcompatibility_version().toString(); boolean isLocalSD = getModel().getSelectedDataCenter() != null - && StorageType.LOCALFS.equals(getModel().getSelectedDataCenter().getStorageType()); + && getModel().getSelectedDataCenter().isLocal(); // cpu pinning is available on Local SD with no consideration for auto assign value boolean hasCpuPinning = Boolean.FALSE.equals(getModel().getIsAutoAssign().getEntity()) || isLocalSD; -- To view, visit http://gerrit.ovirt.org/23582 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f1067fd1d299a93b9555c4714b4e85ff980a830 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
