Sahina Bose has uploaded a new change for review. Change subject: engine: Corrected VDS parsing for geo-rep config ......................................................................
engine: Corrected VDS parsing for geo-rep config Corrected the output parsing for geo-rep config. Refactored the class name Change-Id: Ib293b98daf575f18182f453fab7c7d5aa78dcdc8 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeConfigListXmlRpc.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepConfigListXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 6 files changed, 54 insertions(+), 54 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/38323/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java index d71b9ea..8d0ca29 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java @@ -8,7 +8,7 @@ public class GetGlusterVolumeGeoRepConfigListVDSCommand<P extends GlusterVolumeGeoRepSessionVDSParameters> extends AbstractGlusterBrokerCommand<P> { - private GlusterVolumeConfigListXmlRpc result; + private GlusterVolumeGeoRepConfigListXmlRpc result; public GetGlusterVolumeGeoRepConfigListVDSCommand(P parameters) { super(parameters); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeConfigListXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeConfigListXmlRpc.java deleted file mode 100644 index 04d75fd..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeConfigListXmlRpc.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.gluster; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepSessionConfiguration; -import org.ovirt.engine.core.vdsbroker.irsbroker.StatusReturnForXmlRpc; - -public class GlusterVolumeConfigListXmlRpc extends StatusReturnForXmlRpc { - - protected static final String GEO_REP_CONFIG = "geoRepConfig"; - protected static final String OPTION_NAME = "optionName"; - protected static final String OPTION_VALUE = "optionValue"; - - private List<GlusterGeoRepSessionConfiguration> sessionConfig = new ArrayList<>(); - - public GlusterVolumeConfigListXmlRpc(Map<String, Object> innerMap) { - super(innerMap); - if(innerMap.containsKey(GEO_REP_CONFIG)) { - prepareConfigMap((Object[])((((Map<String, Object>)(innerMap.get(GEO_REP_CONFIG))).get(GEO_REP_CONFIG)))); - } - } - - private void prepareConfigMap(Object[] geoRepConfigs) { - for(Object currentGeoRepConfig : geoRepConfigs) { - sessionConfig.add(getConfig((Map<String, Object>) currentGeoRepConfig)); - } - } - - private GlusterGeoRepSessionConfiguration getConfig(Map<String, Object> innerMap) { - GlusterGeoRepSessionConfiguration config = new GlusterGeoRepSessionConfiguration(); - config.setKey(innerMap.containsKey(OPTION_NAME) ? (String)innerMap.get(OPTION_NAME) : null); - config.setValue(innerMap.containsKey(OPTION_VALUE) ? (String) innerMap.get(OPTION_VALUE) : null); - return config; - } - - public List<GlusterGeoRepSessionConfiguration> getSessionConfig() { - return sessionConfig; - } - - public void setSessionConfig(List<GlusterGeoRepSessionConfiguration> sessionConfig) { - this.sessionConfig = sessionConfig; - } -} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepConfigListXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepConfigListXmlRpc.java new file mode 100644 index 0000000..600e27b --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepConfigListXmlRpc.java @@ -0,0 +1,45 @@ +package org.ovirt.engine.core.vdsbroker.gluster; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepSessionConfiguration; +import org.ovirt.engine.core.vdsbroker.irsbroker.StatusReturnForXmlRpc; + +public class GlusterVolumeGeoRepConfigListXmlRpc extends StatusReturnForXmlRpc { + + private static final String GEO_REP_CONFIG = "geoRepConfig"; + private static final String SESSION_CONFIG = "sessionConfig"; + private static final String INFO = "info"; + + private List<GlusterGeoRepSessionConfiguration> geoRepConfigList = new ArrayList<>(); + + public GlusterVolumeGeoRepConfigListXmlRpc(Map<String, Object> innerMap) { + super(innerMap); + if (innerMap.containsKey(INFO)) { + innerMap = (Map<String, Object>) innerMap.get(INFO); + } + if (innerMap.containsKey(SESSION_CONFIG)) { + prepareConfigMap((Map<String, Object>) ((((Map<String, Object>) (innerMap.get(SESSION_CONFIG))).get(GEO_REP_CONFIG)))); + } + } + + private void prepareConfigMap(Map<String, Object> geoRepConfigs) { + for (Entry<String, Object> currentGeoRepConfig : geoRepConfigs.entrySet()) { + GlusterGeoRepSessionConfiguration config = new GlusterGeoRepSessionConfiguration(); + config.setKey(currentGeoRepConfig.getKey()); + config.setValue((String) currentGeoRepConfig.getValue()); + geoRepConfigList.add(config); + } + } + + public List<GlusterGeoRepSessionConfiguration> getSessionConfig() { + return geoRepConfigList; + } + + public void setSessionConfig(List<GlusterGeoRepSessionConfiguration> sessionConfig) { + this.geoRepConfigList = sessionConfig; + } +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index 4976f1e..aa27689 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -18,7 +18,7 @@ import org.ovirt.engine.core.vdsbroker.gluster.GlusterServicesReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTasksListReturnForXmlRpc; -import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeConfigListXmlRpc; +import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepConfigListXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusDetailForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc; @@ -1359,14 +1359,14 @@ } @Override - public GlusterVolumeConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName) { + public GlusterVolumeGeoRepConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName) { JsonRpcRequest request = new RequestBuilder("GlusterVolume.geoRepConfigList") .withParameter("volumeName", volumeName) .withParameter("remoteHost", slaveHost) .withParameter("remoteVolumeName", slaveVolumeName) .build(); Map<String, Object> response = new FutureMap(this.client, request); - return new GlusterVolumeConfigListXmlRpc(response); + return new GlusterVolumeGeoRepConfigListXmlRpc(response); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index d968c21..63e3a1c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -13,7 +13,7 @@ import org.ovirt.engine.core.vdsbroker.gluster.GlusterServicesReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTasksListReturnForXmlRpc; -import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeConfigListXmlRpc; +import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepConfigListXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusDetailForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc; @@ -339,7 +339,7 @@ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepConfigReset(String volumeName, String slaveHost, String slaveVolumeName, String configKey); - GlusterVolumeConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName); + GlusterVolumeGeoRepConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName); GlusterVolumeTaskReturnForXmlRpc glusterVolumeRemoveBrickStatus(String volumeName, String[] bricksList); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 7aa9c34..999f3f5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -14,7 +14,7 @@ import org.ovirt.engine.core.vdsbroker.gluster.GlusterServicesReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTaskInfoReturnForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterTasksListReturnForXmlRpc; -import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeConfigListXmlRpc; +import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepConfigListXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusDetailForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeGeoRepStatusForXmlRpc; import org.ovirt.engine.core.vdsbroker.gluster.GlusterVolumeOptionsInfoReturnForXmlRpc; @@ -1513,9 +1513,9 @@ } @Override - public GlusterVolumeConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName) { + public GlusterVolumeGeoRepConfigListXmlRpc glusterVolumeGeoRepConfigList(String volumeName, String slaveHost, String slaveVolumeName) { try { - return new GlusterVolumeConfigListXmlRpc(vdsServer.glusterVolumeGeoRepConfigList(volumeName, slaveHost, slaveVolumeName)); + return new GlusterVolumeGeoRepConfigListXmlRpc(vdsServer.glusterVolumeGeoRepConfigList(volumeName, slaveHost, slaveVolumeName)); } catch(UndeclaredThrowableException ute) { throw new XmlRpcRunTimeException(ute); } -- To view, visit https://gerrit.ovirt.org/38323 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib293b98daf575f18182f453fab7c7d5aa78dcdc8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
