- Engine-commits - oVirt List Archives

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

Change in ovirt-engine[master]: core: ImportVm cleanup: CDA_afterCloneVm signature
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: CDA_afterCloneVm signature ...................................................................... core: ImportVm cleanup: CDA_afterCloneVm signature Stop passing canDoActionMessages to canDoAction_afterCloneVm, as it is available as a data member, and does not contribute anything as a parameter. Change-Id: I83c7a8cde592cd8f69943b90d1ed17e3797e856b 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, 3 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10007 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83c7a8cde592cd8f69943b90d1ed17e3797e856b Gerrit-PatchSet: 7 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 cleanup: canDoAction_afterCloneVm
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_afterCloneVm ...................................................................... core: ImportVm cleanup: canDoAction_afterCloneVm A slight cleanup to canDoAction_afterCloneVm so it uses the early return pattern, which is (a bit) more readable. Change-Id: I5c1eba4ca3e39b4b3ed2142e9e0a964bda7e6a5c 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, 52 insertions(+), 59 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9622 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c1eba4ca3e39b4b3ed2142e9e0a964bda7e6a5c 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: CDA_beforeCloneVm sig.
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: CDA_beforeCloneVm sig. ...................................................................... core: ImportVm cleanup: CDA_beforeCloneVm sig. Stop passing canDoAction to canDoAction_beforeCloneVm, as it is available as a data member, and does not contribute anything as a parameter. Change-Id: I31ff56cd187510ed48c3be66a82b09337e2588bf 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, 3 insertions(+), 2 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10006 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31ff56cd187510ed48c3be66a82b09337e2588bf Gerrit-PatchSet: 7 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 cleanup: canDoAction_beforeCloneVM
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_beforeCloneVM ...................................................................... core: ImportVm cleanup: canDoAction_beforeCloneVM A slight cleanup to canDoAction_beforeCloneVM so it uses the early return pattern, which is (a bit) more readable. Change-Id: Ifc6c0916948a1951ff30a4ca25aa113923e0643d 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, 83 insertions(+), 90 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9621 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc6c0916948a1951ff30a4ca25aa113923e0643d 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]: webadmin: Provide entity specific properties to UI plugins
by oourfali＠redhat.com 18 Dec '12

18 Dec '12

Oved Ourfali has submitted this change and it was merged. Change subject: webadmin: Provide entity specific properties to UI plugins ...................................................................... webadmin: Provide entity specific properties to UI plugins Before this patch, UI plugins would receive following base entity object representation (same for all entity types): { 'entityId': '[BusinessEntityGuidAsString]' } After this patch, UI plugins will receive the same as above ('entityId' renamed to 'id'), plus some additional entity specific properties: 'name' for Cluster, DataCenter, Host, Storage, Template, VirtualMachine More properties can be added later on, as necessary. Note that this is just a temporary solution, as we plan to use generated Engine REST API types on the frontend side. Change-Id: I937640bdddc8b888f517323d0be6b18796e81a05 Signed-off-by: Vojtech Szocs <vszocs(a)redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginEventHandler.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/api/PluginUiFunctions.java D frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/BaseEntity.java A frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java 4 files changed, 104 insertions(+), 54 deletions(-) Approvals: Oved Ourfali: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I937640bdddc8b888f517323d0be6b18796e81a05 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: removed unused methods
by lhornyak＠redhat.com 18 Dec '12

18 Dec '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: removed unused methods ...................................................................... core: removed unused methods Utility methods isVdsExist and isVdsExistForPendingOvirt are no longer used, they are deleted. Change-Id: Ibcbbb708f36312db05169f09e514decc076d6265 Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsHandler.java 1 file changed, 0 insertions(+), 54 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/9707 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcbbb708f36312db05169f09e514decc076d6265 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com>

1 0