Alexander Wels has uploaded a new change for review.
Change subject: restapi: default version to 'general'
......................................................................
restapi: default version to 'general'
- Fixed warning where a restapi call would not send
a version into GetConfigurationValueParameters. Default
the version to ConfigCommon.defaultConfigurationVersion
Change-Id: I946c9925f3e0b94a9dad86f0958c2f9e1d0ab5c8
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java
A
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParametersTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
3 files changed, 61 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/11173/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java
index 03d5db7..0498403 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java
@@ -1,5 +1,8 @@
package org.ovirt.engine.core.common.queries;
+import org.ovirt.engine.core.common.config.ConfigCommon;
+
+
public class GetConfigurationValueParameters extends VdcQueryParametersBase {
private static final long serialVersionUID = -5889171970595969719L;
@@ -9,26 +12,29 @@
}
private ConfigurationValues _configValue = ConfigurationValues.forValue(0);
+ private String privateVersion = ConfigCommon.defaultConfigurationVersion;
public ConfigurationValues getConfigValue() {
return _configValue;
}
- private String privateVersion;
+ public GetConfigurationValueParameters(ConfigurationValues cVal, String
version) {
+ _configValue = cVal;
+ setVersion(version);
+ }
+
+ public GetConfigurationValueParameters() {
+ }
public String getVersion() {
return privateVersion;
}
- public void setVersion(String value) {
- privateVersion = value;
- }
-
- public GetConfigurationValueParameters(ConfigurationValues cVal, String
version) {
- _configValue = cVal;
+ public void setVersion(String version) {
privateVersion = version;
- }
-
- public GetConfigurationValueParameters() {
+ //Make sure privateVersion is never null;
+ if(privateVersion == null) {
+ privateVersion = ConfigCommon.defaultConfigurationVersion;
+ }
}
}
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParametersTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParametersTest.java
new file mode 100644
index 0000000..e4692a6
--- /dev/null
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParametersTest.java
@@ -0,0 +1,43 @@
+package org.ovirt.engine.core.common.queries;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.ovirt.engine.core.common.config.ConfigCommon;
+
+public class GetConfigurationValueParametersTest {
+ GetConfigurationValueParameters testParam;
+
+ @Before
+ public void setup() {
+ testParam = new GetConfigurationValueParameters();
+ assertNotNull("Version should never be null", testParam.getVersion());
+ }
+
+ @Test
+ public void testGetConfigurationValueParametersConfigurationValues() {
+ testParam = new
GetConfigurationValueParameters(ConfigurationValues.VdsFenceOptionTypes);
+ assertEquals("The values should match",
ConfigurationValues.VdsFenceOptionTypes, testParam.getConfigValue());
+ assertNotNull("Version should never be null", testParam.getVersion());
+ }
+
+ @Test
+ public void testGetConfigValue() {
+ assertEquals("The values should match",
ConfigurationValues.forValue(0), testParam.getConfigValue());
+ testParam = new
GetConfigurationValueParameters(ConfigurationValues.VdsFenceOptionTypes, null);
+ assertFalse("The values should not match",
ConfigurationValues.forValue(0).equals(testParam.getConfigValue()));
+ assertNotNull("Version should never be null", testParam.getVersion());
+ }
+
+ @Test
+ public void testSetVersion() {
+ assertEquals("Version should be 'general'",
ConfigCommon.defaultConfigurationVersion, testParam.getVersion());
+ testParam.setVersion("3.2");
+ assertFalse("Version should not be 'general'",
ConfigCommon.defaultConfigurationVersion.equals(testParam.getVersion()));
+ assertEquals("Version should be '3.2'", "3.2", testParam.getVersion());
+ }
+
+}
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 1b0e739..2236e74 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
@@ -50,6 +50,7 @@
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
+import org.ovirt.engine.core.common.config.ConfigCommon;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.mode.ApplicationMode;
import org.ovirt.engine.core.common.queries.CommandVersionsInfo;
@@ -128,9 +129,6 @@
import org.ovirt.engine.ui.uicompat.SpiceConstantsManager;
public final class AsyncDataProvider {
-
- private static final String GENERAL = "general"; //$NON-NLS-1$
-
// dictionary to hold cache of all config values (per version) queried by
client, if the request for them succeeded.
private static HashMap<KeyValuePairCompat<ConfigurationValues, String>,
Object> cachedConfigValues =
new HashMap<KeyValuePairCompat<ConfigurationValues, String>,
Object>();
@@ -152,7 +150,7 @@
_defaultConfigurationVersion =
(String) ((VdcQueryReturnValue)
returnValue).getReturnValue();
} else {
- _defaultConfigurationVersion = GENERAL;
+ _defaultConfigurationVersion =
ConfigCommon.defaultConfigurationVersion;
}
LoginModel loginModel = (LoginModel) model;
loginModel.getLoggedInEvent().raise(loginModel,
EventArgs.Empty);
--
To view, visit http://gerrit.ovirt.org/11173
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I946c9925f3e0b94a9dad86f0958c2f9e1d0ab5c8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
