Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove unused ExportCandaidateVDSCommand
......................................................................
core: Remove unused ExportCandaidateVDSCommand
ExportCandidateVDSCommand was not used anywhere in the code, and should
thus be removed.
This patch removes the following:
1. The ExportCandidateVDSCommand class
2. The corresponding ExportCandidateVDSCommandParameters class
3. The corresponding ExportCandidate constant in VDSCommandType
4. The exportCandidate method from
IIrsServer/IrsServerConnector/IrsServerWrapper
Change-Id: I7bfcdf24b05a7e90fe4a2d1b536c5a927297fd16
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExportCandidateVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExportCandidateVDSCommand.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
6 files changed, 0 insertions(+), 194 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/13956/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExportCandidateVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExportCandidateVDSCommandParameters.java
deleted file mode 100644
index 23b32ac..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExportCandidateVDSCommandParameters.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class ExportCandidateVDSCommandParameters extends
StorageDomainIdParametersBase {
- private Guid privateVmGUID = new Guid();
-
- public Guid getVmGUID() {
- return privateVmGUID;
- }
-
- private void setVmGUID(Guid value) {
- privateVmGUID = value;
- }
-
- private HashMap<String, ArrayList<Guid>> privateListOfImages;
-
- public HashMap<String, ArrayList<Guid>> getListOfImages() {
- return privateListOfImages;
- }
-
- private void setListOfImages(HashMap<String, ArrayList<Guid>> value) {
- privateListOfImages = value;
- }
-
- private String privateVmMeta;
-
- public String getVmMeta() {
- return privateVmMeta;
- }
-
- private void setVmMeta(String value) {
- privateVmMeta = value;
- }
-
- private Guid privateVmTemplateGUID = new Guid();
-
- public Guid getVmTemplateGUID() {
- return privateVmTemplateGUID;
- }
-
- private void setVmTemplateGUID(Guid value) {
- privateVmTemplateGUID = value;
- }
-
- private HashMap<String, Guid> privateVmTemplateImageGUIDs;
-
- public HashMap<String, Guid> getVmTemplateImageGUIDs() {
- return privateVmTemplateImageGUIDs;
- }
-
- private void setVmTemplateImageGUIDs(HashMap<String, Guid> value) {
- privateVmTemplateImageGUIDs = value;
- }
-
- private String privateVmTemplateMeta;
-
- public String getVmTemplateMeta() {
- return privateVmTemplateMeta;
- }
-
- private void setVmTemplateMeta(String value) {
- privateVmTemplateMeta = value;
- }
-
- private String privatePath;
-
- public String getPath() {
- return privatePath;
- }
-
- private void setPath(String value) {
- privatePath = value;
- }
-
- private boolean privateCollapse;
-
- public boolean getCollapse() {
- return privateCollapse;
- }
-
- private void setCollapse(boolean value) {
- privateCollapse = value;
- }
-
- private boolean privateForce;
-
- public boolean getForce() {
- return privateForce;
- }
-
- public void setForce(boolean value) {
- privateForce = value;
- }
-
- public ExportCandidateVDSCommandParameters(Guid storagePoolId, Guid
storageDomainId, Guid vmGUID,
- HashMap<String, ArrayList<Guid>> listOfImages, String vmMeta, Guid
vmTemplateGUID,
- HashMap<String, Guid> vmTemplateImageGUIDs, String vmTemplateMeta,
String path, boolean collapse,
- boolean force) {
- super(storagePoolId);
- setStorageDomainId(storageDomainId);
- setVmGUID(vmGUID);
- setListOfImages(listOfImages);
- setVmMeta(vmMeta);
- setVmTemplateGUID(vmTemplateGUID);
- setVmTemplateImageGUIDs(vmTemplateImageGUIDs);
- setVmTemplateMeta(vmTemplateMeta);
- setPath(path);
- setCollapse(collapse);
- setForce(force);
- }
-
- public ExportCandidateVDSCommandParameters() {
- }
-
- @Override
- public String toString() {
- return String.format("%s, vmGUID = %s, listOfImages = %s, vmMeta = %s,
vmTemplateGUID = %s, " +
- "vmTemplateImageGUIDs = %s, vmTemplateMeta = %s, path = %s,
collapse = %s, force = %s",
- super.toString(),
- getVmGUID(),
- getListOfImages(),
- getVmMeta(),
- getVmTemplateGUID(),
- getVmTemplateImageGUIDs(),
- getVmTemplateMeta(),
- getPath(),
- getCollapse(),
- getForce());
- }
-}
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 83c6b73..0e49d4a 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
@@ -72,7 +72,6 @@
GetIsoList("org.ovirt.engine.core.vdsbroker.irsbroker"),
HsmGetIsoList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
GetFloppyList("org.ovirt.engine.core.vdsbroker.irsbroker"),
- ExportCandidate("org.ovirt.engine.core.vdsbroker.irsbroker"),
CreateStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"),
ValidateStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"),
ActivateStorageDomain("org.ovirt.engine.core.vdsbroker.irsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExportCandidateVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExportCandidateVDSCommand.java
deleted file mode 100644
index da2e3de..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExportCandidateVDSCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import
org.ovirt.engine.core.common.vdscommands.ExportCandidateVDSCommandParameters;
-import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.StatusForXmlRpc;
-
-public class ExportCandidateVDSCommand<P extends
ExportCandidateVDSCommandParameters> extends IrsBrokerCommand<P> {
- private OneUuidReturnForXmlRpc _retUUID;
-
- public ExportCandidateVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void ExecuteIrsBrokerCommand() {
- // NOTE: The IrsProxy doesn't handle multi-drive yet, so we
- // choose a drive randomly and send only its parameters:
- String randomDrive =
(getParameters().getListOfImages().keySet().toArray(new String[0]))[0];
-
- Guid[] imagesForDrive =
getParameters().getListOfImages().get(randomDrive).toArray(new Guid[0]);
- String[] volumesList = new String[imagesForDrive.length];
- for (int i = 0; i < imagesForDrive.length; i++) {
- volumesList[i] = imagesForDrive[i].toString();
- }
-
- _retUUID =
getIrsProxy().exportCandidate(getParameters().getStorageDomainId().toString(),
- getParameters().getVmGUID().toString(), volumesList,
getParameters().getVmMeta(),
- getParameters().getVmTemplateGUID().toString(),
-
getParameters().getVmTemplateImageGUIDs().get(randomDrive).toString(),
- getParameters().getVmTemplateMeta(), getParameters().getPath(),
- (new Boolean(getParameters().getCollapse())).toString(),
- (new Boolean(getParameters().getForce())).toString());
- ProceedProxyReturnValue();
- setReturnValue(new Guid(_retUUID.mUuid));
- }
-
- @Override
- protected StatusForXmlRpc getReturnStatus() {
- return _retUUID.mStatus;
- }
-}
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 7952fcb..946cce8 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
@@ -28,10 +28,6 @@
IrsStatsAndStatusXmlRpc getIrsStats();
- OneUuidReturnForXmlRpc exportCandidate(String sdUUID, String vmGUID,
String[] volumesList, String vmMeta,
- String templateGUID, String templateVolGUID, String templateMeta,
String expPath, String collapse,
- String force);
-
OneUuidReturnForXmlRpc importCandidate(String sdUUID, String vmGUID,
String templateGUID, String templateVolGUID,
String path, String type, String force);
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 0229043..48622d0 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
@@ -35,10 +35,6 @@
public Map<String, Object> getStats();
- public Map<String, Object> exportCandidate(String sdUUID, String vmGUID,
String[] volumesList, String vmMeta,
- String templateGUID, String templateVolGUID, String templateMeta,
String expPath, String collapse,
- String force);
-
public Map<String, Object> importCandidate(String sdUUID, String vmGUID,
String templateGUID,
String templateVolGUID, String path, String type, String force);
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 f48d017..60b09a7 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
@@ -81,16 +81,6 @@
}
@Override
- public OneUuidReturnForXmlRpc exportCandidate(String sdUUID, String
vmGUID, String[] volumesList, String vmMeta,
- String templateGUID, String templateVolGUID, String templateMeta,
String expPath, String collapse,
- String force) {
- Map<String, Object> xmlRpcReturnValue =
irsServer.exportCandidate(sdUUID, vmGUID, volumesList, vmMeta,
- templateGUID, templateVolGUID, templateMeta, expPath,
collapse, force);
- OneUuidReturnForXmlRpc wrapper = new
OneUuidReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- }
-
- @Override
public OneUuidReturnForXmlRpc importCandidate(String sdUUID, String
vmGUID, String templateGUID,
String templateVolGUID, String path, String type, String force) {
Map<String, Object> xmlRpcReturnValue =
irsServer.importCandidate(sdUUID, vmGUID, templateGUID,
--
To view, visit http://gerrit.ovirt.org/13956
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bfcdf24b05a7e90fe4a2d1b536c5a927297fd16
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
