Yair Zaslavsky has uploaded a new change for review.
Change subject: bll: introducing runInternalQuery at CommandBase
......................................................................
bll: introducing runInternalQuery at CommandBase
Change-Id: I756c5b67a376ca73c95f3fcb83bfe7a19125b200
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
12 files changed, 22 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/28936/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
index 8652795..2bac2c2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
@@ -136,7 +136,7 @@
protected VM getVmFromConfiguration() {
VM result = null;
VdcQueryReturnValue queryReturnValue =
-
Backend.getInstance().runInternalQuery(VdcQueryType.GetVmConfigurationBySnapshot,
+ runInternalQuery(VdcQueryType.GetVmConfigurationBySnapshot,
new IdQueryParameters(snapshot.getId()));
if (queryReturnValue.getSucceeded()) {
result = queryReturnValue.getReturnValue();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
index baff235..873eee3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddWatchdogCommand.java
@@ -46,7 +46,7 @@
return failCanDoAction(VdcBllMessages.WATCHDOG_MODEL_REQUIRED);
}
VdcQueryReturnValue returnValue =
- getBackend().runInternalQuery(VdcQueryType.GetWatchdog,
+ runInternalQuery(VdcQueryType.GetWatchdog,
new IdQueryParameters(getParameters().getId()));
Collection<VmWatchdog> watchdogs = returnValue.getReturnValue();
if (!watchdogs.isEmpty()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
index ca0914a..796a1b7 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
@@ -83,7 +83,7 @@
}
protected Collection<DiskImage> getDiskImagesFromConfiguration() {
- VdcQueryReturnValue vdcReturnValue = getBackend().runInternalQuery(
+ VdcQueryReturnValue vdcReturnValue = runInternalQuery(
VdcQueryType.GetAllDisksByVmId,
new IdQueryParameters(oldVmId));
@@ -160,7 +160,7 @@
private void attachDisks() {
- VdcQueryReturnValue vdcReturnValue = getBackend().runInternalQuery(
+ VdcQueryReturnValue vdcReturnValue = runInternalQuery(
VdcQueryType.GetAllDisksByVmId,
new IdQueryParameters(oldVmId));
@@ -174,7 +174,7 @@
}
private void attachDisk(Disk disk) {
- getBackend().runInternalAction(
+ runInternalAction(
VdcActionType.AttachDiskToVm,
new AttachDetachVmDiskParameters(
getParameters().getNewVmGuid(),
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index 64cf761..653cbe6 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -66,6 +66,9 @@
import org.ovirt.engine.core.common.errors.VdcFault;
import org.ovirt.engine.core.common.job.Step;
import org.ovirt.engine.core.common.job.StepEnum;
+import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
+import org.ovirt.engine.core.common.queries.VdcQueryReturnValue;
+import org.ovirt.engine.core.common.queries.VdcQueryType;
import org.ovirt.engine.core.common.utils.Pair;
import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
@@ -2164,4 +2167,8 @@
return Backend.getInstance().runInternalMultipleActions(actionType,
parameters, executionContext);
}
+ protected VdcQueryReturnValue runInternalQuery(VdcQueryType type,
VdcQueryParametersBase queryParams) {
+ return Backend.getInstance().runInternalQuery(type, queryParams);
+ }
+
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
index 40bc61a..4f7a4db 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
@@ -433,7 +433,7 @@
boolean retVal = true;
GetAllFromExportDomainQueryParameters tempVar = new
GetAllFromExportDomainQueryParameters(getVm()
.getStoragePoolId(), getParameters().getStorageDomainId());
- VdcQueryReturnValue qretVal =
Backend.getInstance().runInternalQuery(VdcQueryType.GetVmsFromExportDomain,
+ VdcQueryReturnValue qretVal =
runInternalQuery(VdcQueryType.GetVmsFromExportDomain,
tempVar);
if (qretVal.getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
index 2e83e5e..de62edd 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
@@ -109,7 +109,7 @@
// Set the template images from the Export domain and change each
image id storage is to the import domain
GetAllFromExportDomainQueryParameters tempVar = new
GetAllFromExportDomainQueryParameters(getParameters()
.getStoragePoolId(), getParameters().getSourceDomainId());
- VdcQueryReturnValue qretVal = getBackend().runInternalQuery(
+ VdcQueryReturnValue qretVal = runInternalQuery(
VdcQueryType.GetTemplatesFromExportDomain, tempVar);
retVal = qretVal.getSucceeded();
if (retVal) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java
index 14f9d19..e64870c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java
@@ -152,7 +152,7 @@
GetAllFromExportDomainQueryParameters tempVar = new
GetAllFromExportDomainQueryParameters(
getParameters().getStoragePoolId(),
getParameters().getStorageDomainId());
tempVar.setIds(new
ArrayList<Guid>(Collections.singletonList(getVmId())));
- VdcQueryReturnValue qretVal =
Backend.getInstance().runInternalQuery(
+ VdcQueryReturnValue qretVal = runInternalQuery(
VdcQueryType.GetVmsFromExportDomain, tempVar);
if (qretVal != null && qretVal.getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
index d49ee71..095f8c8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java
@@ -157,7 +157,7 @@
if (exportTemplate == null) {
GetAllFromExportDomainQueryParameters tempVar = new
GetAllFromExportDomainQueryParameters(getParameters()
.getStoragePoolId(), getParameters().getStorageDomainId());
- VdcQueryReturnValue qretVal =
Backend.getInstance().runInternalQuery(
+ VdcQueryReturnValue qretVal = runInternalQuery(
VdcQueryType.GetTemplatesFromExportDomain, tempVar);
if (qretVal.getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 4fb83eb..993ff28 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -147,7 +147,7 @@
// do not update if this flag is not set
if (getParameters().isUpdateRngDevice()) {
VdcQueryReturnValue query =
- getBackend().runInternalQuery(VdcQueryType.GetRngDevice,
new IdQueryParameters(getParameters().getVmId()));
+ runInternalQuery(VdcQueryType.GetRngDevice, new
IdQueryParameters(getParameters().getVmId()));
@SuppressWarnings("unchecked")
List<VmRngDevice> rngDevs = query.getReturnValue();
@@ -248,7 +248,7 @@
// do not update if this flag is not set
if (getParameters().isUpdateWatchdog()) {
VdcQueryReturnValue query =
- getBackend().runInternalQuery(VdcQueryType.GetWatchdog,
new IdQueryParameters(getParameters().getVmId()));
+ runInternalQuery(VdcQueryType.GetWatchdog, new
IdQueryParameters(getParameters().getVmId()));
List<VmWatchdog> watchdogs = query.getReturnValue();
if (watchdogs.isEmpty()) {
if (getParameters().getWatchdog() == null) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
index 7a287e6..c64b350 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
@@ -171,7 +171,7 @@
*/
protected void TestVdsPowerManagementStatus(VdsStatic vdsStatic) {
if (vdsStatic.isPmEnabled()) {
-
Backend.getInstance().runInternalQuery(VdcQueryType.GetVdsFenceStatus,
+ runInternalQuery(VdcQueryType.GetVdsFenceStatus,
new VdsIdParametersBase(vdsStatic.getId()));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
index f685e84..5a90480 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
@@ -207,7 +207,7 @@
// do not update if this flag is not set
if (getParameters().isUpdateWatchdog()) {
VdcQueryReturnValue query =
- getBackend().runInternalQuery(VdcQueryType.GetWatchdog,
new IdQueryParameters(templateId));
+ runInternalQuery(VdcQueryType.GetWatchdog, new
IdQueryParameters(templateId));
List<VmWatchdog> watchdogs = query.getReturnValue();
if (watchdogs.isEmpty()) {
if (getParameters().getWatchdog() != null) {
@@ -243,7 +243,7 @@
// do not update if this flag is not set
if (getParameters().isUpdateRngDevice()) {
VdcQueryReturnValue query =
- getBackend().runInternalQuery(VdcQueryType.GetRngDevice,
new IdQueryParameters(templateId));
+ runInternalQuery(VdcQueryType.GetRngDevice, new
IdQueryParameters(templateId));
List<VmRngDevice> rngDevs = query.getReturnValue();
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
index 91b8965..eac3b97 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java
@@ -163,7 +163,7 @@
// check that nic have no vlans
if (vmNetworkNonVlan(logicalNetwork)) {
- VdcQueryReturnValue ret = Backend.getInstance().runInternalQuery(
+ VdcQueryReturnValue ret = runInternalQuery(
VdcQueryType.GetAllChildVlanInterfaces,
new InterfaceAndIdQueryParameters(params.getVdsId(), params
.getInterface()));
--
To view, visit http://gerrit.ovirt.org/28936
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I756c5b67a376ca73c95f3fcb83bfe7a19125b200
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
