Liron Aravot has uploaded a new change for review. Change subject: core: removing fenceSpmStorage verb and related classes ......................................................................
core: removing fenceSpmStorage verb and related classes The use of fenceSpmStorage was removed in the previous patch in the series, as it's not used anymore it can be safely remove along the related classes. Change-Id: I593a0620696729500d740c632a2a149c09366cbc Signed-off-by: Liron Aravot <[email protected]> --- D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceSpmStorageVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.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/jsonrpc/JsonRpcVdsServer.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceSpmStorageVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.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, 27 insertions(+), 83 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/30890/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceSpmStorageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceSpmStorageVDSCommandParameters.java deleted file mode 100644 index d1ecc27..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/FenceSpmStorageVDSCommandParameters.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.ovirt.engine.core.common.vdscommands; - -import org.ovirt.engine.core.compat.Guid; - -public class FenceSpmStorageVDSCommandParameters extends GetStorageConnectionsListVDSCommandParameters { - public FenceSpmStorageVDSCommandParameters(Guid vdsId, Guid storagePoolId, int prevID, String prevLVER) { - super(vdsId, storagePoolId); - setPrevId(prevID); - setPrevLVER((prevLVER != null) ? prevLVER : "-1"); - } - - private int privatePrevId; - - public int getPrevId() { - return privatePrevId; - } - - private void setPrevId(int value) { - privatePrevId = value; - } - - private String privatePrevLVER; - - public String getPrevLVER() { - return privatePrevLVER; - } - - private void setPrevLVER(String value) { - privatePrevLVER = value; - } - - public FenceSpmStorageVDSCommandParameters() { - } - - @Override - public String toString() { - return String.format("%s, prevId=%s, prevLVER=%s", super.toString(), getPrevId(), getPrevLVER()); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java index 463852b..28d8d06 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java @@ -4,10 +4,12 @@ import org.ovirt.engine.core.common.businessentities.StorageFormatType; import org.ovirt.engine.core.compat.Guid; -public class SpmStartVDSCommandParameters extends FenceSpmStorageVDSCommandParameters { +public class SpmStartVDSCommandParameters extends GetStorageConnectionsListVDSCommandParameters { public SpmStartVDSCommandParameters(Guid vdsId, Guid storagePoolId, int prevID, String prevLVER, RecoveryMode recoveryMode, boolean SCSIfencing, StorageFormatType storagePoolFormatType) { - super(vdsId, storagePoolId, prevID, prevLVER); + super(vdsId, storagePoolId); + setPrevId(prevID); + setPrevLVER((prevLVER != null) ? prevLVER : "-1"); setRecoveryMode(recoveryMode); setSCSIFencing(SCSIfencing); setStoragePoolFormatType(storagePoolFormatType); @@ -47,10 +49,32 @@ privateRecoveryMode = RecoveryMode.Manual; } + private int privatePrevId; + + public int getPrevId() { + return privatePrevId; + } + + private void setPrevId(int value) { + privatePrevId = value; + } + + private String privatePrevLVER; + + public String getPrevLVER() { + return privatePrevLVER; + } + + private void setPrevLVER(String value) { + privatePrevLVER = value; + } + @Override public String toString() { - return String.format("%s, storagePoolFormatType=%s, recoveryMode=%s, SCSIFencing=%s", + return String.format("%s, prevId=%s, prevLVER=%s, storagePoolFormatType=%s, recoveryMode=%s, SCSIFencing=%s", super.toString(), + getPrevId(), + getPrevLVER(), getStoragePoolFormatType(), getRecoveryMode(), getSCSIFencing()); 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 0b68804..456d771 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 @@ -42,7 +42,6 @@ SpmStart("org.ovirt.engine.core.vdsbroker.vdsbroker"), SpmStop("org.ovirt.engine.core.vdsbroker.vdsbroker"), SpmStatus("org.ovirt.engine.core.vdsbroker.vdsbroker"), - FenceSpmStorage("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMGetAllTasksStatuses("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMGetTaskStatus("org.ovirt.engine.core.vdsbroker.vdsbroker"), HSMGetAllTasksInfo("org.ovirt.engine.core.vdsbroker.vdsbroker"), diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index 3f651da..1d43c55 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -747,14 +747,6 @@ } @Override - public StatusOnlyReturnForXmlRpc fenceSpmStorage(String spUUID, int prevID, String prevLVER) { - // no prevID and prevLVER not used and can be removed from the interface - JsonRpcRequest request = new RequestBuilder("StoragePool.fence").withParameter("storagepoolID", spUUID).build(); - Map<String, Object> response = new FutureMap(this.client, request); - return new StatusOnlyReturnForXmlRpc(response); - } - - @Override public StatusOnlyReturnForXmlRpc refreshStoragePool(String spUUID, String msdUUID, int masterVersion) { JsonRpcRequest request = new RequestBuilder("StoragePool.refresh").withParameter("storagepoolID", spUUID) diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceSpmStorageVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceSpmStorageVDSCommand.java deleted file mode 100644 index fcfaf0a..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceSpmStorageVDSCommand.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.FenceSpmStorageVDSCommandParameters; - -public class FenceSpmStorageVDSCommand<P extends FenceSpmStorageVDSCommandParameters> extends VdsBrokerCommand<P> { - public FenceSpmStorageVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void executeVdsBrokerCommand() { - status = getBroker().fenceSpmStorage(getParameters().getStoragePoolId().toString(), - getParameters().getPrevId(), getParameters().getPrevLVER()); - proceedProxyReturnValue(); - } -} 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 64a7c68..eb92bff 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 @@ -156,8 +156,6 @@ SpmStatusReturnForXmlRpc spmStatus(String spUUID); - StatusOnlyReturnForXmlRpc fenceSpmStorage(String spUUID, int prevID, String prevLVER); - StatusOnlyReturnForXmlRpc refreshStoragePool(String spUUID, String msdUUID, int masterVersion); TaskStatusReturnForXmlRpc getTaskStatus(String taskUUID); 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 de27444..57ddf0f 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 @@ -139,8 +139,6 @@ public Map<String, Object> getSpmStatus(String spUUID); - public Map<String, Object> fenceSpmStorage(String spUUID, int prevID, String prevLVER); - public Map<String, Object> refreshStoragePool(String spUUID, String msdUUID, int masterVersion); public Map<String, Object> getTaskStatus(String taskUUID); 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 0d54aaa..395bc02 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 @@ -712,18 +712,6 @@ } @Override - public StatusOnlyReturnForXmlRpc fenceSpmStorage(String spUUID, int prevID, String prevLVER) { - try { - Map<String, Object> xmlRpcReturnValue = vdsServer.fenceSpmStorage(spUUID, prevID, prevLVER); - StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); - return wrapper; - } catch (UndeclaredThrowableException ute) { - throw new XmlRpcRunTimeException(ute); - } - - } - - @Override public StatusOnlyReturnForXmlRpc refreshStoragePool(String spUUID, String msdUUID, int masterVersion) { try { Map<String, Object> xmlRpcReturnValue = vdsServer.refreshStoragePool(spUUID, msdUUID, masterVersion); -- To view, visit http://gerrit.ovirt.org/30890 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I593a0620696729500d740c632a2a149c09366cbc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
