Change in ovirt-engine[master]: engine:Change DisplayType semantics

ahadas at redhat.com ahadas at redhat.com
Thu Dec 18 11:57:53 UTC 2014


Arik Hadas has submitted this change and it was merged.

Change subject: engine:Change DisplayType semantics
......................................................................


engine:Change DisplayType semantics

This patch changes meaning of DisplayType. Now this enum determines type
of VM's video device, while graphics type is determined by GraphicsType
(or GraphicsInfo).

The patch also generalizes Run Once handling (instead of useVnc flag in params,
graphics types of graphics cards are listed in RunVmOnceParams).

The REST API part of this patch contains only changes needed for tests to pass.
The actual REST API code was too big and is contained in the follow up patch.

The patch also adds a method to Management Base Commands to derive graphics
that a machine/template will have after adding (the value is not trivial to
find out - by default VM inherits graphics from template/source VM if it's not
customized in parameters). This method is needed for follow up patches:
 - in os info follow up this is needed for validating whether the resulting
   graphics is compliant to os info data,
 - in REST API follow up this method is needed for autoselecting Display Type
   of a VM (user can set Graphics Type via REST API and the Display Type is
   derived according to os info data).

Change-Id: I0907c9086f49f909250d9956356a0251954f1427
Bug-Url: https://bugzilla.redhat.com/1033547
Signed-off-by: Frantisek Kobzik <fkobzik at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.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/VmHandler.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.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/validator/RunVmValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmOnceParams.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RunVmParams.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DisplayType.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/OsRepositoryImplTest.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java
25 files changed, 230 insertions(+), 98 deletions(-)

Approvals:
  Frank Kobzik: Verified
  Arik Hadas: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/30837
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0907c9086f49f909250d9956356a0251954f1427
Gerrit-PatchSet: 51
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Frank Kobzik <fkobzik at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server



More information about the Engine-commits mailing list