January 2015 - Engine-commits - oVirt List Archives

Change in ovirt-engine[ovirt-engine-3.5]: core: Add migration options to OVF
by tnisan＠redhat.com 11 Jan '15

11 Jan '15

Tal Nisan has submitted this change and it was merged. Change subject: core: Add migration options to OVF ...................................................................... core: Add migration options to OVF Most migration options were not saved in OVF, this caused a problem when changing those options while VM was running (due to the "next run" snapshot OVF). - Added support for the options: MIGRATION_SUPPORT, DEDICATED_VM_FOR_VDS and USE_HOST_CPU in the OVF reader\writer. - Added verification for the DEDICATED_VM_FOR_VDS option - makes sure host exists in the current cluster. Added in: import vm, import template, snapshot manager. Change-Id: I5f0025e5ac59dac0a1569729c2fef8186e0885db Bug-Url: https://bugzilla.redhat.com/1124449 Signed-off-by: Eldan Shachar <eshachar(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/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/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/snapshots/SnapshotsManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQueryTest.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/businessentities/VmStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.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/OvfVmReader.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 M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 20 files changed, 112 insertions(+), 48 deletions(-) Approvals: Eldan Shachar: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/36757 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f0025e5ac59dac0a1569729c2fef8186e0885db Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Eldan Shachar <eshachar(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Eldan Shachar <eshachar(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(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-dwh[master]: packaging: bin: Use engine's java-home for classpath
by sradco＠redhat.com 11 Jan '15

11 Jan '15

Shirly Radco has submitted this change and it was merged. Change subject: packaging: bin: Use engine's java-home for classpath ...................................................................... packaging: bin: Use engine's java-home for classpath Change-Id: I2e9fabfc09629a6f188526e836badc5508752156 Signed-off-by: Yedidyah Bar David <didi(a)redhat.com> --- M packaging/bin/dwh-classpath.sh 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, but someone else must approve Shirly Radco: Looks good to me, approved Yedidyah Bar David: Verified -- To view, visit http://gerrit.ovirt.org/36669 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e9fabfc09629a6f188526e836badc5508752156 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: Lev Veyde <lveyde(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Shirly Radco <sradco(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core: adjusts default_display_type and video card for blank ...
by ahadas＠redhat.com 11 Jan '15

11 Jan '15

Arik Hadas has submitted this change and it was merged. Change subject: core: adjusts default_display_type and video card for blank template ...................................................................... core: adjusts default_display_type and video card for blank template This patch sets default_display_type of vm/template so that it corresponds to video device of this vm/template. This change is needed since DisplayType enum (and its semantics) was changed. It also changes the video device of blank template. Previously the blank template had 'cirrus' video device, but it had default_display_type set to 1 (which was 'qxl' display type). This patch changes this inconsistence and sets both values (default_display_type and vm_device type) to values corresponding to qxl. Change-Id: I63b268619065fef638349d95bef22bc0ce34c9b8 Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> --- A packaging/dbscripts/upgrade/03_06_0720_adjust_default_display_type.sql A packaging/dbscripts/upgrade/03_06_0730_adjust_blank_template_video_card.sql 2 files changed, 17 insertions(+), 0 deletions(-) Approvals: Frank Kobzik: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/36609 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63b268619065fef638349d95bef22bc0ce34c9b8 Gerrit-PatchSet: 5 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: engine: Fix clone and clone from snapshot functionality
by ahadas＠redhat.com 11 Jan '15

11 Jan '15

Arik Hadas has submitted this change and it was merged. Change subject: engine: Fix clone and clone from snapshot functionality ...................................................................... engine: Fix clone and clone from snapshot functionality Clone from snapshot: - graphics setting logic was missing in VmSnapshotListModel Clone: - missing overriding of graphics devices on vm clone caused the possibility of inheriting graphics device from vm template. Fixed by overriding graphics devices in CloneVmCommand. Change-Id: I6dd6a3be2ee78cb1a4a940518bb2b7c467f6b856 Bug-Url: https://bugzilla.redhat.com/1179140 Signed-off-by: Frantisek Kobzik <fkobzik(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java 2 files changed, 33 insertions(+), 0 deletions(-) Approvals: Tomas Jelinek: Looks good to me, but someone else must approve Frank Kobzik: Verified Arik Hadas: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/36633 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dd6a3be2ee78cb1a4a940518bb2b7c467f6b856 Gerrit-PatchSet: 4 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]: engine: (Cleanup) Remove unused graphics attributes
by ahadas＠redhat.com 11 Jan '15

