Liron Ar has uploaded a new change for review. Change subject: core: adding SetVolumeDescriptionVDSCommand ......................................................................
core: adding SetVolumeDescriptionVDSCommand Change-Id: I36b68ca2d996cf151efc267bceee354e0df223f1 Signed-off-by: Liron Aravot <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetVolumeDescriptionVDSCommand.java 6 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/26672/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java new file mode 100644 index 0000000..ec2025e --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.core.common.vdscommands; + +import org.ovirt.engine.core.compat.Guid; + +public class SetVolumeDescriptionVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase{ + private String description; + + public SetVolumeDescriptionVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, Guid imageId, String description) { + super(storagePoolId, storageDomainId, imageGroupId, imageId); + this.description = description; + } + + public String getDescription() { + return description; + } + + public SetVolumeDescriptionVDSCommandParameters() { + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 0500a64..9910ba6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -60,6 +60,7 @@ CreateImage("org.ovirt.engine.core.vdsbroker.irsbroker"), DestroyImage("org.ovirt.engine.core.vdsbroker.irsbroker"), GetImageInfo("org.ovirt.engine.core.vdsbroker.irsbroker"), + SetVolumeDescription("org.ovirt.engine.core.vdsbroker.irsbroker"), DoesImageExist("org.ovirt.engine.core.vdsbroker.irsbroker"), CopyImage("org.ovirt.engine.core.vdsbroker.irsbroker"), DownloadImage("org.ovirt.engine.core.vdsbroker.irsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java index bc261ba..951a776 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IIrsServer.java @@ -27,6 +27,8 @@ OneImageInfoReturnForXmlRpc getVolumeInfo(String sdUUID, String spUUID, String imgGUID, String volUUID); + StatusOnlyReturnForXmlRpc setVolumeDescription(String sdUUID, String spUUID, String imgGUID, String volUUID, String description); + IrsStatsAndStatusXmlRpc getIrsStats(); OneUuidReturnForXmlRpc importCandidate(String sdUUID, String vmGUID, String templateGUID, String templateVolGUID, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java index 4b2c4f1..43b43af 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerConnector.java @@ -34,6 +34,8 @@ public Map<String, Object> getVolumeInfo(String sdUUID, String spUUID, String imgGUID, String volUUID); + public Map<String, Object> setVolumeDescription(String sdUUID, String spUUID, String imgGUID, String volUUID, String description); + public Map<String, Object> getStats(); public Map<String, Object> importCandidate(String sdUUID, String vmGUID, String templateGUID, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java index d4a081e..bee1b1f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsServerWrapper.java @@ -77,6 +77,13 @@ } @Override + public StatusOnlyReturnForXmlRpc setVolumeDescription(String sdUUID, String spUUID, String imgGUID, String volUUID, String description) { + Map<String, Object> xmlRpcReturnValue = irsServer.setVolumeDescription(sdUUID, spUUID, imgGUID, volUUID, description); + StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); + return wrapper; + } + + @Override public IrsStatsAndStatusXmlRpc getIrsStats() { Map<String, Object> xmlRpcReturnValue = irsServer.getStats(); IrsStatsAndStatusXmlRpc wrapper = new IrsStatsAndStatusXmlRpc(xmlRpcReturnValue); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetVolumeDescriptionVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetVolumeDescriptionVDSCommand.java new file mode 100644 index 0000000..2a02fe6 --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetVolumeDescriptionVDSCommand.java @@ -0,0 +1,38 @@ +package org.ovirt.engine.core.vdsbroker.irsbroker; + +import org.ovirt.engine.core.common.vdscommands.SetVolumeDescriptionVDSCommandParameters; +import org.ovirt.engine.core.utils.log.Log; +import org.ovirt.engine.core.utils.log.LogFactory; + +public class SetVolumeDescriptionVDSCommand<P extends SetVolumeDescriptionVDSCommandParameters> extends IrsBrokerCommand<P> { + private final static Log log = LogFactory.getLog(SetVolumeDescriptionVDSCommand.class); + + public SetVolumeDescriptionVDSCommand(P parameters) { + super(parameters); + } + + @Override + protected void executeIrsBrokerCommand() { + log.info("-- executeIrsBrokerCommand: calling 'setVolumeDescription' "); + log.infoFormat("-- downloadImage parameters:" + "\r\n" + + " spUUID={0}" + "\r\n" + + " sdUUID={1}" + "\r\n" + + " imageGroupGUID={2}" + "\r\n" + + " volUUID={3}" + "\r\n" + + " description={4}" + "\r\n", + getParameters().getStoragePoolId().toString(), + getParameters().getStorageDomainId().toString(), + getParameters().getImageGroupId().toString(), + getParameters().getImageId().toString(), + getParameters().getDescription()); + + getIrsProxy().setVolumeDescription( + getParameters().getStoragePoolId().toString(), + getParameters().getStorageDomainId().toString(), + getParameters().getImageGroupId().toString(), + getParameters().getImageId().toString(), + getParameters().getDescription()); + + proceedProxyReturnValue(); + } +} -- To view, visit http://gerrit.ovirt.org/26672 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36b68ca2d996cf151efc267bceee354e0df223f1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
