- Engine-commits - oVirt List Archives

Change in ovirt-reports[master]: reports: Added CCP VM Inventory BR44 (#883137)
by ydary＠redhat.com 18 Dec '12

18 Dec '12

Yaniv Dary has submitted this change and it was merged. Change subject: reports: Added CCP VM Inventory BR44 (#883137) ...................................................................... reports: Added CCP VM Inventory BR44 (#883137) This report displays a list of virtual machines by OS of the selected data center and cluster and their respected uptime and existence time. This is required for billing cloud providers. Change-Id: I6fbdba60270472bdfd94094de270132fae52dd7d Signed-off-by: Yaniv Dary <ydary(a)redhat.com> --- M reports/repository_files/resources/Reports/Inventory/.folder.xml A reports/repository_files/resources/Reports/Inventory/ccp_vm_inventory_br44.xml A reports/repository_files/resources/Reports/Inventory/ccp_vm_inventory_br44_files/ccp_vm_inventory_br44_jrxml.data A reports/repository_files/resources/Reports/Inventory/ccp_vm_inventory_br44_files/full details.jrxml.data M reports/repository_files/resources/reports_resources/localization/ovirt_reports_bundle_en_US.properties.data 5 files changed, 934 insertions(+), 0 deletions(-) Approvals: Yaniv Dary: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10199 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fbdba60270472bdfd94094de270132fae52dd7d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com> Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>

1 0

Change in ovirt-engine[master]: engine: Fixing a possible bug at SPM election
by mkublin＠redhat.com 18 Dec '12

18 Dec '12

Michael Kublin has submitted this change and it was merged. Change subject: engine: Fixing a possible bug at SPM election ...................................................................... engine: Fixing a possible bug at SPM election The mCurrentVdsId should be set to null after GetPrioritizedVdsInPool(), because it used there Change-Id: I44dfbb3a59c22e1b4ce39c996e159e1fd5047475 Signed-off-by: Michael Kublin <mkublin(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9309 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44dfbb3a59c22e1b4ce39c996e159e1fd5047475 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ValidationResult private default constructor
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ValidationResult private default constructor ...................................................................... core: ValidationResult private default constructor ValidationResult's default constructor should be private (according to its javadoc), and valid results should be referenced via the constant ValidationResult.VALID. Most occurrences in the code adhere to this rule, except for a single occurrence in AddDiskToVmCommandTest. This patch returns the default constructor to its intended private state and fixes the faulty usage in AddDiskToVmCommandTest. Change-Id: I7afa82aa1ec489b52da78b97b91c2a48eefb8b5f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ValidationResult.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddDiskToVmCommandTest.java 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10142 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7afa82aa1ec489b52da78b97b91c2a48eefb8b5f Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImportVm: disk alias with copyCollapse=false
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm: disk alias with copyCollapse=false ...................................................................... core: ImportVm: disk alias with copyCollapse=false Added disk aliases in ImportVmCommand when copyCollapse=false. This patch contains the following: 1. The bug fix. 2. A test for the bug. 3. Some minor refactoring to extract blocks of ImportVmCommand DAO handling to methods, so they can be mocked out for the test mentioned in (2). Change-Id: I4f03699ece4d20f2d20beb791c3cb1518e39c4d1 Bug-Url: https://bugzilla.redhat.com/872506 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java 2 files changed, 69 insertions(+), 22 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/9631 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f03699ece4d20f2d20beb791c3cb1518e39c4d1 Gerrit-PatchSet: 19 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImportVm: Add test for addImagesAndSnapshots
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm: Add test for addImagesAndSnapshots ...................................................................... core: ImportVm: Add test for addImagesAndSnapshots Added a test for the addImagesAndSnapshots() method, when the copyCollapse parameter is set to true. Change-Id: I5c9725422fd525bc4c4812313e74baee87b709ea Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java 2 files changed, 46 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/9630 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c9725422fd525bc4c4812313e74baee87b709ea Gerrit-PatchSet: 17 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImportVm: fix disk alias generation
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm: fix disk alias generation ...................................................................... core: ImportVm: fix disk alias generation When ImportVmCommand auto generates the disks' aliases, it assigns them all the same alias, vmName_DiskN, where N is the number of disks attached to the imported VM. This patch fixes these aliases, and gives each disk a different alias, starting with VmName_Disk1 up to VmName_DiskN. Change-Id: Ibdd6525529d3d5e0c8ee2c86b418562929118207 Bug-Url: https://bugzilla.redhat.com/882616 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/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 2 files changed, 15 insertions(+), 7 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9629 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdd6525529d3d5e0c8ee2c86b418562929118207 Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImagesHandler: error instead of errorFormat
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImagesHandler: error instead of errorFormat ...................................................................... core: ImagesHandler: error instead of errorFormat Use log.error(String) instead of log.errorFormat(String) where possible. Change-Id: I26f5b3c4fe9d77009f14fcc54b3205de4d556a7d 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, 1 insertion(+), 1 deletion(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9797 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26f5b3c4fe9d77009f14fcc54b3205de4d556a7d Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImagesHandler.setDiskAlias early return
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImagesHandler.setDiskAlias early return ...................................................................... core: ImagesHandler.setDiskAlias early return Used the early return pattern in ImagesHandler.setDiskAlias to make it more readable and maintainable. Change-Id: I69cb7b17e97c86f14eaf64f751183bb5d1b0812a 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, 10 insertions(+), 10 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9658 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69cb7b17e97c86f14eaf64f751183bb5d1b0812a Gerrit-PatchSet: 14 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImportVm test: activate insufficientDiskSpace
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm test: activate insufficientDiskSpace ...................................................................... core: ImportVm test: activate insufficientDiskSpace Reactivated the insufficientDiskSpace() test (i.e., removed the @Ignore annotation). In order to make this test work again, disks were added to the mocked VM object, and some additional validations (e.g., image existence) were mocked away. Change-Id: I6745d17255e5a692d6b3b8f545e4807f25823628 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java 2 files changed, 35 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9628 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6745d17255e5a692d6b3b8f545e4807f25823628 Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: ImportVm cleanup: Remove TestHelperImportVm
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportVm cleanup: Remove TestHelperImportVm ...................................................................... core: ImportVm cleanup: Remove TestHelperImportVm Removed the TestHelperImportVmCommand and replaced it with easier to read/user inline spying of the actual ImportVmCommand object. Change-Id: Ie7b54ff40c65dfe20a1dd0d239dcb04882fecde7 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVmCommandTest.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/TestHelperImportVmCommand.java 2 files changed, 27 insertions(+), 72 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9627 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7b54ff40c65dfe20a1dd0d239dcb04882fecde7 Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0