December 2012 - Engine-commits - oVirt List Archives

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

Change in ovirt-engine[master]: core: ImportVm test cleanup: Don't mock DAOs
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 cleanup: Don't mock DAOs ...................................................................... core: ImportVm test cleanup: Don't mock DAOs Cleaned up the TestHelperImprotVmCommand to stop mocking DAOs and instead override methods that represent a higher business logic, in order to make the test more readable and understandable. In order to achieve this refactoring, a few blocks of ImportVmCommand.canDoAction() were extracted to methods, which could be overridden. Note that this is an interim patch, performed in order to make the real goal, removing TestHelperImportVmCommand altogether. Change-Id: I19d711cd8df8c0f8eccfe6b7838c16605829b2f6 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/TestHelperImportVmCommand.java 2 files changed, 83 insertions(+), 136 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified -- To view, visit http://gerrit.ovirt.org/9626 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I19d711cd8df8c0f8eccfe6b7838c16605829b2f6 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: Ravi Nori <rnori(a)redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.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: GetAllFromExportDomainQueryParameters.getAll
by amureini＠redhat.com 18 Dec '12

18 Dec '12

Allon Mureinik has submitted this change and it was merged. Change subject: core: GetAllFromExportDomainQueryParameters.getAll ...................................................................... core: GetAllFromExportDomainQueryParameters.getAll Removed the GetAll parameter from the GetAllFromExportDomainQueryParameters class. This parameter was ALWAYS set to true, with no way for the user to set it to false. Thus, the parameter itself is useless (it's effectively hardcoded to true), and all the code that handles GetAll=false is dead code that cannot be reached. This patch removes this useless code, as it obviously has no use in the system. A neat side-effect of removing this code is saving a couple of VmDao.getAll() and VmTemplateDao.getAll() database calls. Change-Id: I3cb36d7a5b1a9e309a7553fc2ef696b1cc1cae5a Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.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/RemoveVmFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetTemplatesFromExportDomainQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetVmsFromExportDomainQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllFromExportDomainQueryParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.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/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java 17 files changed, 22 insertions(+), 70 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3cb36d7a5b1a9e309a7553fc2ef696b1cc1cae5a 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: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com> Gerrit-Reviewer: Ori Liel <oliel(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 cleanup: canDoActionXXX conventions
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: canDoActionXXX conventions ...................................................................... core: ImportVm cleanup: canDoActionXXX conventions Fixed naming conventions in the canDoActionXXX methods to adhere to Java conventions. Change-Id: I88f41893fd50d5420b567d9af98ac85e5c808b96 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9624 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88f41893fd50d5420b567d9af98ac85e5c808b96 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: 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 cleanup: canDoAction
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: canDoAction ...................................................................... core: ImportVm cleanup: canDoAction A slight cleanup to canDoAction so it uses the early return pattern, which is (a bit) more readable. Change-Id: Icbc4f72d5ce9df230b3d1480a055c603f470770e Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9623 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbc4f72d5ce9df230b3d1480a055c603f470770e 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: Arik Hadas <ahadas(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