Allon Mureinik has uploaded a new change for review. Change subject: core: Removed GetDeviceInfoVDSCommand ......................................................................
core: Removed GetDeviceInfoVDSCommand GetDeviceInfoVDSComman is not used anywhere in the codebase, and thus should be removed. Change-Id: I7471f1a58cb207ddc7a53db7bd6a771fa5ef06d0 Signed-off-by: Allon Mureinik <[email protected]> --- D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceInfoVDSCommandParameters.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/GetDeviceInfoVDSCommand.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/OneLUNReturnForXmlRpc.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 7 files changed, 0 insertions(+), 106 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/14800/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceInfoVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceInfoVDSCommandParameters.java deleted file mode 100644 index 73c1964..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceInfoVDSCommandParameters.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class GetDeviceInfoVDSCommandParameters extends VdsIdVDSCommandParametersBase { - public GetDeviceInfoVDSCommandParameters(Guid vdsId, String lunId) { - super(vdsId); - setLUNID(lunId); - } - - private String privateLUNID; - - public String getLUNID() { - return privateLUNID; - } - - private void setLUNID(String value) { - privateLUNID = value; - } - - public GetDeviceInfoVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, LUNID=%s", super.toString(), getLUNID()); - } - -} 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 374ed7f..2f38f95 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 @@ -92,7 +92,6 @@ GetVGList("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetVGInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetDeviceList("org.ovirt.engine.core.vdsbroker.vdsbroker"), - GetDeviceInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetDevicesVisibility("org.ovirt.engine.core.vdsbroker.vdsbroker"), SPMGetAllTasksStatuses("org.ovirt.engine.core.vdsbroker.irsbroker"), SPMGetTaskStatus("org.ovirt.engine.core.vdsbroker.irsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceInfoVDSCommand.java deleted file mode 100644 index df385a2..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceInfoVDSCommand.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.*; - -public class GetDeviceInfoVDSCommand<P extends GetDeviceInfoVDSCommandParameters> extends VdsBrokerCommand<P> { - private OneLUNReturnForXmlRpc _result; - - public GetDeviceInfoVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void ExecuteVdsBrokerCommand() { - _result = getBroker().getDeviceInfo(getParameters().getLUNID()); - ProceedProxyReturnValue(); - setReturnValue(GetDeviceListVDSCommand.ParseLunFromXmlRpc(_result.lunInfo)); - } - - @Override - protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; - } - - @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 0bb2ee5..5d84db0 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 @@ -129,8 +129,6 @@ LUNListReturnForXmlRpc getDeviceList(int storageType); - OneLUNReturnForXmlRpc getDeviceInfo(String devGUID); - DevicesVisibilityMapReturnForXmlRpc getDevicesVisibility(String[] devicesList); IQNListReturnForXmlRpc discoverSendTargets(Map<String, String> args); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/OneLUNReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/OneLUNReturnForXmlRpc.java deleted file mode 100644 index 7beed1f..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/OneLUNReturnForXmlRpc.java +++ /dev/null @@ -1,32 +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; - -@SuppressWarnings("unchecked") -public final class OneLUNReturnForXmlRpc extends StatusReturnForXmlRpc { - private static final String INFO = "info"; - - // We are ignoring missing fields after the status, because on failure it is - // not sent. - // [XmlRpcMissingMapping(MappingAction.Ignore), XmlRpcMember("info")] - public Map<String, Object> lunInfo; - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("\n"); - builder.append(super.toString()); - builder.append("\n"); - XmlRpcObjectDescriptor.ToStringBuilder(lunInfo, builder); - return builder.toString(); - } - - public OneLUNReturnForXmlRpc(Map<String, Object> innerMap) { - super(innerMap); - lunInfo = (Map<String, Object>) innerMap.get(INFO); - } - -} 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 809abec..1390a18 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 @@ -114,8 +114,6 @@ public Map<String, Object> getDeviceList(int storageType); - public Map<String, Object> getDeviceInfo(String devGUID); - public Map<String, Object> getDevicesVisibility(String[] devicesList); public Map<String, Object> discoverSendTargets(Map<String, String> args); 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 4adaa7f..3ebae13 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 @@ -631,18 +631,6 @@ } @Override - public OneLUNReturnForXmlRpc getDeviceInfo(String devGUID) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.getDeviceInfo(devGUID); - OneLUNReturnForXmlRpc wrapper = new OneLUNReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override public DevicesVisibilityMapReturnForXmlRpc getDevicesVisibility(String[] devicesList) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.getDevicesVisibility(devicesList); -- To view, visit http://gerrit.ovirt.org/14800 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7471f1a58cb207ddc7a53db7bd6a771fa5ef06d0 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
