Moti Asayag has uploaded a new change for review. Change subject: webadmin: Disable MTU support in 3.0 (#854496) ......................................................................
webadmin: Disable MTU support in 3.0 (#854496) https://bugzilla.redhat.com/854496 Configuring MTU for logical networks in 3.0 data-center is disabled, both for new networks or for updating an existing networks. Change-Id: Icb7ffe1738f0f1512f5ea783700786e45c541d1d Signed-off-by: Moti Asayag <masa...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java 4 files changed, 100 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/7814/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 668b2d4..99b06bf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -2369,5 +2369,39 @@ GetConfigFromCache(tempVar, aQuery); } + public static void IsMTUOverrideSupported(AsyncQuery aQuery, String version) { + aQuery.converterCallback = new IAsyncConverter() { + @Override + public Object Convert(Object source, AsyncQuery _asyncQuery) + { + return source != null ? ((Boolean) source).booleanValue() : true; + } + }; + GetConfigurationValueParameters tempVar = + new GetConfigurationValueParameters(ConfigurationValues.MTUOverrideSupported); + tempVar.setVersion(version); + GetConfigFromCache(tempVar, aQuery); + } + + /*public static class CompatibilityLevelSupportedFeatures { + private boolean bridgesReportByVDSM; + private boolean mtuOverride; + + public boolean isBridgesReportByVDSMSupported() { + return bridgesReportByVDSM; + } + + public void setBridgesReportByVDSMSupported(boolean bridgesReportByVDSM) { + this.bridgesReportByVDSM = bridgesReportByVDSM; + } + + public boolean isMtuOverrideSupported() { + return mtuOverride; + } + + public void setMtuOverrideSupported(boolean mtuOverride) { + this.mtuOverride = mtuOverride; + } + }*/ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java index 1726060..cfac5b2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java @@ -30,6 +30,8 @@ import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterNetworkListModel; +import org.ovirt.engine.ui.uicommonweb.models.datacenters.DataCenterNetworkModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceListModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -397,6 +399,25 @@ clusterNetworkModel.getIsVmNetwork().setIsChangable(false); } + AsyncDataProvider.IsMTUOverrideSupported(new AsyncQuery(ClusterNetworkListModel.this, + new INewAsyncCallback() { + @Override + public void OnSuccess(Object model, Object returnValue) { + boolean isMTUOverrideSupported = (Boolean) returnValue; + DataCenterNetworkListModel dcNetworkModel = + (DataCenterNetworkListModel) model; + DataCenterNetworkModel networkModel = + (DataCenterNetworkModel) getWindow(); + + networkModel.setMTUOverrideSupported(isMTUOverrideSupported); + if (!isMTUOverrideSupported) { + networkModel.getHasMtu().setIsChangable(false); + networkModel.getMtu().setIsChangable(false); + } + } + }), + getEntity().getcompatibility_version().toString()); + clusterNetworkModel.setDataCenterName(dataCenter.getname()); AsyncQuery _asyncQuery2 = new AsyncQuery(); _asyncQuery2.asyncCallback = new INewAsyncCallback() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java index fb36760..ca58333 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java @@ -263,6 +263,22 @@ networkModel.getIsVmNetwork().setIsChangable(false); } + AsyncDataProvider.IsMTUOverrideSupported(new AsyncQuery(DataCenterNetworkListModel.this, + new INewAsyncCallback() { + @Override + public void OnSuccess(Object model, Object returnValue) { + boolean isMTUOverrideSupported = (Boolean) returnValue; + DataCenterNetworkListModel dcNetworkModel = (DataCenterNetworkListModel) model; + DataCenterNetworkModel networkModel = (DataCenterNetworkModel) getWindow(); + + networkModel.setMTUOverrideSupported(isMTUOverrideSupported); + if (!isMTUOverrideSupported) { + networkModel.getHasMtu().setIsChangable(false); + networkModel.getMtu().setIsChangable(false); + } + } + }), getEntity().getcompatibility_version().toString()); + AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(DataCenterNetworkListModel.this); _asyncQuery.asyncCallback = new INewAsyncCallback() { @@ -337,6 +353,22 @@ networkModel.getIsVmNetwork().setIsChangable(false); } + AsyncDataProvider.IsMTUOverrideSupported(new AsyncQuery(DataCenterNetworkListModel.this, + new INewAsyncCallback() { + @Override + public void OnSuccess(Object model, Object returnValue) { + boolean isMTUOverrideSupported = (Boolean) returnValue; + DataCenterNetworkListModel dcNetworkModel = (DataCenterNetworkListModel) model; + DataCenterNetworkModel networkModel = (DataCenterNetworkModel) getWindow(); + + networkModel.setMTUOverrideSupported(isMTUOverrideSupported); + if (!isMTUOverrideSupported) { + networkModel.getHasMtu().setIsChangable(false); + networkModel.getMtu().setIsChangable(false); + } + } + }), getEntity().getcompatibility_version().toString()); + AsyncQuery _asyncQuery = new AsyncQuery(); _asyncQuery.setModel(DataCenterNetworkListModel.this); _asyncQuery.asyncCallback = new INewAsyncCallback() { 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 f518712..dddfb66 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 @@ -198,6 +198,16 @@ this.isSupportBridgesReportByVDSM = isSupportBridgesReportByVDSM; } + private boolean mtuOverrideSupported; + + public boolean isMTUOverrideSupported() { + return mtuOverrideSupported; + } + + public void setMTUOverrideSupported(boolean mtuOverrideSupported) { + this.mtuOverrideSupported = mtuOverrideSupported; + } + public NetworkModel() { setName(new EntityModel()); @@ -228,8 +238,9 @@ getIsVmNetwork().setIsChangable(isSupportBridgesReportByVDSM() && (Boolean) value); getHasVLanTag().setIsChangable((Boolean) value); getVLanTag().setIsChangable((Boolean)getHasVLanTag().getEntity() && (Boolean) value); - getHasMtu().setIsChangable((Boolean) value); - getMtu().setIsChangable((Boolean)getHasMtu().getEntity() && (Boolean) value); + getHasMtu().setIsChangable((Boolean) value && isMTUOverrideSupported()); + getMtu().setIsChangable((Boolean) getHasMtu().getEntity() && isMTUOverrideSupported() + && (Boolean) value); } }); -- To view, visit http://gerrit.ovirt.org/7814 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb7ffe1738f0f1512f5ea783700786e45c541d1d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
