December 2015 - Engine-commits - oVirt List Archives

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

30 Dec '15

Arik Hadas 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 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: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51143 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32dfe891c6168d3c1d522e2588ae9e02d82b9de3 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master 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: gerrit-hooks <automation(a)ovirt.org>

1 0

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

30 Dec '15

Arik Hadas 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, 17 insertions(+), 4 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51142 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea7f45a5d016352e44807dc85042eb717a170309 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master 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: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-3.6]: engine: Mac address check should be done only when plugging
by tnisan＠redhat.com 29 Dec '15

29 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: engine: Mac address check should be done only when plugging ...................................................................... engine: Mac address check should be done only when plugging This condition was removed by mistake in patch- Ic7b32ad027016c0d95dd05ab0abbd176951c4be9 Bug-Url: https://bugzilla.redhat.com/1293863 Change-Id: I051567518fd0aa31f98647d0589832e6573fadf6 Signed-off-by: Alona Kaplan <alkaplan(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Alona Kaplan: Verified Jenkins CI: Passed CI tests Moti Asayag: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/51138 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I051567518fd0aa31f98647d0589832e6573fadf6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(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[master]: core: rm VmsMonitoring members
by tnisan＠redhat.com 29 Dec '15

29 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: rm VmsMonitoring members ...................................................................... core: rm VmsMonitoring members Removed unused methods and data members. Change-Id: I3fcc2d240e1c0ad405f55d2ff92e7f044ddf8462 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java 1 file changed, 0 insertions(+), 23 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/50619 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fcc2d240e1c0ad405f55d2ff92e7f044ddf8462 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(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[master]: engine: refine MTU value treatment in VdsBrokerObjectsBuilder
by alkaplan＠redhat.com 29 Dec '15

29 Dec '15

Alona Kaplan has submitted this change and it was merged. Change subject: engine: refine MTU value treatment in VdsBrokerObjectsBuilder ...................................................................... engine: refine MTU value treatment in VdsBrokerObjectsBuilder VDSM started reporting MTU value as an integer rather than as string like that was before. The patch refines the treatment of the MTU value so it would be treated according to the actual received type. Change-Id: Ib28358ddef3719fac35508807500942a74cf0d4f Bug-Url: https://bugzilla.redhat.com/1293881 Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: Alona Kaplan: Passed CI tests Moti Asayag: Looks good to me, approved Yevgeny Zaspitsky: Verified -- To view, visit https://gerrit.ovirt.org/51018 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib28358ddef3719fac35508807500942a74cf0d4f Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: VmsMonitoring generics
by tnisan＠redhat.com 29 Dec '15

29 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: VmsMonitoring generics ...................................................................... core: VmsMonitoring generics Introduce generics where possible to make the code easier to understand. Change-Id: I89ed6bab49dbda8b2b272ec77a92da8f6e53021e Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Allon Mureinik: Verified Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/50618 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89ed6bab49dbda8b2b272ec77a92da8f6e53021e Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(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[master]: core: VmsMonitoring casts
by tnisan＠redhat.com 29 Dec '15

29 Dec '15

Tal Nisan has submitted this change and it was merged. Change subject: core: VmsMonitoring casts ...................................................................... core: VmsMonitoring casts Removed redundant casts in order to make the code easier to read. Change-Id: Icff407c88f2ce298d2f517571f5b6903d43a56bd Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsMonitoring.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/50617 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icff407c88f2ce298d2f517571f5b6903d43a56bd Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(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[master]: core: compare custom properties against template on add vm
by ahadas＠redhat.com 29 Dec '15

29 Dec '15

Arik Hadas 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: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/51121 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c3bb293085cc26ad93f470c4d7e151cc2af08f0 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master 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: gerrit-hooks <automation(a)ovirt.org>

1 0

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

29 Dec '15

Arik Hadas 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/51105 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab1a8536e1da5c529d735542d21b004a15c5fbf4 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in jenkins[master]: Removed ovirt-engine 3.6.2 upgrade jobs from yaml
by eedri＠redhat.com 29 Dec '15

29 Dec '15

Eyal Edri has submitted this change and it was merged. Change subject: Removed ovirt-engine 3.6.2 upgrade jobs from yaml ...................................................................... Removed ovirt-engine 3.6.2 upgrade jobs from yaml Change-Id: I1fed8a5a8f707023d8fc444a85c3d84bfdd60251 Signed-off-by: Sharon Naftaly <snaftaly(a)redhat.com> --- M jobs/confs/projects/ovirt-engine/ovirt-engine_upgrade-engine.yaml D jobs/ovirt-engine_upgrade_to_3.6.2/build_engine_rpm.sh D jobs/ovirt-engine_upgrade_to_3.6.2/cleanup.file.otopi D jobs/ovirt-engine_upgrade_to_3.6.2/cleanup.sh D jobs/ovirt-engine_upgrade_to_3.6.2/setup.file.otopi D jobs/ovirt-engine_upgrade_to_3.6.2/upgrade.sh 6 files changed, 0 insertions(+), 777 deletions(-) Approvals: Sharon Naftaly: Verified; Ready for review Eyal Edri: Looks good to me; Ready for merge Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/51134 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fed8a5a8f707023d8fc444a85c3d84bfdd60251 Gerrit-PatchSet: 2 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sharon Naftaly <snaftaly(a)redhat.com> Gerrit-Reviewer: Anatoly Litovsky <tlitovsk(a)redhat.com> Gerrit-Reviewer: Barak Korren <bkorren(a)redhat.com> Gerrit-Reviewer: David Caro <dcaro(a)redhat.com> Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sagi Shnaidman <sshnaidm(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Sharon Naftaly <snaftaly(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0