Moti Asayag has uploaded a new change for review. Change subject: engine: DRY with host type check ......................................................................
engine: DRY with host type check Instead of examining the host type, the entity can report if it is an oVirt-node or not. Change-Id: Id73aeb7ec3c343eae097d6b6f123487a8865cdaf Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeHostInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.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/validator/UpgradeHostValidator.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java 9 files changed, 14 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/41128/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java index e6ab0bc..d582007 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java @@ -59,12 +59,8 @@ return mUpdateVdsStatic.IsFieldsUpdated(source, destination, list); } - static private boolean isPendingOvirt(VDSType type, VDSStatus status) { - return type == VDSType.oVirtNode && status == VDSStatus.PendingApproval; - } - - static public boolean isPendingOvirt(VDS vds) { - return isPendingOvirt(vds.getVdsType(), vds.getStatus()); + public static boolean isPendingOvirt(VDS vds) { + return vds.isOvirtNode() && vds.getStatus() == VDSStatus.PendingApproval; } /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeHostInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeHostInternalCommand.java index 4d509d8..729ccff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeHostInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeHostInternalCommand.java @@ -72,7 +72,7 @@ setVdsStatus(VDSStatus.InstallFailed); return; } - } else if (getVds().getVdsType() == VDSType.oVirtNode) { + } else if (getVds().isOvirtNode()) { InstallVdsParameters parameters = new InstallVdsParameters(getVdsId()); parameters.setIsReinstallOrUpgrade(true); parameters.setoVirtIsoFile(getParameters().getoVirtIsoFile()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java index ba9d47c..0aedcd0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpgradeOvirtNodeInternalCommand.java @@ -203,7 +203,7 @@ private boolean isOvirtReInstallOrUpgrade() { return ( getParameters().getIsReinstallOrUpgrade() && - getVds().getVdsType() == VDSType.oVirtNode + getVds().isOvirtNode() ); } 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 7aee331..472ff8d 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 @@ -58,7 +58,7 @@ } // we limit RHEV-H local storage to its persistence mount - /data/images/rhev/ - if (retVal && this.getVds().getVdsType() == VDSType.oVirtNode) { + if (retVal && this.getVds().isOvirtNode()) { StorageServerConnections conn = DbFacade.getInstance().getStorageServerConnectionDao().get(getParameters().getStorageDomain() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpgradeHostValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpgradeHostValidator.java index 5dbc881..de0b23e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpgradeHostValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/UpgradeHostValidator.java @@ -35,12 +35,12 @@ public ValidationResult updatesAvailable() { return ValidationResult.failWith(VdcBllMessages.NO_AVAILABLE_UPDATES_FOR_HOST) - .unless(host.getVdsType() == VDSType.oVirtNode || host.isUpdateAvailable()); + .unless(host.isOvirtNode() || host.isUpdateAvailable()); } public ValidationResult imageProvidedForOvirtNode(String image) { return ValidationResult.failWith(VdcBllMessages.VDS_CANNOT_INSTALL_MISSING_IMAGE_FILE) - .when(host.getVdsType() == VDSType.oVirtNode && StringUtils.isBlank(image)); + .when(host.isOvirtNode() && StringUtils.isBlank(image)); } public ValidationResult hostWasInstalled() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index 0640874..7629f3a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -1343,4 +1343,8 @@ public void setAdditionalFeatures(Set<String> additionalFeatures) { vdsDynamic.setAdditionalFeatures(additionalFeatures); } + + public boolean isOvirtNode() { + return getVdsType() == VDSType.oVirtNode; + } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java index d287135..cd1bda0 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java @@ -174,7 +174,7 @@ UpdateVdsActionParameters params = new UpdateVdsActionParameters(vds.getStaticData(), action.getRootPassword(), true); params = (UpdateVdsActionParameters) getMapper (Action.class, VdsOperationActionParameters.class).map(action, (VdsOperationActionParameters) params); - if (vds.getVdsType()==VDSType.oVirtNode) { + if (vds.isOvirtNode()) { params.setReinstallOrUpgrade(true); if (action.isSetImage()) { params.setoVirtIsoFile(action.getImage()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 4a87d6e..46a49eb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -1804,7 +1804,7 @@ model.setHelpTag(HelpTag.configure_local_storage); model.setHashName("configure_local_storage"); //$NON-NLS-1$ - if (host.getVdsType() == VDSType.oVirtNode) { + if (host.isOvirtNode()) { configureLocalStorage2(model); } else { configureLocalStorage3(model); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java index d966d88..2f3a40c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java @@ -350,8 +350,7 @@ { getSelectedItem().getUpdateCommand().execute(); - VDSType vdsType = this.getHost().getSelectedItem().getVdsType(); - String prefix = vdsType.equals(VDSType.oVirtNode) ? localFSPath : ""; //$NON-NLS-1$ + String prefix = host.isOvirtNode() ? localFSPath : ""; //$NON-NLS-1$ if (!StringHelper.isNullOrEmpty(prefix)) { for (Object item : getItems()) -- To view, visit https://gerrit.ovirt.org/41128 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id73aeb7ec3c343eae097d6b6f123487a8865cdaf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
