Lior Vernia has uploaded a new change for review. Change subject: webadmin: Disable clusters incompatible with external networks ......................................................................
webadmin: Disable clusters incompatible with external networks Since it is impossible to attach an external network to a cluster that doesn't support it, it should be reflected in the GUI. Change-Id: Ida15ca4b63e894ab28f456fdd7e263405d6c679b Bug-Url: https://bugzilla.redhat.com/1049243 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.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 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/26842/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 547cc25..9b9e546 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -89,6 +89,7 @@ MigrationNetworkEnabled, VncKeyboardLayout(ConfigAuthType.User), VncKeyboardLayoutValidValues(ConfigAuthType.User), + SupportCustomDeviceProperties, CustomDeviceProperties(ConfigAuthType.User), MultipleGatewaysSupported, HostNetworkQosSupported, 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 42e1d05..b950633 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 @@ -15,6 +15,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.queries.ConfigurationValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; @@ -111,6 +112,19 @@ getIsVmNetwork().setEntity(true); getHasMtu().setEntity(false); } + + Iterable<NetworkClusterModel> networkClusters = getNetworkClusterList().getItems(); + if (networkClusters != null) { + for (NetworkClusterModel networkCluster : getNetworkClusterList().getItems()) { + if (!(Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SupportCustomDeviceProperties, + networkCluster.getEntity().getcompatibility_version().getValue())) { + networkCluster.setIsChangable(!externalNetwork); + networkCluster.setAttached(!externalNetwork); + } + networkCluster.setRequired(!externalNetwork); + } + } + super.onExportChanged(); } 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 066caf1..a800a5c 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 @@ -205,10 +205,7 @@ @Override public void onValueChange(ValueChangeEvent<Boolean> event) { - for (NetworkClusterModel networkClusterModel : getClustersTableItems()) { - networkClusterModel.setRequired(!event.getValue()); - refreshClustersTable(); - } + refreshClustersTable(); } }); subnetIpVersionEditor = new ListModelListBoxEditor<IpVersion>(new EnumRenderer<IpVersion>()); -- To view, visit http://gerrit.ovirt.org/26842 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida15ca4b63e894ab28f456fdd7e263405d6c679b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
