Allon Mureinik has uploaded a new change for review.
Change subject: engine: Don't use ValueObjectMap for PM Options
......................................................................
engine: Don't use ValueObjectMap for PM Options
This patch is part of a series designed to remove the ValueObject*
classes.
In this patch, the main usage of ValueObjectMap, the PM options and
secondary options is removed and replaced with a straight forward
HashMap.
In the several places where Map was replaced with HashMap throughout
this patch is was done in order to supply a serializable type that GWT
can handle.
Change-Id: I9e0bf7aedeff0e0b999921298b34494e5e179a1f
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVDSMixIn.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVdsStaticMixIn.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
12 files changed, 61 insertions(+), 63 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/16817/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 7e4d3b4..6877ec0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -3,12 +3,12 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.RpmVersion;
@@ -980,18 +980,19 @@
mVdsStatic.setPmOptions(value);
}
- public ValueObjectMap getPmOptionsMap() {
+ public HashMap<String, String> getPmOptionsMap() {
return mVdsStatic.getPmOptionsMap();
}
- public ValueObjectMap getPmSecondaryOptionsMap() {
+ public HashMap<String, String> getPmSecondaryOptionsMap() {
return mVdsStatic.getPmSecondaryOptionsMap();
}
- public void setPmSecondaryOptionsMap(ValueObjectMap value) {
+ public void setPmSecondaryOptionsMap(HashMap<String, String> value) {
mVdsStatic.setPmSecondaryOptionsMap(value);
}
- public void setPmOptionsMap(ValueObjectMap value) {
+
+ public void setPmOptionsMap(HashMap<String, String> value) {
mVdsStatic.setPmOptionsMap(value);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
index b8ecffd..2485c5f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
@@ -11,7 +11,6 @@
import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.Range;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.common.validation.annotation.HostnameOrIp;
@@ -124,10 +123,10 @@
private boolean pmSecondaryConcurrent;
@EditableField
- private ValueObjectMap pmOptionsMap;
+ private HashMap<String, String> pmOptionsMap;
@EditableField
- private ValueObjectMap pmSecondaryOptionsMap;
+ private HashMap<String, String> pmSecondaryOptionsMap;
@EditableField
private long otpValidity;
@@ -301,11 +300,11 @@
pmOptionsMap = PmOptionsStringToMap(value);
}
- public ValueObjectMap getPmOptionsMap() {
+ public HashMap<String, String> getPmOptionsMap() {
return pmOptionsMap;
}
- public void setPmOptionsMap(ValueObjectMap value) {
+ public void setPmOptionsMap(HashMap<String, String> value) {
pmOptionsMap = value;
pmOptions = PmOptionsMapToString(value);
}
@@ -383,11 +382,11 @@
pmSecondaryConcurrent = value;
}
- public ValueObjectMap getPmSecondaryOptionsMap() {
+ public HashMap<String, String> getPmSecondaryOptionsMap() {
return pmSecondaryOptionsMap;
}
- public void setPmSecondaryOptionsMap(ValueObjectMap value) {
+ public void setPmSecondaryOptionsMap(HashMap<String, String> value) {
pmSecondaryOptionsMap = value;
}
@@ -429,10 +428,9 @@
* @param map
* @return
*/
- public static String PmOptionsMapToString(ValueObjectMap optionsMap) {
+ public static String PmOptionsMapToString(HashMap<String, String> map) {
String result = "";
String seperator = "";
- Map map = optionsMap.asMap();
Iterator<Map.Entry<String, String>> it = map.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, String> pairs = it.next();
@@ -446,16 +444,20 @@
}
/**
- * Converts a PM Options string to a map
+ * Converts a PM Options string to a map.
*
- * @param pmOptions
- * @return
+ * <b<Note:</b> A {@link HashMap} is used instead of the interface
+ * {@link Map}, as this method is used by the frontend, and requires
+ * GWT compilation.
+ *
+ * @param pmOptions String representation of the map
+ * @return A parsed map
*/
- public static ValueObjectMap PmOptionsStringToMap(String pmOptions) {
- if (pmOptions == null || pmOptions.equals("")) {
- return new ValueObjectMap();
- }
+ public static HashMap<String, String> PmOptionsStringToMap(String
pmOptions) {
HashMap<String, String> map = new HashMap<String, String>();
+ if (pmOptions == null || pmOptions.equals("")) {
+ return map;
+ }
String[] tokens = pmOptions.split(",");
for (String token : tokens) {
String[] pair = token.split("=");
@@ -468,7 +470,7 @@
map.put(pair[0], "");
}
}
- return new ValueObjectMap(map, false);
+ return map;
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java
index 1cddb81..5b430da 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetNewVdsFenceStatusParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.queries;
+import java.util.HashMap;
import org.ovirt.engine.core.common.businessentities.FenceAgentOrder;
import org.ovirt.engine.core.compat.Guid;
@@ -11,7 +12,7 @@
}
public GetNewVdsFenceStatusParameters(Guid vds_id, Guid vdsGroupId, Guid
storagePolId, String managementIp,
- ValueObjectMap fencinOptions, String pmType, String user, String
password, String pmProxyPreferences) {
+ HashMap<String, String> fencinOptions, String pmType, String user,
String password, String pmProxyPreferences) {
_vds_id = vds_id;
_storagePoolId = storagePolId;
_managementIp = managementIp;
@@ -25,7 +26,7 @@
}
public GetNewVdsFenceStatusParameters(Guid vds_id, Guid storagePolId,
String managementIp,
- ValueObjectMap fencinOptions, String pmType, String user, String
password, FenceAgentOrder order) {
+ HashMap<String, String> fencinOptions, String pmType, String user,
String password, FenceAgentOrder order) {
_vds_id = vds_id;
_storagePoolId = storagePolId;
_managementIp = managementIp;
@@ -67,13 +68,13 @@
_managementIp = value;
}
- private ValueObjectMap _fencingOptions;
+ private HashMap<String, String> _fencingOptions;
- public ValueObjectMap getFencingOptions() {
+ public HashMap<String, String> getFencingOptions() {
return _fencingOptions;
}
- public void setFencingOptions(ValueObjectMap value) {
+ public void setFencingOptions(HashMap<String, String> value) {
_fencingOptions = value;
}
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
index 65762f1..74ef7a3 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/VdsStaticTest.java
@@ -2,20 +2,20 @@
import static junit.framework.Assert.assertEquals;
+import java.util.Map;
import org.junit.Test;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
public class VdsStaticTest {
@Test
public void emptyStringMakesEmptyMap() {
final String empty = "";
- ValueObjectMap map = VdsStatic.PmOptionsStringToMap(empty);
+ Map<String, String> map = VdsStatic.PmOptionsStringToMap(empty);
mapIsEmpty(map);
}
- private void mapIsEmpty(final ValueObjectMap map) {
- assertEquals(0, map.getValuePairs().size());
+ private void mapIsEmpty(final Map<String, String> map) {
+ assertEquals(0, map.size());
}
}
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
index 724111f..7454ca8 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsStaticDAOTest.java
@@ -5,13 +5,13 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import java.util.HashMap;
import java.util.List;
import org.junit.Test;
import org.ovirt.engine.core.common.businessentities.VdsDynamic;
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.businessentities.VdsStatistics;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.compat.Guid;
@@ -34,7 +34,7 @@
newStaticVds.setHostName("farkle.redhat.com");
newStaticVds.setVdsGroupId(existingVds.getVdsGroupId());
newStaticVds.setSSHKeyFingerprint("b5:ad:16:19:06:9f:b3:41:69:eb:1c:42:1d:12:b5:31");
- newStaticVds.setPmSecondaryOptionsMap(new ValueObjectMap());
+ newStaticVds.setPmSecondaryOptionsMap(new HashMap<String, String>());
}
/**
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
index 3711f47..c3b4f96 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
@@ -39,8 +39,6 @@
import org.ovirt.engine.core.common.businessentities.VdsSpmStatus;
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import
org.ovirt.engine.core.common.businessentities.VdsTransparentHugePagesState;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
-import org.ovirt.engine.core.common.queries.ValueObjectPair;
import org.ovirt.engine.core.compat.Guid;
public class HostMapper {
@@ -414,20 +412,20 @@
return model;
}
- @Mapping(from = ValueObjectMap.class, to = Options.class)
- public static Options map(ValueObjectMap entity, Options template) {
+ @Mapping(from = Map.class, to = Options.class)
+ public static Options map(Map<String, String> entity, Options template) {
Options model = template != null ? template : new Options();
- for (ValueObjectPair option : entity.getValuePairs()) {
+ for (Map.Entry<String, String> option : entity.entrySet()) {
model.getOptions().add(map(option, null));
}
return model;
}
- @Mapping(from = ValueObjectPair.class, to = Option.class)
- public static Option map(ValueObjectPair entity, Option template) {
+ @Mapping(from = Map.Entry.class, to = Option.class)
+ public static Option map(Map.Entry<String, String> entity, Option
template) {
Option model = template != null ? template : new Option();
- model.setName((String)entity.getKey());
- model.setValue((String)entity.getValue());
+ model.setName(entity.getKey());
+ model.setValue(entity.getValue());
return model;
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVDSMixIn.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVDSMixIn.java
index 1e051fd..c1ce09c 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVDSMixIn.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVDSMixIn.java
@@ -1,11 +1,11 @@
package org.ovirt.engine.core.utils.serialization.json;
+import java.util.HashMap;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.codehaus.jackson.annotate.JsonTypeInfo.As;
import org.codehaus.jackson.annotate.JsonTypeInfo.Id;
import org.ovirt.engine.core.common.businessentities.VDS;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
@SuppressWarnings("serial")
@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY)
@@ -13,5 +13,5 @@
@JsonIgnore
@Override
- public abstract ValueObjectMap getPmOptionsMap();
+ public abstract HashMap<String, String> getPmOptionsMap();
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVdsStaticMixIn.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVdsStaticMixIn.java
index 535b298..fbc3376 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVdsStaticMixIn.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonVdsStaticMixIn.java
@@ -1,11 +1,11 @@
package org.ovirt.engine.core.utils.serialization.json;
+import java.util.HashMap;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonTypeInfo;
import org.codehaus.jackson.annotate.JsonTypeInfo.As;
import org.codehaus.jackson.annotate.JsonTypeInfo.Id;
import org.ovirt.engine.core.common.businessentities.VdsStatic;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
@SuppressWarnings("serial")
@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY)
@@ -13,5 +13,5 @@
@JsonIgnore
@Override
- public abstract ValueObjectMap getPmOptionsMap();
+ public abstract HashMap<String, String> getPmOptionsMap();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
index 308f846..9bc82dd 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
@@ -14,7 +14,6 @@
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.mode.ApplicationMode;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.ui.frontend.AsyncQuery;
import org.ovirt.engine.ui.frontend.Frontend;
@@ -475,14 +474,14 @@
host.setPmUser((String) model.getPmUserName().getEntity());
host.setPmPassword((String) model.getPmPassword().getEntity());
host.setPmType((String) model.getPmType().getSelectedItem());
- host.setPmOptionsMap(new ValueObjectMap(model.getPmOptionsMap(),
false));
+ host.setPmOptionsMap(model.getPmOptionsMap());
// Save secondary PM parameters.
host.setPmSecondaryIp((String) model.getPmSecondaryIp().getEntity());
host.setPmSecondaryUser((String)
model.getPmSecondaryUserName().getEntity());
host.setPmSecondaryPassword((String)
model.getPmSecondaryPassword().getEntity());
host.setPmSecondaryType((String)
model.getPmSecondaryType().getSelectedItem());
- host.setPmSecondaryOptionsMap(new
ValueObjectMap(model.getPmSecondaryOptionsMap(), false));
+ host.setPmSecondaryOptionsMap(model.getPmSecondaryOptionsMap());
// Save other PM parameters.
host.setpm_enabled((Boolean) model.getIsPm().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 0e9d7de..2ab8823 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -30,7 +30,6 @@
import org.ovirt.engine.core.common.businessentities.VDSStatus;
import org.ovirt.engine.core.common.interfaces.SearchType;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -1609,14 +1608,14 @@
host.setPmUser((String) model.getPmUserName().getEntity());
host.setPmPassword((String) model.getPmPassword().getEntity());
host.setPmType((String) model.getPmType().getSelectedItem());
- host.setPmOptionsMap(new ValueObjectMap(model.getPmOptionsMap(),
false));
+ host.setPmOptionsMap(model.getPmOptionsMap());
// Save secondary PM parameters.
host.setPmSecondaryIp((String) model.getPmSecondaryIp().getEntity());
host.setPmSecondaryUser((String)
model.getPmSecondaryUserName().getEntity());
host.setPmSecondaryPassword((String)
model.getPmSecondaryPassword().getEntity());
host.setPmSecondaryType((String)
model.getPmSecondaryType().getSelectedItem());
- host.setPmSecondaryOptionsMap(new
ValueObjectMap(model.getPmSecondaryOptionsMap(), false));
+ host.setPmSecondaryOptionsMap(model.getPmSecondaryOptionsMap());
// Save other PM parameters.
host.setpm_enabled((Boolean) model.getIsPm().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index bf67001..6e7b03e 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -35,7 +35,6 @@
import org.ovirt.engine.core.common.queries.ConfigurationValues;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
import org.ovirt.engine.core.common.queries.SearchParameters;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.users.VdcUser;
@@ -836,14 +835,14 @@
host.setPmUser((String) model.getPmUserName().getEntity());
host.setPmPassword((String) model.getPmPassword().getEntity());
host.setPmType((String) model.getPmType().getSelectedItem());
- host.setPmOptionsMap(new ValueObjectMap(model.getPmOptionsMap(),
false));
+ host.setPmOptionsMap((model.getPmOptionsMap()));
// Save secondary PM parameters.
host.setPmSecondaryIp((String) model.getPmSecondaryIp().getEntity());
host.setPmSecondaryUser((String)
model.getPmSecondaryUserName().getEntity());
host.setPmSecondaryPassword((String)
model.getPmSecondaryPassword().getEntity());
host.setPmSecondaryType((String)
model.getPmSecondaryType().getSelectedItem());
- host.setPmSecondaryOptionsMap(new
ValueObjectMap(model.getPmSecondaryOptionsMap(), false));
+ host.setPmSecondaryOptionsMap(model.getPmSecondaryOptionsMap());
// Save other PM parameters.
host.setpm_enabled((Boolean) model.getIsPm().getEntity());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index cffc535..c52dc9d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -15,7 +15,6 @@
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.mode.ApplicationMode;
import org.ovirt.engine.core.common.queries.GetNewVdsFenceStatusParameters;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.compat.Guid;
@@ -416,7 +415,7 @@
pmSecondarySecure = value;
}
- public Map<String, String> getPmSecondaryOptionsMap() {
+ public HashMap<String, String> getPmSecondaryOptionsMap() {
// For secondary map determine (workarround) if it's was specified
// by checking secondary PM fields.
@@ -514,7 +513,7 @@
}
}
- public Map<String, String> getPmOptionsMap() {
+ public HashMap<String, String> getPmOptionsMap() {
return getPmOptionsMapInternal(getPmPort(), getPmSlot(),
getPmSecure(), getPmOptions());
}
@@ -1052,9 +1051,9 @@
}
}
- private Map<String,String> getPmOptionsMapInternal(EntityModel port,
EntityModel slot, EntityModel secure, EntityModel options) {
+ private HashMap<String,String> getPmOptionsMapInternal(EntityModel port,
EntityModel slot, EntityModel secure, EntityModel options) {
- Map<String, String> dict = new HashMap<String, String>();
+ HashMap<String, String> dict = new HashMap<String, String>();
if ((Boolean) getIsPm().getEntity()) {
// Add well known pm options.
@@ -1226,7 +1225,7 @@
param.setUser(isPrimary ? (String) getPmUserName().getEntity() :
(String) getPmSecondaryUserName().getEntity());
param.setPassword(isPrimary ? (String) getPmPassword().getEntity() :
(String) getPmSecondaryPassword().getEntity());
param.setStoragePoolId(cluster.getStoragePoolId() != null ?
cluster.getStoragePoolId() : Guid.Empty);
- param.setFencingOptions(new ValueObjectMap(getPmOptionsMap(), false));
+ param.setFencingOptions(getPmOptionsMap());
param.setPmProxyPreferences(getPmProxyPreferences());
Frontend.RunQuery(VdcQueryType.GetNewVdsFenceStatus, param, new
AsyncQuery(this, new INewAsyncCallback() {
@@ -1386,14 +1385,14 @@
getPmUserName().setEntity(vds.getPmUser());
getPmPassword().setEntity(vds.getPmPassword());
getPmType().setSelectedItem(vds.getPmType());
-
setPmOptionsMap(VdsStatic.PmOptionsStringToMap(vds.getPmOptions()).asMap());
+ setPmOptionsMap(VdsStatic.PmOptionsStringToMap(vds.getPmOptions()));
// Set secondary PM parameters.
getPmSecondaryIp().setEntity(vds.getPmSecondaryIp());
getPmSecondaryUserName().setEntity(vds.getPmSecondaryUser());
getPmSecondaryPassword().setEntity(vds.getPmSecondaryPassword());
getPmSecondaryType().setSelectedItem(vds.getPmSecondaryType());
- setPmSecondaryOptionsMap(vds.getPmSecondaryOptionsMap().asMap());
+ setPmSecondaryOptionsMap(vds.getPmSecondaryOptionsMap());
// Set other PM parameters.
if (isEditWithPMemphasis) {
--
To view, visit http://gerrit.ovirt.org/16817
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e0bf7aedeff0e0b999921298b34494e5e179a1f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
