Michael Kublin has uploaded a new change for review.
Change subject: engine: Continue reduace usage of getCurrentVdsId()
......................................................................
engine: Continue reduace usage of getCurrentVdsId()
Reduced usage of getCurrentVdsId() and removed some unused commands
Change-Id: Icc8e06fd1814d272788c386ad36e168ec3a9d09d
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageDomainInfoVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.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/GetStorageDomainInfoVDSCommand.java
D
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskInfoVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskStatusVDSCommand.java
6 files changed, 7 insertions(+), 77 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/9026/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageDomainInfoVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageDomainInfoVDSCommandParameters.java
deleted file mode 100644
index 9fd90a3..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageDomainInfoVDSCommandParameters.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.ovirt.engine.core.common.vdscommands;
-
-import org.ovirt.engine.core.compat.*;
-
-public class GetStorageDomainInfoVDSCommandParameters extends
ActivateStorageDomainVDSCommandParameters {
- public GetStorageDomainInfoVDSCommandParameters(Guid storagePoolId, Guid
storageDomainId) {
- super(storagePoolId, storageDomainId);
- }
-
- public GetStorageDomainInfoVDSCommandParameters() {
- }
-}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
index 18ab42f..865db31 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
@@ -7,7 +7,7 @@
super(storagePoolId);
setVdsId(vdsId);
}
-
+
private Guid privateVdsId;
public Guid getVdsId() {
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 088bfbe..e42faa5 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
@@ -87,7 +87,6 @@
AttachStorageDomain("org.ovirt.engine.core.vdsbroker.irsbroker"),
FormatStorageDomain("org.ovirt.engine.core.vdsbroker.vdsbroker"),
SetStorageDomainDescription("org.ovirt.engine.core.vdsbroker.irsbroker"),
- GetStorageDomainInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
GetStorageDomainStats("org.ovirt.engine.core.vdsbroker.vdsbroker"),
SetStoragePoolDescription("org.ovirt.engine.core.vdsbroker.irsbroker"),
GetStoragePoolInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
@@ -109,7 +108,6 @@
SPMGetAllTasksStatuses("org.ovirt.engine.core.vdsbroker.irsbroker"),
SPMGetTaskStatus("org.ovirt.engine.core.vdsbroker.irsbroker"),
SPMGetAllTasksInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
- SPMGetTaskInfo("org.ovirt.engine.core.vdsbroker.irsbroker"),
SPMStopTask("org.ovirt.engine.core.vdsbroker.irsbroker"),
SPMClearTask("org.ovirt.engine.core.vdsbroker.irsbroker"),
SPMRevertTask("org.ovirt.engine.core.vdsbroker.irsbroker"),
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStorageDomainInfoVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStorageDomainInfoVDSCommand.java
deleted file mode 100644
index b5afb18..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStorageDomainInfoVDSCommand.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import org.ovirt.engine.core.vdsbroker.*;
-import org.ovirt.engine.core.common.businessentities.SANState;
-import org.ovirt.engine.core.common.businessentities.storage_domain_static;
-import org.ovirt.engine.core.common.utils.Pair;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class GetStorageDomainInfoVDSCommand<P extends
GetStorageDomainInfoVDSCommandParameters>
- extends IrsBrokerCommand<P> {
- public GetStorageDomainInfoVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void ExecuteIrsBrokerCommand() {
- Pair<storage_domain_static, SANState> domainFromIrs =
(Pair<storage_domain_static, SANState>) ResourceManager
- .getInstance()
- .runVdsCommand(
- VDSCommandType.HSMGetStorageDomainInfo,
- new
HSMGetStorageDomainInfoVDSCommandParameters(getCurrentIrsProxyData().getCurrentVdsId(),
-
getParameters().getStorageDomainId())).getReturnValue();
- if (domainFromIrs != null) {
- setReturnValue(domainFromIrs.getFirst());
- }
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskInfoVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskInfoVDSCommand.java
deleted file mode 100644
index fa24afe..0000000
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskInfoVDSCommand.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.vdsbroker.irsbroker;
-
-import org.ovirt.engine.core.vdsbroker.*;
-import org.ovirt.engine.core.common.vdscommands.*;
-
-public class SPMGetTaskInfoVDSCommand<P extends
SPMTaskGuidBaseVDSCommandParameters>
- extends SPMGetAllTasksInfoVDSCommand<P> {
- public SPMGetTaskInfoVDSCommand(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void ExecuteIrsBrokerCommand() {
- setReturnValue(ResourceManager
- .getInstance()
- .runVdsCommand(
- VDSCommandType.HSMGetTaskInfo,
- new
HSMTaskGuidBaseVDSCommandParameters(getCurrentIrsProxyData().getCurrentVdsId(),
-
getParameters().getTaskId())).getReturnValue());
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskStatusVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskStatusVDSCommand.java
index 29a7165..8d457b2 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskStatusVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/SPMGetTaskStatusVDSCommand.java
@@ -1,7 +1,5 @@
package org.ovirt.engine.core.vdsbroker.irsbroker;
-import org.ovirt.engine.core.compat.*;
-import org.ovirt.engine.core.common.businessentities.*;
import org.ovirt.engine.core.vdsbroker.*;
import org.ovirt.engine.core.common.vdscommands.*;
@@ -13,17 +11,11 @@
@Override
protected void ExecuteIrsBrokerCommand() {
- if (getCurrentIrsProxyData().getCurrentVdsId().equals(Guid.Empty)) {
- AsyncTaskStatus tempVar = new AsyncTaskStatus();
- tempVar.setMessage("No Host Available");
- setReturnValue(tempVar);
- } else {
- setReturnValue(ResourceManager
- .getInstance()
- .runVdsCommand(
- VDSCommandType.HSMGetTaskStatus,
- new
HSMTaskGuidBaseVDSCommandParameters(getCurrentIrsProxyData().getCurrentVdsId(),
-
getParameters().getTaskId())).getReturnValue());
- }
+ setReturnValue(ResourceManager
+ .getInstance()
+ .runVdsCommand(
+ VDSCommandType.HSMGetTaskStatus,
+ new
HSMTaskGuidBaseVDSCommandParameters(getCurrentIrsProxyData().getCurrentVdsId(),
+
getParameters().getTaskId())).getReturnValue());
}
}
--
To view, visit http://gerrit.ovirt.org/9026
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc8e06fd1814d272788c386ad36e168ec3a9d09d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
