Sahina Bose has uploaded a new change for review. Change subject: webadmin: Hiding virt network fields in gluster mode ......................................................................
webadmin: Hiding virt network fields in gluster mode Hiding columns and fields not relevant in gluster only mode of installation Change-Id: If9380697adc0c6e1d698e7aacc1f9b47be0d3851 Bug-Url: https://bugzilla.redhat.com/1207947 Signed-off-by: Sahina Bose <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java 5 files changed, 44 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/41929/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index 8187f0f..d8d6920 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -14,6 +14,7 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkQoS; import org.ovirt.engine.core.common.businessentities.network.VnicProfile; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; @@ -23,6 +24,7 @@ import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -179,6 +181,18 @@ setIsGeneralTabValid(true); setIsVnicProfileTabValid(true); + updateAvailability(); + } + + private void updateAvailability() { + if (!ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)) { + getExternalProviders().setIsAvailable(false); + getNeutronPhysicalNetwork().setIsAvailable(false); + getCreateSubnet().setIsAvailable(false); + getVLanTag().setIsAvailable(false); + getHasVLanTag().setIsAvailable(false); + getExport().setIsAvailable(false); + } } private VnicProfileModel createDefaultProfile() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java index 7468552..4f82f78 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java @@ -14,6 +14,7 @@ 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.ProviderNetwork; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -22,6 +23,7 @@ import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendActionAsyncResult; @@ -95,7 +97,7 @@ @Override protected void initIsVm() { - getIsVmNetwork().setEntity(true); + getIsVmNetwork().setEntity(ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); } @Override @@ -105,9 +107,10 @@ @Override protected void onExportChanged() { - boolean externalNetwork = (Boolean) getExport().getEntity(); + boolean externalNetwork = getExport().getEntity(); getExternalProviders().setIsChangable(externalNetwork); - getIsVmNetwork().setIsChangable(!externalNetwork && isSupportBridgesReportByVDSM()); + getIsVmNetwork().setIsChangable(!externalNetwork && isSupportBridgesReportByVDSM() + && ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); if (externalNetwork) { getIsVmNetwork().setEntity(true); } @@ -149,7 +152,7 @@ parameters.setVnicProfileRequired(false); // New network - if ((Boolean) getExport().getEntity()) { + if (getExport().getEntity()) { Provider externalProvider = getExternalProviders().getSelectedItem(); ProviderNetwork providerNetwork = new ProviderNetwork(); providerNetwork.setProviderId(externalProvider.getId()); @@ -193,7 +196,7 @@ Frontend.getInstance().runMultipleAction(VdcActionType.AttachNetworkToVdsGroup, actionParameters1); - if ((Boolean) getExport().getEntity() && (Boolean) getCreateSubnet().getEntity()) { + if (getExport().getEntity() && getCreateSubnet().getEntity()) { getSubnetModel().setExternalNetwork(getNetwork().getProvidedBy()); getSubnetModel().flush(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index c3394cd..8b4bdc7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.network.NetworkQoS; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.Align; @@ -23,6 +24,7 @@ import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.table.header.CheckboxHeader; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkModel; @@ -427,6 +429,7 @@ @Override public void updateVisibility() { messageLabel.setVisible(false); + exportLabel.setVisible(ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index 1552011..b61444c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -6,6 +6,7 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.network.NetworkView; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.searchbackend.NetworkConditionFieldAutoCompleter; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; @@ -15,6 +16,7 @@ import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -77,6 +79,7 @@ CommentColumn<NetworkView> commentColumn = new CommentColumn<NetworkView>(); getTable().addColumnWithHtmlHeader(commentColumn, commentColumn.getHeaderHtml(), "30px"); //$NON-NLS-1$ + boolean virtMode = ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); TextColumnWithTooltip<NetworkView> dcColumn = new TextColumnWithTooltip<NetworkView>() { @Override @@ -86,7 +89,8 @@ }; dcColumn.makeSortable(NetworkConditionFieldAutoCompleter.DATA_CENTER); - getTable().addColumn(dcColumn, constants.dcNetwork(), "200px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(dcColumn, constants.dcNetwork(), virtMode, "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<NetworkView> descriptionColumn = new TextColumnWithTooltip<NetworkView>() { @Override @@ -146,7 +150,8 @@ } }; vlanColumn.makeSortable(NetworkConditionFieldAutoCompleter.VLAN_ID); - getTable().addColumn(vlanColumn, constants.vlanNetwork(), "60px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(vlanColumn, constants.vlanNetwork(), virtMode, "60px"); //$NON-NLS-1$ + TextColumnWithTooltip<NetworkView> labelColumn = new TextColumnWithTooltip<NetworkView>() { @Override @@ -163,7 +168,9 @@ return object.getProvidedBy() == null ? "" : object.getProviderName(); //$NON-NLS-1$ } }; - getTable().addColumn(providerColumn, constants.providerNetwork(), "200px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(providerColumn, constants.providerNetwork(), virtMode, "200px"); //$NON-NLS-1$ + + getTable().addActionButton(new WebAdminButtonDefinition<NetworkView>(constants.newNetwork()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java index b42a571..c0f2ed6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java @@ -3,6 +3,7 @@ import javax.inject.Inject; import org.ovirt.engine.core.common.businessentities.network.NetworkView; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.AbstractSubTabFormView; import org.ovirt.engine.ui.common.widget.form.FormBuilder; @@ -11,6 +12,7 @@ import org.ovirt.engine.ui.common.widget.label.GuidLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.common.widget.renderer.EmptyValueRenderer; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -70,7 +72,13 @@ formBuilder.addFormItem(new FormItem(constants.descriptionNetwork(), description, 2, 0)); formBuilder.addFormItem(new FormItem(constants.roleNetwork(), role, 0, 1)); - formBuilder.addFormItem(new FormItem(constants.vlanNetwork(), vlan, 1, 1)); + formBuilder.addFormItem(new FormItem(constants.vlanNetwork(), vlan, 1, 1) { + @Override + public boolean getIsAvailable() { + return ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); + } + }); + formBuilder.addFormItem(new FormItem(constants.mtuNetwork(), mtu, 2, 1) { public boolean getIsAvailable() { return getDetailModel().getExternalId() == null; -- To view, visit https://gerrit.ovirt.org/41929 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9380697adc0c6e1d698e7aacc1f9b47be0d3851 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
