Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetStorageSessionsListQuery
......................................................................
core: Remove GetStorageSessionsListQuery
GetStorageSessionsListQuery is not used anywhere in the code, and
hence should be removed.
This patch removes the following:
1. The GetStorageSessionsListQuery class
2. The GetStorageSessionsList constant representing it in
VdcQueryType
3. The GetStorageSessionsListVDSCommand class which was only used by
this query.
4. The GetStorageSessionList constant representing it in
VDSCommandType.
5. The getSessionsList() method
IVdsServer/VdsServerConnector/VdsServerWrapper, which was only used
by GetStorageSessionsListVDSCommand.
6. The SessionsListReturnForXmlRpc class which was only used by
GetStorageSessionsListVDSCommand.
Change-Id: I5ee43140a7ca0cbe9a2c15cc787c270ead619bda
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageSessionsListQuery.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/vdsbroker/GetStorageSessionsListVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SessionsListReturnForXmlRpc.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
8 files changed, 0 insertions(+), 115 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/13229/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageSessionsListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageSessionsListQuery.java
deleted file mode 100644
index 3713568..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetStorageSessionsListQuery.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ovirt.engine.core.bll.storage;
-
-import org.ovirt.engine.core.bll.*;
-import org.ovirt.engine.core.common.queries.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class GetStorageSessionsListQuery<P extends VdsIdParametersBase>
extends QueriesCommandBase<P> {
- public GetStorageSessionsListQuery(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(
- Backend.getInstance()
- .getResourceManager()
- .RunVdsCommand(VDSCommandType.GetStorageSessionsList,
- new
VdsIdVDSCommandParametersBase(getParameters().getVdsId())).getReturnValue());
- }
-}
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 30a5da7..915610a 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
@@ -216,7 +216,6 @@
GetVgList,
GetDeviceList,
DiscoverSendTargets,
- GetStorageSessionsList,
GetStorageDomainsByVmTemplateId(VdcQueryAuthType.User),
GetVmsFromExportDomain("org.ovirt.engine.core.bll.storage"),
GetTemplatesFromExportDomain,
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 adccba5..47ead7f 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
@@ -54,7 +54,6 @@
HSMStopTask("org.ovirt.engine.core.vdsbroker.vdsbroker"),
HSMClearTask("org.ovirt.engine.core.vdsbroker.vdsbroker"),
HSMRevertTask("org.ovirt.engine.core.vdsbroker.vdsbroker"),
- GetStorageSessionsList("org.ovirt.engine.core.vdsbroker.vdsbroker"),
UpdateVmDynamicData("org.ovirt.engine.core.vdsbroker"),
UpdateVdsDynamicData("org.ovirt.engine.core.vdsbroker"),
CollectVdsNetworkData("org.ovirt.engine.core.vdsbroker.vdsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageSessionsListVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageSessionsListVDSCommand.java
deleted file mode 100644
index 91d4338..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageSessionsListVDSCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import org.ovirt.engine.core.common.businessentities.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStruct;
-
-public class GetStorageSessionsListVDSCommand<P extends
VdsIdVDSCommandParametersBase> extends VdsBrokerCommand<P> {
- protected SessionsListReturnForXmlRpc _result;
-
- public GetStorageSessionsListVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void ExecuteVdsBrokerCommand() {
- _result = getBroker().getSessionList();
- ProceedProxyReturnValue();
- setReturnValue(ParseSessionsList(_result.sessionsList));
- }
-
- @Override
- protected StatusForXmlRpc getReturnStatus() {
- return _result.mStatus;
- }
-
- private java.util.ArrayList<StorageServerConnections>
ParseSessionsList(XmlRpcStruct[] sessionsList) {
- java.util.ArrayList<StorageServerConnections> result = new
java.util.ArrayList<StorageServerConnections>(
- sessionsList.length);
- for (XmlRpcStruct session : sessionsList) {
- result.add(GetDeviceListVDSCommand.ParseConnection(session));
- }
- return result;
- }
-
- @Override
- protected Object getReturnValueFromBroker() {
- return _result;
- }
-}
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 d8f0ba3..950e995 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
@@ -149,8 +149,6 @@
IQNListReturnForXmlRpc discoverSendTargets(Map<String, String> args);
- SessionsListReturnForXmlRpc getSessionList();
-
OneUuidReturnForXmlRpc spmStart(String spUUID,
int prevID,
String prevLVER,
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SessionsListReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SessionsListReturnForXmlRpc.java
deleted file mode 100644
index 9634e32..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SessionsListReturnForXmlRpc.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.vdsbroker;
-
-import java.util.Map;
-
-import org.ovirt.engine.core.vdsbroker.irsbroker.*;
-import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcObjectDescriptor;
-import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStruct;
-
-public final class SessionsListReturnForXmlRpc extends StatusReturnForXmlRpc {
- private static final String SESSIONS = "sessions";
- // We are ignoring missing fields after the status, because on failure it
is
- // not sent.
- // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("sessions")]
- public XmlRpcStruct[] sessionsList;
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("\n");
- builder.append(super.toString());
- builder.append("\n");
- XmlRpcObjectDescriptor.ToStringBuilder(sessionsList, builder);
- return builder.toString();
- }
-
- @SuppressWarnings("unchecked")
- public SessionsListReturnForXmlRpc(Map<String, Object> innerMap) {
- super(innerMap);
- Object[] temp = (Object[]) innerMap.get(SESSIONS);
- if (temp != null) {
- sessionsList = new XmlRpcStruct[temp.length];
- for (int i = 0; i < temp.length; i++) {
- sessionsList[i] = new XmlRpcStruct((Map<String, Object>)
temp[i]);
- }
- }
- }
-
-}
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 2a0aa59..71227d5 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
@@ -134,8 +134,6 @@
public Map<String, Object> discoverSendTargets(Map<String, String> args);
- public Map<String, Object> getSessionList();
-
public Map<String, Object> spmStart(String spUUID,
int prevID,
String prevLVER,
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 13ea1f6..8dcd141 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
@@ -749,18 +749,6 @@
}
@Override
- public SessionsListReturnForXmlRpc getSessionList() {
- try {
- Map<String, Object> xmlRpcReturnValue = vdsServer.getSessionList();
- SessionsListReturnForXmlRpc wrapper = new
SessionsListReturnForXmlRpc(xmlRpcReturnValue);
- return wrapper;
- } catch (UndeclaredThrowableException ute) {
- throw new XmlRpcRunTimeException(ute);
- }
-
- }
-
- @Override
public OneUuidReturnForXmlRpc spmStart(String spUUID, int prevID, String
prevLVER, int recoveryMode,
String SCSIFencing, int maxHostId, String storagePoolFormatType) {
try {
--
To view, visit http://gerrit.ovirt.org/13229
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ee43140a7ca0cbe9a2c15cc787c270ead619bda
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
