Roy Golan has uploaded a new change for review.
Change subject: core: Invoke FullList command using the resource manager
......................................................................
core: Invoke FullList command using the resource manager
direct constructor usage is not recommended. the api doesn't support
that.
Change-Id: I3c9c2314a1c0d5dd307b6401739c3b052dd3ec68
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.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/VmsMonitoring.java
R
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVDSCommand.java
4 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/42293/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
index 5e51ec8..1420e7b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MergeStatusCommand.java
@@ -24,7 +24,7 @@
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import org.ovirt.engine.core.compat.CommandStatus;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.FullListVdsCommand;
+import org.ovirt.engine.core.vdsbroker.vdsbroker.FullListVDSCommand;
import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +94,7 @@
List<String> vmIds = new ArrayList<>();
vmIds.add(getParameters().getVmId().toString());
VDS vds = getVdsDAO().get(getParameters().getVdsId());
- Map[] vms = (Map[]) (new FullListVdsCommand<>(
+ Map[] vms = (Map[]) (new FullListVDSCommand<>(
new FullListVDSCommandParameters(vds,
vmIds)).executeWithReturnValue());
if (vms == null || vms.length == 0) {
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 905e7b1..c36be5e 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
@@ -191,6 +191,7 @@
UpdateVmPolicy("org.ovirt.engine.core.vdsbroker"),
GetVmsFromExternalProvider("org.ovirt.engine.core.vdsbroker.vdsbroker"),
List("org.ovirt.engine.core.vdsbroker.vdsbroker"), // get a list
of VMs with status only
+ FullList("org.ovirt.engine.core.vdsbroker.vdsbroker"), // get a list
of VMs with full data and statistics and devices
GetVmStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), // get a VM
with full data and statistics
GetAllVmStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), // get a list
of VMs with full data and statistics
HostDevListByCaps("org.ovirt.engine.core.vdsbroker"), // get all
host devices with passthrough information
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
index 58dcddd..de6209c 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java
@@ -35,13 +35,13 @@
import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils;
import org.ovirt.engine.core.common.utils.VmDeviceType;
import org.ovirt.engine.core.common.vdscommands.FullListVDSCommandParameters;
+import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.TransactionScopeOption;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
import org.ovirt.engine.core.utils.transaction.TransactionSupport;
-import org.ovirt.engine.core.vdsbroker.vdsbroker.FullListVdsCommand;
import org.ovirt.engine.core.vdsbroker.vdsbroker.VdsProperties;
import org.ovirt.engine.core.vdsbroker.vdsbroker.entities.VmInternalData;
import org.slf4j.Logger;
@@ -585,8 +585,8 @@
// TODO refactor commands to use vdsId only - the whole vds object
here is useless
VDS vds = new VDS();
vds.setId(vdsManager.getVdsId());
- return (Map[]) (new FullListVdsCommand<FullListVDSCommandParameters>(
- new FullListVDSCommandParameters(vds,
vmsToUpdate)).executeWithReturnValue());
+ return (Map[])
(getResourceManager().runVdsCommand(VDSCommandType.FullList,
+ new FullListVDSCommandParameters(vds,
vmsToUpdate)).getReturnValue());
}
private boolean shouldLogDeviceDetails(String deviceType) {
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVdsCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVDSCommand.java
similarity index 86%
rename from
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVdsCommand.java
rename to
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVDSCommand.java
index a0a711c..93b6314 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVdsCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FullListVDSCommand.java
@@ -5,10 +5,10 @@
import org.ovirt.engine.core.common.vdscommands.FullListVDSCommandParameters;
-public class FullListVdsCommand<P extends FullListVDSCommandParameters>
extends VdsBrokerCommand<P> {
+public class FullListVDSCommand<P extends FullListVDSCommandParameters>
extends VdsBrokerCommand<P> {
private VMListReturnForXmlRpc fullVmListReturn;
- public FullListVdsCommand(P parameters) {
+ public FullListVDSCommand(P parameters) {
super(parameters, parameters.getVds());
}
@@ -35,9 +35,5 @@
@Override
protected boolean getIsPrintReturnValue() {
return false;
- }
-
- @Override
- protected void logToAudit(){
}
}
--
To view, visit https://gerrit.ovirt.org/42293
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9c2314a1c0d5dd307b6401739c3b052dd3ec68
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
