Francesco Romani has uploaded a new change for review. Change subject: frontend: allow to enable/disable serial console ......................................................................
frontend: allow to enable/disable serial console Add checkbox to enable serial console when (re)install an host. Feature wiki page: http://www.ovirt.org/Features/Serial_Console Bug-Url: https://bugzilla.redhat.com/1223671 Signed-off-by: Francesco Romani <from...@redhat.com> Change-Id: Idc7d39918c30b2b869ada2321aef4ea7177be560 --- 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/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/UpgradeModel.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 M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml 10 files changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/41389/1 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 cb1c671..8a1a03a 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 @@ -406,6 +406,7 @@ model.getPort().setEntity(54321); model.getOverrideIpTables().setEntity(true); model.setSpmPriorityValue(null); + model.getEnableSerialConsole().setEntity(true); model.getCluster().setSelectedItem(getEntity()); model.getCluster().setIsChangeable(false); @@ -522,6 +523,7 @@ vdsActionParams.setOverrideFirewall(model.getOverrideIpTables().getEntity()); vdsActionParams.setRebootAfterInstallation(model.getCluster().getSelectedItem().supportsVirtService()); vdsActionParams.setFenceAgents(getFenceAgents(model)); + vdsActionParams.setEnableSerialConsole(model.getEnableSerialConsole().getEntity()); model.startProgress(null); Frontend.getInstance().runAction(VdcActionType.AddVds, vdsActionParams, 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 84d0235..cb617a8 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 @@ -1508,6 +1508,7 @@ model.getPort().setEntity(54321); model.getOverrideIpTables().setEntity(true); model.setSpmPriorityValue(null); + model.getEnableSerialConsole().setEntity(true); model.getDataCenter().setItems(Collections.singletonList(getEntity()), getEntity()); model.getDataCenter().setIsChangeable(false); @@ -1607,6 +1608,7 @@ addVdsParams.setOverrideFirewall(model.getOverrideIpTables().getEntity()); addVdsParams.setRebootAfterInstallation(model.getCluster().getSelectedItem().supportsVirtService()); addVdsParams.setFenceAgents(getFenceAgents(model)); + addVdsParams.setEnableSerialConsole(model.getEnableSerialConsole().getEntity()); model.startProgress(null); Frontend.getInstance().runAction(VdcActionType.AddVds, addVdsParams, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index d633c9a..66af2c8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -367,6 +367,18 @@ privateProtocol = value; } + private EntityModel<Boolean> privateEnableSerialConsole; + + public EntityModel<Boolean> getEnableSerialConsole() + { + return privateEnableSerialConsole; + } + + private void setEnableSerialConsole(EntityModel<Boolean> value) + { + privateEnableSerialConsole = value; + } + private EntityModel<Boolean> privateIsPm; public EntityModel<Boolean> getIsPm() 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 37a9230..acc85df 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 @@ -57,6 +57,16 @@ activateHostAfterInstall = value; } + private EntityModel<Boolean> privateEnableSerialConsole; + + public EntityModel<Boolean> getEnableSerialConsole() { + return privateEnableSerialConsole; + } + + private void setEnableSerialConsole(EntityModel<Boolean> value) { + privateEnableSerialConsole = value; + } + private EntityModel<String> hostVersion; public EntityModel<String> getHostVersion() { @@ -154,6 +164,8 @@ setPublicKey(new EntityModel<String>()); getPublicKey().setEntity(""); //$NON-NLS-1$ setValidationFailed(new EntityModel<Boolean>()); + setEnableSerialConsole(new EntityModel<Boolean>()); + getEnableSerialConsole().setEntity(true); fetchPublicKey(); setNetworkProviderModel(new HostNetworkProviderModel()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/UpgradeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/UpgradeModel.java index c1bcbe3..c4c98be 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/UpgradeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/UpgradeModel.java @@ -40,6 +40,7 @@ getActivateHostAfterInstall().setEntity(true); getHostVersion().setEntity(getVds().getHostOs()); getHostVersion().setIsAvailable(false); + getEnableSerialConsole().setIsAvailable(false); AsyncDataProvider.getInstance().getoVirtISOsList(new AsyncQuery(this, new INewAsyncCallback() { 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 fb00788..f449fee 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 @@ -626,6 +626,9 @@ @DefaultStringValue("Use JSON protocol") String hostPopupProtocolLabel(); + @DefaultStringValue("Enable serial console") + String hostPopupEnableSerialConsoleLabel(); + @DefaultStringValue("Use Foreman Hosts Providers") String hostPopupEnableExternalHostProvider(); @@ -749,6 +752,9 @@ @DefaultStringValue("Activate host after install") String activateHostAfterInstallLabel(); + @DefaultStringValue("Enable serial console") + String enableSerialConsoleLabel(); + @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 52c1cad..8dec558 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 @@ -81,6 +81,11 @@ EntityModelCheckBoxEditor activateHostAfterInstallEditor; @UiField + @Path(value = "enableSerialConsole.entity") + @WithElementId("enableSerialConsole") + EntityModelCheckBoxEditor enableSerialConsoleEditor; + + @UiField Label message; @UiField @@ -167,6 +172,7 @@ authLabel.setText(constants.hostPopupAuthLabel()); userNameEditor.setLabel(constants.hostPopupUsernameLabel()); publicKeyEditor.setTitle(constants.publicKeyUsage()); + enableSerialConsoleEditor.setLabel(constants.enableSerialConsoleLabel()); } @Override @@ -246,11 +252,14 @@ String activateHostAfterInstallStyle(); String pkStyle(); + + String enableSerialConsoleStyle(); } private void addStyles() { overrideIpTablesEditor.addContentWidgetContainerStyleName(style.overrideIpStyle()); activateHostAfterInstallEditor.addContentWidgetContainerStyleName(style.activateHostAfterInstallStyle()); publicKeyEditor.setCustomStyle(style.pkStyle()); + enableSerialConsoleEditor.addContentWidgetContainerStyleName(style.enableSerialConsoleStyle()); } } 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 a7927f1..1319221 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 @@ -56,6 +56,9 @@ width: 200px; } + .enableSerialConsoleStyle { + width: 200px; + } </ui:style> <d:SimpleDialogPanel width="700px" height="420px"> @@ -81,6 +84,7 @@ <ge:StringEntityModelLabelEditor ui:field="hostVersionEditor"/> <e:ListModelListBoxEditor ui:field="isoEditor"/> <ge:EntityModelCheckBoxEditor ui:field="activateHostAfterInstallEditor"/> + <ge:EntityModelCheckBoxEditor ui:field="enableSerialConsoleEditor"/> <g:Label ui:field="message" addStyleNames="{style.errorMessageLabel}"/> </g:VerticalPanel> </t:content> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index b5185e3..c2aa0f0 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -348,6 +348,11 @@ EntityModelCheckBoxEditor pmKdumpDetectionEditor; @UiField + @Path(value = "enableSerialConsole.entity") + @WithElementId("enableSerialConsole") + EntityModelCheckBoxEditor enableSerialConsoleEditor; + + @UiField UiCommandButton testButton; @UiField @@ -564,6 +569,7 @@ externalHostProviderEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT); overrideIpTablesEditor = new EntityModelCheckBoxEditor(Align.RIGHT); protocolEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + enableSerialConsoleEditor = new EntityModelCheckBoxEditor(Align.RIGHT); rbPassword = new RadioButton("1"); //$NON-NLS-1$ rbPublicKey = new RadioButton("1"); //$NON-NLS-1$ @@ -619,6 +625,7 @@ externalHostNameEditor.setLabel(constants.hostPopupExternalHostName()); providerSearchFilterLabel.setLabel(constants.hostPopupProviderSearchFilter()); publicKeyEditor.setTitle(constants.publicKeyUsage()); + enableSerialConsoleEditor.setLabel(constants.hostPopupEnableSerialConsoleLabel()); // Power Management tab powerManagementTab.setLabel(constants.hostPopupPowerManagementTabLabel()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml index 87e8eb5..68d35a3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.ui.xml @@ -357,6 +357,7 @@ <g:FlowPanel ui:field="expanderContent"> <ge:EntityModelCheckBoxEditor ui:field="overrideIpTablesEditor" usePatternFly="true" /> <ge:EntityModelCheckBoxEditor ui:field="protocolEditor" usePatternFly="true" /> + <ge:EntityModelCheckBoxEditor ui:field="enableSerialConsoleEditor" usePatternFly="true" /> <g:Label ui:field="fingerprintLabel" addStyleNames="{style.headerFp}" /> <ge:StringEntityModelTextBoxEditor ui:field="fetchSshFingerprint" usePatternFly="true" /> <g:SimplePanel ui:field="fetchPanel" addStyleNames="{style.fetchLink}, generalDialogComment" /> -- To view, visit https://gerrit.ovirt.org/41389 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc7d39918c30b2b869ada2321aef4ea7177be560 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Francesco Romani <from...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
