Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Corrected VDS commands for xmlrpc case ......................................................................
gluster: Corrected VDS commands for xmlrpc case There were mismatch in names of VDSM versb called from engine for xmlrpc case. Corrected the same. Change-Id: I0332e16f20ed1eebf35f8ff45e238351e7c2315e Bug-Url: https://bugzilla.redhat.com/1218991 Bug-Url: https://bugzilla.redhat.com/1215881 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteAllGlusterVolumeSnapshotsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.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/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 7 files changed, 22 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/40640/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java index 7865974..e738fad 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java @@ -21,7 +21,7 @@ String snapshotName = getParameters().getSnapshotName(); String description = getParameters().getDescription() == null ? "" : getParameters().getDescription(); boolean force = getParameters().getForce(); - xmlRpcReturnValue = getBroker().glusterSnapshotCreate(volumeName, snapshotName, description, force); + xmlRpcReturnValue = getBroker().glusterVolumeSnapshotCreate(volumeName, snapshotName, description, force); proceedProxyReturnValue(); if (getVDSReturnValue().getSucceeded()) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteAllGlusterVolumeSnapshotsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteAllGlusterVolumeSnapshotsVDSCommand.java index acfcb81..babbfc4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteAllGlusterVolumeSnapshotsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/DeleteAllGlusterVolumeSnapshotsVDSCommand.java @@ -10,7 +10,7 @@ @Override protected void executeVdsBrokerCommand() { String volumeName = getParameters().getVolumeName(); - status = getBroker().glusterVolumeSnapshotDelete(volumeName); + status = getBroker().glusterVolumeSnapshotDeleteAll(volumeName); proceedProxyReturnValue(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java index d4567de..115229e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java @@ -20,7 +20,7 @@ protected void executeVdsBrokerCommand() { Guid clusterId = getParameters().getClusterId(); String volumeName = getParameters().getVolumeName(); - infoReturn = getBroker().glusterSnapshotInfo(clusterId, volumeName); + infoReturn = getBroker().glusterVolumeSnapshotList(clusterId, volumeName); proceedProxyReturnValue(); if (getVDSReturnValue().getSucceeded()) { 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 5385a30..feedf4c 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 @@ -1740,7 +1740,7 @@ } @Override - public GlusterVolumeSnapshotInfoReturnForXmlRpc glusterSnapshotInfo(Guid clusterId, String volumeName) { + public GlusterVolumeSnapshotInfoReturnForXmlRpc glusterVolumeSnapshotList(Guid clusterId, String volumeName) { JsonRpcRequest request = new RequestBuilder("GlusterVolume.snapshotList").withOptionalParameter("volumeName", volumeName) .build(); @@ -1767,7 +1767,7 @@ } @Override - public StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDelete(String volumeName) { + public StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDeleteAll(String volumeName) { JsonRpcRequest request = new RequestBuilder("GlusterVolume.snapshotDeleteAll").withParameter("volumeName", volumeName) .build(); @@ -1806,7 +1806,7 @@ } @Override - public GlusterVolumeSnapshotCreateReturnForXmlRpc glusterSnapshotCreate(String volumeName, + public GlusterVolumeSnapshotCreateReturnForXmlRpc glusterVolumeSnapshotCreate(String volumeName, String snapshotName, String description, boolean force) { 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 81789c2..de0b200 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 @@ -406,13 +406,13 @@ String userName, boolean force); - GlusterVolumeSnapshotInfoReturnForXmlRpc glusterSnapshotInfo(Guid clusterId, String volumeName); + GlusterVolumeSnapshotInfoReturnForXmlRpc glusterVolumeSnapshotList(Guid clusterId, String volumeName); GlusterVolumeSnapshotConfigReturnForXmlRpc glusterSnapshotConfigList(Guid clusterId); StatusOnlyReturnForXmlRpc glusterSnapshotDelete(String snapshotName); - StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDelete(String volumeName); + StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDeleteAll(String volumeName); StatusOnlyReturnForXmlRpc glusterSnapshotActivate(String snapshotName, boolean force); @@ -420,7 +420,7 @@ StatusOnlyReturnForXmlRpc glusterSnapshotRestore(String snapshotName); - GlusterVolumeSnapshotCreateReturnForXmlRpc glusterSnapshotCreate(String volumeName, + GlusterVolumeSnapshotCreateReturnForXmlRpc glusterVolumeSnapshotCreate(String volumeName, String snapshotName, String description, boolean force); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index 0715de0..ee97b86 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -377,13 +377,13 @@ public Map<String, Object> getExternalVMs(String uri, String username, String password); - public Map<String, Object> glusterSnapshotInfo(String snapshotName, String volumeName); + public Map<String, Object> glusterVolumeSnapshotList(String volumeName); public Map<String, Object> glusterSnapshotConfigList(); public Map<String, Object> glusterSnapshotDelete(String snapshotName); - public Map<String, Object> glusterVolumeSnapshotDelete(String volumeName); + public Map<String, Object> glusterVolumeSnapshotDeleteAll(String volumeName); public Map<String, Object> glusterSnapshotActivate(String snapshotName, boolean force); @@ -391,7 +391,10 @@ public Map<String, Object> glusterSnapshotRestore(String snapshotName); - public Map<String, Object> glusterSnapshotCreate(String volumeName, String snapshotName, String description, boolean force); + public Map<String, Object> glusterVolumeSnapshotCreate(String volumeName, + String snapshotName, + String description, + boolean force); public Map<String, Object> glusterVolumeSnapshotConfigSet(String volumeName, String cfgName, String cfgValue); 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 93a37a4..0b88489 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 @@ -1707,10 +1707,11 @@ } @Override - public GlusterVolumeSnapshotInfoReturnForXmlRpc glusterSnapshotInfo(Guid clusterId, + public GlusterVolumeSnapshotInfoReturnForXmlRpc glusterVolumeSnapshotList(Guid clusterId, String volumeName) { try { - Map<String, Object> xmlRpcReturnValue = vdsServer.glusterSnapshotInfo("", volumeName); + Map<String, Object> xmlRpcReturnValue = + vdsServer.glusterVolumeSnapshotList(volumeName == null ? "" : volumeName); GlusterVolumeSnapshotInfoReturnForXmlRpc wrapper = new GlusterVolumeSnapshotInfoReturnForXmlRpc(clusterId, xmlRpcReturnValue); return wrapper; @@ -1733,12 +1734,12 @@ } @Override - public GlusterVolumeSnapshotCreateReturnForXmlRpc glusterSnapshotCreate(String volumeName, + public GlusterVolumeSnapshotCreateReturnForXmlRpc glusterVolumeSnapshotCreate(String volumeName, String snapshotName, String description, boolean force) { try { - return new GlusterVolumeSnapshotCreateReturnForXmlRpc(vdsServer.glusterSnapshotCreate(volumeName, + return new GlusterVolumeSnapshotCreateReturnForXmlRpc(vdsServer.glusterVolumeSnapshotCreate(volumeName, snapshotName, description, force)); @@ -1759,9 +1760,9 @@ } @Override - public StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDelete(String volumeName) { + public StatusOnlyReturnForXmlRpc glusterVolumeSnapshotDeleteAll(String volumeName) { try { - Map<String, Object> xmlRpcReturnValue = vdsServer.glusterVolumeSnapshotDelete(volumeName); + Map<String, Object> xmlRpcReturnValue = vdsServer.glusterVolumeSnapshotDeleteAll(volumeName); StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); return wrapper; } catch (UndeclaredThrowableException ute) { -- To view, visit https://gerrit.ovirt.org/40640 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0332e16f20ed1eebf35f8ff45e238351e7c2315e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
