Frank Kobzik has uploaded a new change for review.
Change subject: core: graphics types in VM
......................................................................
core: graphics types in VM
Change-Id: I72d154db9f49603dec0ade40894a45911535341c
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRunningOnOrMigratingToVdsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
5 files changed, 34 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/25410/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java
index 9b4069f..859a9ed 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmByVmIdQuery.java
@@ -25,5 +25,6 @@
VmHandler.updateVmGuestAgentVersion(vm);
VmHandler.updateNetworkInterfacesFromDb(vm);
VmHandler.updateVmInitFromDB(vm.getStaticData(), true);
+ VmHandler.updateGraphicsTypeFromDb(vm);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRunningOnOrMigratingToVdsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRunningOnOrMigratingToVdsQuery.java
index 2abb825..fc3af1e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRunningOnOrMigratingToVdsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmsRunningOnOrMigratingToVdsQuery.java
@@ -1,5 +1,7 @@
package org.ovirt.engine.core.bll;
+import java.util.List;
+import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.queries.IdQueryParameters;
public class GetVmsRunningOnOrMigratingToVdsQuery<P extends IdQueryParameters>
extends QueriesCommandBase<P> {
@@ -9,8 +11,12 @@
@Override
protected void executeQueryCommand() {
- getQueryReturnValue().setReturnValue(
-
getDbFacade().getVmDao().getAllRunningOnOrMigratingToVds(getParameters().getId()));
+ List<VM> allRunningOnOrMigratingToVds =
getDbFacade().getVmDao().getAllRunningOnOrMigratingToVds(getParameters().getId());
+ for (VM vm : allRunningOnOrMigratingToVds) {
+ VmHandler.updateGraphicsTypeFromDb(vm);
+ }
+
+ getQueryReturnValue().setReturnValue(allRunningOnOrMigratingToVds);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
index 37e2046..ad49155 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
@@ -26,6 +26,7 @@
import org.ovirt.engine.core.common.businessentities.EditableField;
import org.ovirt.engine.core.common.businessentities.EditableOnVm;
import org.ovirt.engine.core.common.businessentities.EditableOnVmStatusField;
+import org.ovirt.engine.core.common.businessentities.GraphicsType;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
import org.ovirt.engine.core.common.businessentities.UsbPolicy;
@@ -264,6 +265,15 @@
updateDisksForVm(vm, imageList);
}
+ public static void updateGraphicsTypeFromDb(VM vm) {
+ List<VmDevice> graphicsDevs =
DbFacade.getInstance().getVmDeviceDao().getVmDeviceByVmIdAndType(vm.getId(),
VmDeviceGeneralType.GRAPHICS);
+
+ vm.getGraphicsTypes().clear();
+ for (VmDevice dev : graphicsDevs) {
+
vm.getGraphicsTypes().add(GraphicsType.fromVmDeviceType(VmDeviceType.getByName(dev.getDevice())));
+ }
+ }
+
public static void updateDisksForVm(VM vm, Collection<? extends Disk>
disks) {
for (Disk disk : disks) {
if (disk.isAllowSnapshot() && !disk.isDiskSnapshot()) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 9242d97..ef98ff5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.validation.Valid;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -464,6 +465,8 @@
this.vmDynamic.setVmHost(vmHost);
} else if (!StringHelper.isNullOrEmpty(vmDomain) &&
!vmHost.endsWith(vmDomain)) {
this.vmDynamic.setVmHost(vmHost + "." + vmDomain);
+ } else {
+ this.vmDynamic.setVmHost("");
}
}
@@ -562,6 +565,10 @@
this.vmDynamic.setMigratingToVds(value);
}
+ public Set<GraphicsType> getGraphicsTypes() {
+ return this.vmDynamic.getGraphicsTypes();
+ }
+
public String getAppList() {
return this.vmDynamic.getAppList();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
index 4f10cfa..31288d6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
import
org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityGuidComparator;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.compat.Guid;
@@ -67,6 +69,7 @@
@UnchangeableByVdsm
private String cpuName;
private String currentCd;
+ private Set<GraphicsType> graphicsTypes;
public static final String APPLICATIONS_LIST_FIELD_NAME = "appList";
public static final String STATUS_FIELD_NAME = "status";
@@ -233,6 +236,11 @@
kvmEnable = true;
session = SessionState.Unknown;
bootSequence = BootSequence.C;
+ graphicsTypes = new HashSet<GraphicsType>();
+ }
+
+ public Set<GraphicsType> getGraphicsTypes() {
+ return graphicsTypes;
}
public String getAppList() {
--
To view, visit http://gerrit.ovirt.org/25410
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72d154db9f49603dec0ade40894a45911535341c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
