December 2014 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: frontend: UI widgets for GraphicsType setting
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

Arik Hadas has submitted this change and it was merged. Change subject: frontend: UI widgets for GraphicsType setting ...................................................................... frontend: UI widgets for GraphicsType setting This patch adds graphics device to frontend models. Previously user could only set DisplayType in vm popup. This patch adds new listbox for setting GraphicsType too. Change-Id: I4ec3e13b463e05190d05ac342e9edaf6078626cf Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1033547 --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/PoolGeneralModelForm.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/HwOnlyCoreUnitToVmBaseBuilder.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.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/TemplateVmModelBehavior.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/VmGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeModelBehaviorBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NewInstanceTypeModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseVmListModelTest.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVirtualMachineView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolGeneralView.java 32 files changed, 591 insertions(+), 192 deletions(-) Approvals: Arik Hadas: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/28568 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ec3e13b463e05190d05ac342e9edaf6078626cf Gerrit-PatchSet: 62 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: webadmin: Expected data type fixed in AsyncDataProvider
by tjelinek＠redhat.com 18 Dec '14

18 Dec '14

Tomas Jelinek has submitted this change and it was merged. Change subject: webadmin: Expected data type fixed in AsyncDataProvider ...................................................................... webadmin: Expected data type fixed in AsyncDataProvider Due to change in in backend, LinkedList is returned instead of expected ArrayList that leads to ClassCactException. Fix: General interface List is now expected. Change-Id: I42199b7ac32f68c7db0d74fa48774d065806b37b Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Jakub Niedermertl: Verified -- To view, visit http://gerrit.ovirt.org/36274 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42199b7ac32f68c7db0d74fa48774d065806b37b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-hosted-engine-ha[ovirt-hosted-engine-ha-1.2]: allow None as device uuid when creating new storage
by msivak＠redhat.com 18 Dec '14

18 Dec '14

Martin Sivák has submitted this change and it was merged. Change subject: allow None as device uuid when creating new storage ...................................................................... allow None as device uuid when creating new storage Change-Id: Id3e0d4653011b57259d1062052253de3de191fb0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1171452 Signed-off-by: Jiri Moskovcak <jmoskovc(a)redhat.com> --- M ovirt_hosted_engine_ha/agent/hosted_engine.py M ovirt_hosted_engine_ha/env/config.py M ovirt_hosted_engine_ha/lib/storage_backends.py 3 files changed, 15 insertions(+), 10 deletions(-) Approvals: Martin Sivák: Looks good to me, approved Jiří Moskovčák: Verified -- To view, visit http://gerrit.ovirt.org/36275 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3e0d4653011b57259d1062052253de3de191fb0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: ovirt-hosted-engine-ha-1.2 Gerrit-Owner: Jiří Moskovčák <jmoskovc(a)redhat.com> Gerrit-Reviewer: Jiří Moskovčák <jmoskovc(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-hosted-engine-ha[master]: allow None as device uuid when creating new storage
by msivak＠redhat.com 18 Dec '14

18 Dec '14

Martin Sivák has submitted this change and it was merged. Change subject: allow None as device uuid when creating new storage ...................................................................... allow None as device uuid when creating new storage Change-Id: Id3e0d4653011b57259d1062052253de3de191fb0 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1171452 Signed-off-by: Jiri Moskovcak <jmoskovc(a)redhat.com> --- M ovirt_hosted_engine_ha/agent/hosted_engine.py M ovirt_hosted_engine_ha/env/config.py M ovirt_hosted_engine_ha/lib/storage_backends.py 3 files changed, 15 insertions(+), 10 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, but someone else must approve Martin Sivák: Looks good to me, approved Jiří Moskovčák: Verified -- To view, visit http://gerrit.ovirt.org/36273 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3e0d4653011b57259d1062052253de3de191fb0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-ha Gerrit-Branch: master Gerrit-Owner: Jiří Moskovčák <jmoskovc(a)redhat.com> Gerrit-Reviewer: Jiří Moskovčák <jmoskovc(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: frontend: fix getHostListByDataCenter
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

Arik Hadas has submitted this change and it was merged. Change subject: frontend: fix getHostListByDataCenter ...................................................................... frontend: fix getHostListByDataCenter ClassCastException was thrown in AsyncDataProvider#getHostListByDataCenter claiming that LinkedList cannot be casted to ArrayList. We should not assume the returned List is ArrayList. This patch fix it. Change-Id: I14ac504114942785e512ab83e783f07ded69ca47 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/36265 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14ac504114942785e512ab83e783f07ded69ca47 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[ovirt-engine-3.5]: core: fix removal of attached disks to stateless vm
by tnisan＠redhat.com 18 Dec '14

