Allon Mureinik has uploaded a new change for review. Change subject: core: Removed SetImageDescriptionVDSCommand ......................................................................
core: Removed SetImageDescriptionVDSCommand GetDeviceInfoVDSComman is not used anywhere in the codebase, and thus should be removed. Change-Id: I90aaf306207367a3620671489615b633100fa593 Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetImageDescriptionVDSCommandParameters.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 D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetImageDescriptionVDSCommand.java 6 files changed, 0 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/14801/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetImageDescriptionVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetImageDescriptionVDSCommandParameters.java deleted file mode 100644 index 5c341c4..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetImageDescriptionVDSCommandParameters.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class SetImageDescriptionVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase { - private String _description; - - public SetImageDescriptionVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, - Guid imageId, String description) { - super(storagePoolId, storageDomainId, imageGroupId, imageId); - _description = description; - } - - public String getDescription() { - return _description; - } - - public SetImageDescriptionVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, description = %s", super.toString(), getDescription()); - } -} 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 2f38f95..7fde42f 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 @@ -61,7 +61,6 @@ CopyImage("org.ovirt.engine.core.vdsbroker.irsbroker"), CreateSnapshot("org.ovirt.engine.core.vdsbroker.irsbroker"), MergeSnapshots("org.ovirt.engine.core.vdsbroker.irsbroker"), - SetImageDescription("org.ovirt.engine.core.vdsbroker.irsbroker"), IsoPrefix("org.ovirt.engine.core.vdsbroker.irsbroker"), IsoDirectory("org.ovirt.engine.core.vdsbroker.irsbroker"), ResetIrs("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 946cce8..048b131 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 @@ -15,9 +15,6 @@ String dstImgGUID, String dstVolUUID, String descr, String dstSdUUID, int volType, int volFormat, int preallocate, String postZero, String force); - StatusOnlyReturnForXmlRpc setVolumeDescription(String sdUUID, String spUUID, String imgGUID, String volUUID, - String description); - OneUuidReturnForXmlRpc mergeSnapshots(String sdUUID, String spUUID, String vmGUID, String imgGUID, String ancestorUUID, String successorUUID, String postZero); 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 48622d0..e2013a7 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 @@ -16,9 +16,6 @@ String srcVolUUID, String dstImgGUID, String dstVolUUID, String descr, String dstSdUUID, int volType, int volFormat, int preallocate, String postZero, String force); - public Map<String, Object> setVolumeDescription(String sdUUID, String spUUID, String imgGUID, String volUUID, - String description); - public Map<String, Object> mergeSnapshots(String sdUUID, String spUUID, String vmGUID, String imgGUID, String ancestorUUID, String successorUUID); 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 60b09a7..6bb35fb 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 @@ -40,15 +40,6 @@ } @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 OneUuidReturnForXmlRpc mergeSnapshots(String sdUUID, String spUUID, String vmGUID, String imgGUID, String ancestorUUID, String successorUUID, String postZero) { Map<String, Object> xmlRpcReturnValue = irsServer.mergeSnapshots(sdUUID, spUUID, vmGUID, imgGUID, ancestorUUID, diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetImageDescriptionVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetImageDescriptionVDSCommand.java deleted file mode 100644 index b32d38c..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SetImageDescriptionVDSCommand.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.irsbroker; - -import org.ovirt.engine.core.common.vdscommands.*; - -public class SetImageDescriptionVDSCommand<P extends SetImageDescriptionVDSCommandParameters> - extends IrsBrokerCommand<P> { - public SetImageDescriptionVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void ExecuteIrsBrokerCommand() { - status = getIrsProxy().setVolumeDescription(getParameters().getStorageDomainId().toString(), - getParameters().getStoragePoolId().toString(), getParameters().getImageGroupId().toString(), - getParameters().getImageId().toString(), getParameters().getDescription()); - ProceedProxyReturnValue(); - } -} -- To view, visit http://gerrit.ovirt.org/14801 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90aaf306207367a3620671489615b633100fa593 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