11 Jan '15

Arik Hadas has submitted this change and it was merged. Change subject: engine: (Cleanup) Remove unused graphics attributes ...................................................................... engine: (Cleanup) Remove unused graphics attributes Removes these attributes (and their persistence) - VmDynamic.display, - VmDynamic.displaySecurePort, - VmDynamic.displayIp, - VmDynamic.displayType as they are replaced with GraphicsInfo. Moreover the patch adds graphics info to one row in fixtures (previously forgotten). todo - remove atts from vm static too (represented by vm devices) Change-Id: Id4fbd37b2b41b7288f78b60f27427c7b666d83d4 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/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 M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendedVmDynamic.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/VmTestPairs.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java M packaging/dbscripts/create_views.sql A packaging/dbscripts/upgrade/03_06_0710_remove_deprecated_display_columns.sql M packaging/dbscripts/vms_sp.sql 11 files changed, 23 insertions(+), 202 deletions(-) Approvals: Arik Hadas: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31200 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4fbd37b2b41b7288f78b60f27427c7b666d83d4 Gerrit-PatchSet: 68 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: Simplify ImagesHandlerTest assertions
by amureini＠redhat.com 10 Jan '15

10 Jan '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Simplify ImagesHandlerTest assertions ...................................................................... core: Simplify ImagesHandlerTest assertions Simplified ImagesHandlerTest's assertion to use JUnit's best practices. Change-Id: I4e731278049b91586a6876372f0c44122b7e3c5a Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/36755 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e731278049b91586a6876372f0c44122b7e3c5a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(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: Diamond generics for ImagesHandlerTest
by amureini＠redhat.com 10 Jan '15

10 Jan '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Diamond generics for ImagesHandlerTest ...................................................................... core: Diamond generics for ImagesHandlerTest Use diamond generics (<>) to remove code bloating in ImagesHandlerTest. Change-Id: Ibd89213c6471f42576d45c9c652b8b59c5967945 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/36754 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd89213c6471f42576d45c9c652b8b59c5967945 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(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

1 0

Change in ovirt-engine[master]: core: sorted getJsonDiskDescription()
by amureini＠redhat.com 10 Jan '15

10 Jan '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: sorted getJsonDiskDescription() ...................................................................... core: sorted getJsonDiskDescription() ImagesHandler.getJsonDiskDescription() used a HashMap to serialize a Disk's Alias and Description. Since the order of iteration of a HashMap cannot be trusted, it made the method's behavior unpredictable in different environments, specifically breaking the unit tests on the default JDK8 supplied with Fedora 21. This patch replaces the internal implementation from using a HashMap to use a TreeMap, ensuring the keys are iterated by order, and thus producing a reliable output: {"DiskAlias":"some_alias","DiskDescription":"some_description}. The unit tests have been fixed accordingly, making them agnostic to JDK upgrades. Change-Id: Ic8496858a2cb5715ab9f84b8ae77f62b3e6097d4 Bug-Url: https://bugzilla.redhat.com/1180522 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/36753 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8496858a2cb5715ab9f84b8ae77f62b3e6097d4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(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: ImagesHandler: Remove class qualifiers
by amureini＠redhat.com 10 Jan '15

10 Jan '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImagesHandler: Remove class qualifiers ...................................................................... core: ImagesHandler: Remove class qualifiers Removed redundant "ImagesHandler." qualifiers from calls to static methods in order to reduce code bloating and increase readability. Change-Id: Icfd78f564f04598b3aa55e77b806494fe3b2dced Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/36752 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfd78f564f04598b3aa55e77b806494fe3b2dced Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(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: FB ImagesHandlerTest.getJsonDiskDescription
by amureini＠redhat.com 10 Jan '15

10 Jan '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: FB ImagesHandlerTest.getJsonDiskDescription ...................................................................... core: FB ImagesHandlerTest.getJsonDiskDescription Remove useless initialization of the local variable jsonDescription to null, as it's overridden on the very next line. Change-Id: Iffac7367c23284527c9eaaf26511aaae627c7c4e Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImagesHandlerTest.java 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/36756 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffac7367c23284527c9eaaf26511aaae627c7c4e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(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