December 2015 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: engine: Use injection
by masayag＠redhat.com 31 Dec '15

31 Dec '15

Moti Asayag has submitted this change and it was merged. Change subject: engine: Use injection ...................................................................... engine: Use injection Change-Id: Ief1a2acba97ec0b253e56c9f6ce6138de36a1de6 Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForHostQuery.java 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Moti Asayag: Verified; Passed CI tests Oved Ourfali: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/51197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief1a2acba97ec0b253e56c9f6ce6138de36a1de6 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: Use java8 syntax
by masayag＠redhat.com 31 Dec '15

31 Dec '15

Moti Asayag has submitted this change and it was merged. Change subject: engine: Use java8 syntax ...................................................................... engine: Use java8 syntax Change-Id: I2d25ce8cc9163eb72f6bbb5c5548227a0fbd0f8b Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataCountsForHostQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataCountsForVmQuery.java 2 files changed, 2 insertions(+), 6 deletions(-) Approvals: Moti Asayag: Verified; Passed CI tests Oved Ourfali: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/51196 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d25ce8cc9163eb72f6bbb5c5548227a0fbd0f8b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: Use injection instead of static access
by masayag＠redhat.com 31 Dec '15

31 Dec '15

Moti Asayag has submitted this change and it was merged. Change subject: engine: Use injection instead of static access ...................................................................... engine: Use injection instead of static access Change-Id: I952ff108e4fc8cdcbd9050206e045e22e1f2684d Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErratumByIdForHostQuery.java 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Moti Asayag: Verified; Passed CI tests Oved Ourfali: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/51195 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I952ff108e4fc8cdcbd9050206e045e22e1f2684d Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: engine: Cleanup HostProviderProxy
by masayag＠redhat.com 31 Dec '15

31 Dec '15

Moti Asayag has submitted this change and it was merged. Change subject: engine: Cleanup HostProviderProxy ...................................................................... engine: Cleanup HostProviderProxy Change-Id: Id177828926e7abc5cf92815fe5b2404dae30639a Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/HostProviderProxy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java 2 files changed, 22 insertions(+), 16 deletions(-) Approvals: Jenkins CI: Passed CI tests Moti Asayag: Verified Oved Ourfali: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/51194 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id177828926e7abc5cf92815fe5b2404dae30639a Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: fix import vm from vmware as clone
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: fix import vm from vmware as clone ...................................................................... core: fix import vm from vmware as clone This patch fixes the functionality of import-as-clone from VMware. The problem was that on import-as-clone we generate new ID, but in the ImportFromExternalProviderCommand we never used the generated ID. The solution is composed of 2 parts: 1. To move the getters for VM-ID that reside in ImportVmCommand and knows to return the right ID, also for the import-as-clone case, to ImportVmCommandBase so they will be shared with the command ImportFromExternalProviderCommand as well. 2. We need the parameters to store the ID of the VM in two fields: getVm().getId() and getVmId(). Instead of setting it manually, we now call the constructor of ImportVmParameters that does the trick. Change-Id: I32dfe891c6168d3c1d522e2588ae9e02d82b9de3 Bug-Url: https://bugzilla.redhat.com/1294501 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- 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/ImportVmCommandBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromExternalProviderParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromOvaParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromOvaModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromVmwareModel.java 7 files changed, 47 insertions(+), 27 deletions(-) Approvals: Tal Nisan: Passed CI tests Shahar Havivi: Looks good to me, approved Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51176 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32dfe891c6168d3c1d522e2588ae9e02d82b9de3 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6.2]: backend: fix audit log messages shown on disk copy
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: backend: fix audit log messages shown on disk copy ...................................................................... backend: fix audit log messages shown on disk copy When copying a floating/template/VM disk, the audit log messages described a copy operation of a template disk. This patch fixes those messages to be about a general disk, and not about a template disk. Change-Id: Icfbcb3fc6768ac4e369ff320cf71568fa934b8df Bug-Url: https://bugzilla.redhat.com/1289492 Signed-off-by: Idan Shaby <ishaby(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Idan Shaby: Verified -- To view, visit https://gerrit.ovirt.org/51207 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfbcb3fc6768ac4e369ff320cf71568fa934b8df Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6.2 Gerrit-Owner: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: backend: fix audit log messages shown on disk copy
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: backend: fix audit log messages shown on disk copy ...................................................................... backend: fix audit log messages shown on disk copy When copying a floating/template/VM disk, the audit log messages described a copy operation of a template disk. This patch fixes those messages to be about a general disk, and not about a template disk. Change-Id: Icfbcb3fc6768ac4e369ff320cf71568fa934b8df Bug-Url: https://bugzilla.redhat.com/1289492 Signed-off-by: Idan Shaby <ishaby(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Idan Shaby: Verified -- To view, visit https://gerrit.ovirt.org/51206 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfbcb3fc6768ac4e369ff320cf71568fa934b8df Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: change vm name on import from vmware
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: change vm name on import from vmware ...................................................................... core: change vm name on import from vmware The import dialog allows the user to specify a new name for a VM that is imported from VMware. However, it would never work since we send this name to v2v as the identifier of the VM to import - so most probably it won't work since there will be no VM in VMware with that name. In the worse case, we might import the wrong VM.. Change-Id: Iea7f45a5d016352e44807dc85042eb717a170309 Bug-Url: https://bugzilla.redhat.com/1294651 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromExternalProviderCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromExternalProviderParameters.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromOvaModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromVmwareModel.java 4 files changed, 18 insertions(+), 5 deletions(-) Approvals: Tal Nisan: Passed CI tests Shahar Havivi: Looks good to me, approved Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51175 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea7f45a5d016352e44807dc85042eb717a170309 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: compare custom properties against template on add vm
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: compare custom properties against template on add vm ...................................................................... core: compare custom properties against template on add vm We should require permission for action-group of type ActionGroup.CHANGE_VM_CUSTOM_PROPERTIES on add-VM only if the custom properties of the VM to add are different than the ones defined in the template it is based on. Currently, since we only check whether the VM is defined with custom properties or not and by default the VM gets the custom properties of its template, users cannot create a VM that is based on template which is defined with custom properties without having these extra permissions. Change-Id: I1c3bb293085cc26ad93f470c4d7e151cc2af08f0 Bug-Url: https://bugzilla.redhat.com/1284472 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Tal Nisan: Passed CI tests Shahar Havivi: Looks good to me, approved Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51137 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c3bb293085cc26ad93f470c4d7e151cc2af08f0 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: core: compare dedicated hosts against template on add vm
by tnisan＠redhat.com 31 Dec '15

31 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: compare dedicated hosts against template on add vm ...................................................................... core: compare dedicated hosts against template on add vm On add-VM we used to require permission on action-group ActionGroup.EDIT_ADMIN_VM_PROPERTIES if the VM we get in the parameters contains non-empty list of dedicated-hosts. By default, this list contains the dedicated hosts that are set in the template. So as a result we required users to have that permission in order to create a VM from any temaplte that is set with dedicated hosts, even when they did not change the template's setting. This patch fixes it by changeing the check in add-VM so it will compare the list in the given VM with the list that is set in the template so ActionGroup.EDIT_ADMIN_VM_PROPERTIES will be required only if the list of the dedicated hosts was changed by the user. Change-Id: Iab1a8536e1da5c529d735542d21b004a15c5fbf4 Bug-Url: https://bugzilla.redhat.com/1284472 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51136 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab1a8536e1da5c529d735542d21b004a15c5fbf4 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0