Ravi Nori has uploaded a new change for review. Change subject: engine, webadmin: Inconsistent maintenance mode handling via host-deploy ......................................................................
engine, webadmin: Inconsistent maintenance mode handling via host-deploy When the host is reinstalled a new check box is presented that lets the host be activated after reinstall. Change-Id: Ic90eb22664ead14fbe64523fbd4f42cd02ab1601 Bug-Url: https://bugzilla.redhat.com/1087524 Signed-off-by: Ravi Nori <rn...@redhat.com> --- 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/InstallVdsInternalCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.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/hosts/InstallModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml 10 files changed, 53 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/30023/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 332fd07..7f982ca 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 @@ -169,6 +169,7 @@ final InstallVdsParameters installVdsParameters = new InstallVdsParameters(getVdsId(), getParameters().getPassword()); installVdsParameters.setAuthMethod(getParameters().getAuthMethod()); installVdsParameters.setOverrideFirewall(getParameters().getOverrideFirewall()); + installVdsParameters.setActivateHost(getParameters().getActivateHost()); installVdsParameters.setRebootAfterInstallation(getParameters().isRebootAfterInstallation()); installVdsParameters.setNetworkProviderId(getParameters().getNetworkProviderId()); installVdsParameters.setNetworkMappings(getParameters().getNetworkMappings()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java index 59e2314..7b4a58e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsInternalCommand.java @@ -163,7 +163,7 @@ if (!configureNetworkUsingHostDeploy) { configureManagementNetwork(); } - if (VDSStatus.Maintenance.equals(vdsInitialStatus)) { + if (!getParameters().getActivateHost() && VDSStatus.Maintenance.equals(vdsInitialStatus)) { setVdsStatus(VDSStatus.Maintenance); } else { setVdsStatus(VDSStatus.Initializing); @@ -223,6 +223,9 @@ } private VDSStatus getStatusOnReboot() { + if (getParameters().getActivateHost()) { + return VDSStatus.NonResponsive; + } return (VDSStatus.Maintenance.equals(vdsInitialStatus)) ? VDSStatus.Maintenance : VDSStatus.NonResponsive; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java index 2edb7d9..872633f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java @@ -145,6 +145,7 @@ tempVar.setIsReinstallOrUpgrade(getParameters().getIsReinstallOrUpgrade()); tempVar.setoVirtIsoFile(getParameters().getoVirtIsoFile()); tempVar.setOverrideFirewall(getParameters().getOverrideFirewall()); + tempVar.setActivateHost(getParameters().getActivateHost()); tempVar.setRebootAfterInstallation(getParameters().isRebootAfterInstallation()); tempVar.setNetworkProviderId(getParameters().getNetworkProviderId()); tempVar.setNetworkMappings(getParameters().getNetworkMappings()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java index c7dafb9..07174a6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpgradeOvirtNodeInternalCommand.java @@ -175,7 +175,7 @@ RunSleepOnReboot(getStatusOnReboot()); break; case Complete: - if (VDSStatus.Maintenance.equals(vdsInitialStatus)) { + if (!getParameters().getActivateHost() && VDSStatus.Maintenance.equals(vdsInitialStatus)) { setVdsStatus(VDSStatus.Maintenance); } else { setVdsStatus(VDSStatus.Initializing); @@ -215,6 +215,9 @@ } private VDSStatus getStatusOnReboot() { + if (getParameters().getActivateHost()) { + return VDSStatus.NonResponsive; + } return (VDSStatus.Maintenance.equals(vdsInitialStatus)) ? VDSStatus.Maintenance : VDSStatus.NonResponsive; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java index 8eb5dc1..bd9737b 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java @@ -19,6 +19,8 @@ private boolean overrideFirewall; + private boolean activateHost; + /** * reboot the installed Host when done */ @@ -125,6 +127,14 @@ return overrideFirewall; } + public void setActivateHost(boolean activateHost) { + this.activateHost = activateHost; + } + + public boolean getActivateHost() { + return activateHost; + } + public boolean isRebootAfterInstallation() { return rebootAfterInstallation; } 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 cf3c438..bad6aa2 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 @@ -1326,6 +1326,7 @@ model.getOverrideIpTables().setIsAvailable(true); model.getOverrideIpTables().setEntity(true); } + model.getActivateHostAfterInstall().setEntity(true); addInstallCommands(model, host, false); getWindow().stopProgress(); } @@ -1366,6 +1367,7 @@ param.setInstallVds(true); param.setoVirtIsoFile(null); param.setOverrideFirewall(model.getOverrideIpTables().getEntity()); + param.setActivateHost(model.getActivateHostAfterInstall().getEntity()); param.setAuthMethod(model.getAuthenticationMethod()); Provider<?> networkProvider = (Provider<?>) model.getNetworkProviders().getSelectedItem(); @@ -1413,6 +1415,7 @@ model.getOVirtISO().setIsAvailable(false); model.getOverrideIpTables().setIsAvailable(false); + model.getActivateHostAfterInstall().setEntity(true); model.getHostVersion().setEntity(host.getHostOs()); model.getHostVersion().setIsAvailable(false); @@ -1492,6 +1495,7 @@ param.setInstallVds(true); param.setoVirtIsoFile(isOVirt ? model.getOVirtISO().getSelectedItem().getRpmName() : null); param.setOverrideFirewall(model.getOverrideIpTables().getEntity()); + param.setActivateHost(model.getActivateHostAfterInstall().getEntity()); param.setAuthMethod(model.getAuthenticationMethod()); Provider<?> networkProvider = (Provider<?>) model.getNetworkProviders().getSelectedItem(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java index a520ef5..651220b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java @@ -51,6 +51,16 @@ privateOverrideIpTables = value; } + private EntityModel<Boolean> activateHostAfterInstall; + + public EntityModel<Boolean> getActivateHostAfterInstall() { + return activateHostAfterInstall; + } + + private void setActivateHostAfterInstall(EntityModel<Boolean> value) { + activateHostAfterInstall = value; + } + private EntityModel<String> hostVersion; public EntityModel<String> getHostVersion() { @@ -138,7 +148,9 @@ setHostVersion(new EntityModel<String>()); setOverrideIpTables(new EntityModel<Boolean>()); + setActivateHostAfterInstall(new EntityModel<Boolean>()); getOverrideIpTables().setEntity(false); + getActivateHostAfterInstall().setEntity(false); setUserName(new EntityModel<String>()); getUserName().setEntity(HostModel.RootUserName); // TODO: remove setIsChangable when configured ssh username is enabled diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 9107e9a..8d50e52 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -644,6 +644,9 @@ @DefaultStringValue("Automatically configure host firewall") String hostInstallOverrideIpTablesLabel(); + @DefaultStringValue("Activate host after install") + String activateHostAfterInstallLabel(); + @DefaultStringValue("General") String importVmGeneralSubTabLabel(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java index a8c7719..1e9f624 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java @@ -77,6 +77,11 @@ EntityModelCheckBoxEditor overrideIpTablesEditor; @UiField + @Path(value = "activateHostAfterInstall.entity") + @WithElementId("activateHostAfterInstall") + EntityModelCheckBoxEditor activateHostAfterInstallEditor; + + @UiField Label message; @UiField @@ -157,6 +162,7 @@ hostVersionEditor.setLabel(constants.hostInstallHostVersionLabel()); isoEditor.setLabel(constants.hostInstallIsoLabel()); overrideIpTablesEditor.setLabel(constants.hostInstallOverrideIpTablesLabel()); + activateHostAfterInstallEditor.setLabel(constants.activateHostAfterInstallLabel()); authLabel.setText(constants.hostPopupAuthLabel()); userNameEditor.setLabel(constants.hostPopupUsernameLabel()); publicKeyEditor.setTitle(constants.publicKeyUsage()); @@ -236,11 +242,14 @@ interface Style extends CssResource { String overrideIpStyle(); + String activateHostAfterInstallStyle(); + String pkStyle(); } private void addStyles() { overrideIpTablesEditor.addContentWidgetStyleName(style.overrideIpStyle()); + activateHostAfterInstallEditor.addContentWidgetStyleName(style.activateHostAfterInstallStyle()); publicKeyEditor.setCustomStyle(style.pkStyle()); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml index d99c213..fe75fbf 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.ui.xml @@ -52,6 +52,10 @@ width: 200px; } + .activateHostAfterInstallStyle { + width: 200px; + } + </ui:style> <d:SimpleDialogPanel width="700px" height="400px"> @@ -76,6 +80,7 @@ <ge:EntityModelCheckBoxEditor ui:field="overrideIpTablesEditor"/> <ge:StringEntityModelLabelEditor ui:field="hostVersionEditor"/> <e:ListModelListBoxEditor ui:field="isoEditor"/> + <ge:EntityModelCheckBoxEditor ui:field="activateHostAfterInstallEditor"/> <g:Label ui:field="message" addStyleNames="{style.errorMessageLabel}"/> </g:VerticalPanel> </t:content> -- To view, visit http://gerrit.ovirt.org/30023 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic90eb22664ead14fbe64523fbd4f42cd02ab1601 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