18 Dec '14

Tal Nisan has submitted this change and it was merged. Change subject: core: fix removal of attached disks to stateless vm ...................................................................... core: fix removal of attached disks to stateless vm Change the way we handle disks when stateless VM goes down, to prevent situations where disks are being removed. This might happen when disk is attached to stateless VM while it was running (hot-plug) so no snapshot was taken for it as part of the stateless snapshot of the VM, and when restoring the stateless snapshot we'll remove it. The solution is to find disks which don't have volumes attached to the stateless snapshot and to detach them from the VM before restoring the stateless snapshot. Change-Id: I3a1d6eb8d2f4606622c7ed5c73370792406bb9b3 Bug-Url: https://bugzilla.redhat.com/1174812 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreStatelessVmCommand.java 2 files changed, 46 insertions(+), 12 deletions(-) Approvals: Maor Lipchuk: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/36249 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a1d6eb8d2f4606622c7ed5c73370792406bb9b3 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core:Import/Export VM/Template with graphics dev
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

Arik Hadas has submitted this change and it was merged. Change subject: core:Import/Export VM/Template with graphics dev ...................................................................... core:Import/Export VM/Template with graphics dev (backwards compatibility is preserved - when importing vm has no graphics device and some video device, compatible graphics device is added to a vm on import.) Change-Id: Id14f0265f9f24e09be68b500b69b3eb5ac838413 Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1033547 --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.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/OvfUpdateProcessHelper.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmTemplateCommandTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfHardware.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java 12 files changed, 231 insertions(+), 25 deletions(-) Approvals: Frank Kobzik: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/35856 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id14f0265f9f24e09be68b500b69b3eb5ac838413 Gerrit-PatchSet: 12 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core:OsInfo-related changes
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

Arik Hadas has submitted this change and it was merged. Change subject: core:OsInfo-related changes ...................................................................... core:OsInfo-related changes This patch addresses OsInfo parts of the code. With the split of DisplayType enum to DisplayType and GraphicsType, OsInfo code had to be changed to reflect this. OsInfo queries related to DisplayType (getDisplayTypes,..) were changed so that they now contain information about GraphicsTypes as well. small todo: - consider renaming OsInfo key display.protocol to something more sane. Change-Id: If0c7126308ab4e5e5418d804a8550a50e9994894 Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1033547 --- 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/AddVmFromTemplateCommand.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/ChangeVMClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVmClusterValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportRepoImageCopyTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OsRepositoryQuery.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/UpdateVmTemplateCommand.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/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidationUtils.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.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/osinfo/OsRepository.java M backend/manager/modules/utils/src/main/antlr4/org/ovirt/engine/core/utils/osinfo/Osinfo.g4 M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.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/utils/src/test/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoaderTest.java M backend/manager/modules/utils/src/test/resources/osinfo.conf.d/10-osinfo-test.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java M packaging/conf/osinfo-defaults.properties 29 files changed, 296 insertions(+), 194 deletions(-) Approvals: Frank Kobzik: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/30838 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0c7126308ab4e5e5418d804a8550a50e9994894 Gerrit-PatchSet: 56 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: restapi:adjust api to new graphics representation
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

Arik Hadas has submitted this change and it was merged. Change subject: restapi:adjust api to new graphics representation ...................................................................... restapi:adjust api to new graphics representation This patch changes REST API to internally use (new) graphics device representation. Backwards compatibility is preserved (the interface for clients is unchanged). Change-Id: Ibed6bbbce8a36dff82a0903c3478cfb656589fb4 Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1033547 --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HasGraphicsDevices.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmTemplateParametersBase.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/DisplayHelper.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateBasedResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.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 A backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DisplayMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/TemplateMapperTest.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java 24 files changed, 644 insertions(+), 273 deletions(-) Approvals: Frank Kobzik: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/35281 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibed6bbbce8a36dff82a0903c3478cfb656589fb4 Gerrit-PatchSet: 18 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: engine:Change DisplayType semantics
by ahadas＠redhat.com 18 Dec '14

18 Dec '14

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(a)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(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0