Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetAllIdsFromExportDomainQuery
......................................................................
core: Remove GetAllIdsFromExportDomainQuery
GetAllIdsFromExportDomainQuery is not used anywhere in the code, and
hence should be removed.
This patch removes the following:
1. The GetAllIdsFromExportDomainQuery class
2. The GetAllIdsFromExportDomain constant representing it in
VdcQueryType
3. The GetVmsListVDSCommand class which was only used by
this query.
4. The GetVmsList constant representing it in
VDSCommandType.
5. The getVmsList(String, String) method in
IIrsServer/IrsServerWrapper, which was only used
by GetVmsListVDSCommand.
6. The GetVmsListReturnForXmlRpc class which was only used by
GetVmsListVDSCommand.
Change-Id: Id6c384ccbb317f67afb4d0fc13373dd6c7671f93
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetAllIdsFromExportDomainQuery.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.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/GetVmsListReturnForXmlRpc.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListVDSCommand.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/IrsServerWrapper.java
7 files changed, 0 insertions(+), 96 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/13280/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetAllIdsFromExportDomainQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetAllIdsFromExportDomainQuery.java
deleted file mode 100644
index ca34584..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetAllIdsFromExportDomainQuery.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.ovirt.engine.core.bll.storage;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.ovirt.engine.core.bll.Backend;
-import org.ovirt.engine.core.bll.QueriesCommandBase;
-import
org.ovirt.engine.core.common.queries.GetAllFromExportDomainQueryParameters;
-import org.ovirt.engine.core.common.vdscommands.GetVmsInfoVDSCommandParameters;
-import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
-import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
-
-public class GetAllIdsFromExportDomainQuery<P extends
GetAllFromExportDomainQueryParameters>
- extends QueriesCommandBase<P> {
- public GetAllIdsFromExportDomainQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- GetVmsInfoVDSCommandParameters tempVar = new
GetVmsInfoVDSCommandParameters(
- getParameters().getStoragePoolId());
- tempVar.setStorageDomainId(getParameters().getStorageDomainId());
- VDSReturnValue retVal = Backend.getInstance().getResourceManager()
- .RunVdsCommand(VDSCommandType.GetVmsList, tempVar);
- List<String> ids = Arrays.asList((String[]) retVal.getReturnValue());
- getQueryReturnValue().setReturnValue(ids);
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index 08639fb..461e136 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -217,7 +217,6 @@
GetVmsFromExportDomain("org.ovirt.engine.core.bll.storage"),
GetTemplatesFromExportDomain,
GetVmTemplatesFromStorageDomain(VdcQueryAuthType.User),
- GetAllIdsFromExportDomain,
GetAllStorageDomains(VdcQueryAuthType.User),
GetExistingStorageDomainList,
GetStorageDomainByIdAndStoragePoolId,
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 47ead7f..5512980 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
@@ -58,7 +58,6 @@
UpdateVdsDynamicData("org.ovirt.engine.core.vdsbroker"),
CollectVdsNetworkData("org.ovirt.engine.core.vdsbroker.vdsbroker"),
GetVmsInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
- GetVmsList("org.ovirt.engine.core.vdsbroker.irsbroker"),
HSMGetStorageDomainInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"),
HSMGetStorageDomainsList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
CreateImage("org.ovirt.engine.core.vdsbroker.irsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListReturnForXmlRpc.java
deleted file mode 100644
index d67a605..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListReturnForXmlRpc.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import java.util.Map;
-
-public final class GetVmsListReturnForXmlRpc extends StatusReturnForXmlRpc {
- private static final String VM_LIST = "vmlist";
- // We are ignoring missing fields after the status, because on failure it
is
- // not sent.
- // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("vmlist")]
- public String[] vmlist;
-
- @SuppressWarnings("unchecked")
- public GetVmsListReturnForXmlRpc(Map<String, Object> innerMap) {
- super(innerMap);
- Object[] tempObj = (Object[]) innerMap.get(VM_LIST);
- if (tempObj != null) {
- vmlist = new String[tempObj.length];
- for (int i = 0; i < tempObj.length; i++) {
- vmlist[i] = (String) tempObj[i];
- }
- }
-
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListVDSCommand.java
deleted file mode 100644
index 89e33b5..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsListVDSCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import org.ovirt.engine.core.vdsbroker.vdsbroker.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class GetVmsListVDSCommand<P extends GetVmsInfoVDSCommandParameters>
extends IrsBrokerCommand<P> {
- private GetVmsListReturnForXmlRpc _vmsList;
-
- public GetVmsListVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void ExecuteIrsBrokerCommand() {
- String storagePoolId = getParameters().getStoragePoolId().toString();
- String storageDomainId =
getParameters().getStorageDomainId().toString();
-
- _vmsList = getIrsProxy().getVmsList(storagePoolId, storageDomainId);
- ProceedProxyReturnValue();
-
- setReturnValue(_vmsList.vmlist);
- }
-
- @Override
- protected StatusForXmlRpc getReturnStatus() {
- return _vmsList.mStatus;
- }
-
- @Override
- protected Object getReturnValueFromBroker() {
- return _vmsList;
- }
-}
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 011cac3..142d2b4 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
@@ -88,8 +88,6 @@
GetVmsInfoReturnForXmlRpc getVmsInfo(String storagePoolId, String
storageDomainId, String[] VMIDList);
- GetVmsListReturnForXmlRpc getVmsList(String storagePoolId, String
storageDomainId);
-
StatusOnlyReturnForXmlRpc upgradeStoragePool(String storagePoolId, String
targetVersion);
ImagesListReturnForXmlRpc getImagesList(String sdUUID);
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 e322121..5e32a7c 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
@@ -255,12 +255,6 @@
return wrapper;
}
- public GetVmsListReturnForXmlRpc getVmsList(String storagePoolId, String
storageDomainId) {
- Map<String, Object> xmlRpcReturnValue =
irsServer.getVmsList(storagePoolId, storageDomainId);
- GetVmsListReturnForXmlRpc wrapper = new
GetVmsListReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- }
-
public StatusOnlyReturnForXmlRpc upgradeStoragePool(String storagePoolId,
String targetVersion) {
Map<String, Object> xmlRpcReturnValue =
irsServer.upgradeStoragePool(storagePoolId, targetVersion);
return new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue);
--
To view, visit http://gerrit.ovirt.org/13280
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6c384ccbb317f67afb4d0fc13373dd6c7671f93
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
