Alona Kaplan has uploaded a new change for review. Change subject: core: renaming 'DefaultMtu' config value to 'DefaultMTU' ......................................................................
core: renaming 'DefaultMtu' config value to 'DefaultMTU' Change-Id: Ic57d502a8894757cccbd87df3760ccac852a3ad9 Signed-off-by: Alona Kaplan <[email protected]> Bug-Url: https://bugzilla.redhat.com/1125175 --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/MtuRenderer.java 9 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/32281/1 diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java index df85bf8..01d738c 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java @@ -74,7 +74,7 @@ mockConfig(ConfigValues.UserDefinedNetworkCustomProperties, Version.v3_5.toString(), "bridge_opts=^[^\\s=]+=[^\\s=]+(\\s+[^\\s=]+=[^\\s=]+)*$"), - mockConfig(ConfigValues.DefaultMtu, DEFAULT_MTU)); + mockConfig(ConfigValues.DefaultMTU, DEFAULT_MTU)); @Mock private NetworkDao networkDAO; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 0f4b65c..2a819df 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1804,7 +1804,7 @@ @TypeConverterAttribute(Integer.class) @DefaultValueAttribute("1500") - DefaultMtu, + DefaultMTU, /** * Defines the hostname(s) or IP address(es) to send fence_kdump messages to. If empty, engine FQDN is used. 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 1c53536..7dcf4bd 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 @@ -136,7 +136,7 @@ ClusterRequiredRngSourcesDefault(ConfigAuthType.User), SpiceFileTransferToggleSupported(ConfigAuthType.User), SpiceCopyPasteToggleSupported(ConfigAuthType.User), - DefaultMtu, + DefaultMTU, LiveMergeSupported(ConfigAuthType.User), SkipFencingIfSDActiveSupported, JsonProtocolSupported(ConfigAuthType.User); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java index b1d7e5c..4badf9e 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java @@ -26,7 +26,7 @@ } public static Integer getDefaultMtu() { - return Config.<Integer> getValue(ConfigValues.DefaultMtu); + return Config.<Integer> getValue(ConfigValues.DefaultMTU); } /** diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java index 8812fca..180144a 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java @@ -30,7 +30,7 @@ @Rule public MockConfigRule mcr = new MockConfigRule( MockConfigRule.mockConfig(ConfigValues.ManagementNetwork, MANAGEMENT_NETWORK), - MockConfigRule.mockConfig(ConfigValues.DefaultMtu, DEFAULT_MTU)); + MockConfigRule.mockConfig(ConfigValues.DefaultMTU, DEFAULT_MTU)); @Test public void calculateNetworkImplementationDetailsNoNetworkName() throws Exception { diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java index a7f0247..8e4f4f9 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SetupNetworksVDSCommandTest.java @@ -72,7 +72,7 @@ when(host.getSupportedClusterVersionsSet()).thenReturn(supportedClusters); when(host.getVdsGroupCompatibilityVersion()).thenReturn(version); configRule.mockConfigValue(ConfigValues.DefaultRouteSupported, version, Boolean.FALSE); - configRule.mockConfigValue(ConfigValues.DefaultMtu, 1500); + configRule.mockConfigValue(ConfigValues.DefaultMTU, 1500); } @Test 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 c2ea6ef..0e723df 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 @@ -795,7 +795,7 @@ public enum MtuSelector { defaultMtu(ConstantsManager.getInstance() .getMessages() - .defaultMtu((Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMtu))), + .defaultMtu((Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMTU))), customMtu(ConstantsManager.getInstance().getConstants().customMtu()); private String description; diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java index 0bdeb54..14f5297 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java @@ -45,7 +45,7 @@ SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkNotSyncImage()).getHTML()); SafeHtml alertImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.alertImage()).getHTML()); - private static int defaultMtu = (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMtu); + private static int defaultMtu = (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMTU); public ItemInfoPopup() { super(true); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/MtuRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/MtuRenderer.java index 83eac7e..307a623 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/MtuRenderer.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/MtuRenderer.java @@ -10,7 +10,7 @@ public class MtuRenderer extends AbstractRenderer<Integer> { private static int defaultMtu = - (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMtu); + (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultMTU); private final ApplicationMessages messages = GWT.create(ApplicationMessages.class); -- To view, visit http://gerrit.ovirt.org/32281 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic57d502a8894757cccbd87df3760ccac852a3ad9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
