February 2013 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: simplify businessentity equals() methods [part 2]
by lhornyak＠redhat.com 26 Feb '13

26 Feb '13

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: simplify businessentity equals() methods [part 2] ...................................................................... core: simplify businessentity equals() methods [part 2] Instead of manually doing a null-safe comparison for each business entity, use ObjectUtils.objectsEqual(). Where applicable, optimize the order of comparison by looking at the id field first. The resulting code is more concise, easier to maintain, and doesn't mask errors due to missing braces like the previous code did. Change-Id: I8e77ebc95015105b54fbb09472e38a2d36492278 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LunDisk.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaStorage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/QuotaVdsGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RoleGroupMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RoleGroupMapId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserGroupMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsUserMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVdsMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdcOption.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/vds_spm_id_map.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/ObjectUtilsTest.java 41 files changed, 615 insertions(+), 1,746 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12416 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e77ebc95015105b54fbb09472e38a2d36492278 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com> Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: ofri masad <omasad(a)redhat.com>

1 0

Change in ovirt-engine[master]: webadmin: cpu pinning visibility in vm dialog
by gchaplik＠redhat.com 26 Feb '13

26 Feb '13

Gilad Chaplik has submitted this change and it was merged. Change subject: webadmin: cpu pinning visibility in vm dialog ...................................................................... webadmin: cpu pinning visibility in vm dialog Fix showing CPU pinning section when the VM: * Respective to CpuPinningEnabled, CpuPinMigrationEnabled * Pinned * Assigned to host & admin-migration & cpu-host are checked Change-Id: I7343e94f6133f0ad796b5446718af98dcd734c30 Bug-Url: https://bugzilla.redhat.com/867039 Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 2 files changed, 9 insertions(+), 4 deletions(-) Approvals: Gilad Chaplik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11972 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7343e94f6133f0ad796b5446718af98dcd734c30 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Remove unused entities
by tnisan＠redhat.com 26 Feb '13

26 Feb '13

Tal Nisan has submitted this change and it was merged. Change subject: core: Remove unused entities ...................................................................... core: Remove unused entities Change-Id: I916ff0ac4745d4f05811d4f0737f93d764620ebe Signed-off-by: Tal Nisan <tnisan(a)redhat.com> --- M backend/manager/dbscripts/create_views.sql M backend/manager/dbscripts/event_sp.sql D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_notification_methods.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map_id.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/roles_actions.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool_iso_map_id.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml 8 files changed, 0 insertions(+), 287 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12400 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I916ff0ac4745d4f05811d4f0737f93d764620ebe Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>

1 0

Change in ovirt-engine[master]: Makefile: fix errors when running make install on ovirt-engi...
by juan.hernandez＠redhat.com 26 Feb '13

26 Feb '13

Juan Hernandez has submitted this change and it was merged. Change subject: Makefile: fix errors when running make install on ovirt-engine ...................................................................... Makefile: fix errors when running make install on ovirt-engine - running make install required interactive answer from user - added -f for forcing link creation Change-Id: I280a20a77ee3980437be3f3bca2f7bc9082d34c4 Signed-off-by: Eyal Edri <eedri(a)redhat.com> --- M Makefile 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12449 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I280a20a77ee3980437be3f3bca2f7bc9082d34c4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Eyal Edri <eedri(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: VmRunHandler: simplify isInternal evaluation
by amureini＠redhat.com 26 Feb '13

26 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: VmRunHandler: simplify isInternal evaluation ...................................................................... core: VmRunHandler: simplify isInternal evaluation Some of the checks in VmRunHandler are only evaluated in the following condition: !vm.isAutoStartup() || !runParams.getIsInternal() && vm.isAutoStartup() Since java evaluated boolean conditions with short circuit logic, this can be simplified. The right hand of the || condition is only tested if !vm.isAutoStartup() evaluates to false, which means vm.isAutoStartup() evaluated to true - so there is no reason to test it again. The added readability is a bonus. Change-Id: I0aa0ce3b0ef22739014f31f4019a35b8d230aaee Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12248 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0aa0ce3b0ef22739014f31f4019a35b8d230aaee Gerrit-PatchSet: 4 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: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: VmRunHandler: correct check for disk images
by amureini＠redhat.com 26 Feb '13

26 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: VmRunHandler: correct check for disk images ...................................................................... core: VmRunHandler: correct check for disk images VmRunHandler has a series of checks on VM images - these checks should only be performed if the VM has image based disks, not disks in general (which could be LUN disks). Change-Id: Ib47cf77154a5e46af23a10550884bbd6cdeecb30 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12247 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib47cf77154a5e46af23a10550884bbd6cdeecb30 Gerrit-PatchSet: 3 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: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: VmRunHandler: snapshot check on diskless VMs
by amureini＠redhat.com 26 Feb '13

26 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: VmRunHandler: snapshot check on diskless VMs ...................................................................... core: VmRunHandler: snapshot check on diskless VMs Since oVirt 3.1 supports snapshoting a diskless VM, VmRunHandler should make sure a VM is not locked or during a snapshot when attempting to run it even if it doesn't have any disks. Change-Id: I232971b0d92aed1266d51ef89b2ae8175f08fbb2 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmRunHandler.java 1 file changed, 22 insertions(+), 18 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12246 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I232971b0d92aed1266d51ef89b2ae8175f08fbb2 Gerrit-PatchSet: 3 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: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: use slf4j-jdk14 1.5.6
by amureini＠redhat.com 26 Feb '13

26 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: use slf4j-jdk14 1.5.6 ...................................................................... core: use slf4j-jdk14 1.5.6 Downgraded slf4j-jdk14 to be compatible with log4j 1.2.16 that we use in the project. Change-Id: I0b3d1363da413881ee1aa89738dd8d7ea6ac52c5 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12110 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b3d1363da413881ee1aa89738dd8d7ea6ac52c5 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Remove rmw-war
by juan.hernandez＠redhat.com 26 Feb '13

26 Feb '13

Juan Hernandez has submitted this change and it was merged. Change subject: core: Remove rmw-war ...................................................................... core: Remove rmw-war This war, located in the frontend, contains a few servlts that are in fact more related to the backend, and it doesn't grant the existence of a different module and .war file. This patch moves all the content to the root web application. As the URLs don't change there is no impact outside of the engine. Change-Id: I1b5a292cb28cbc460cf45a9595bddd7ebb824857 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> --- M backend/manager/modules/root/pom.xml R backend/manager/modules/root/src/main/java/org/ovirt/engine/core/redirect/RedirectServlet.java R backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java A backend/manager/modules/root/src/main/java/org/ovirt/engine/core/status/HealthStatus.java R backend/manager/modules/root/src/main/java/org/ovirt/engine/core/validate/ValidateSession.java M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml M ear/pom.xml M frontend/pom.xml D frontend/wars/pom.xml D frontend/wars/rmw-war/pom.xml D frontend/wars/rmw-war/src/main/java/org/ovirt/engine/core/status/HealthStatus.java D frontend/wars/rmw-war/src/main/webapp/WEB-INF/web.xml M packaging/fedora/spec/ovirt-engine.spec.in 13 files changed, 143 insertions(+), 259 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11324 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b5a292cb28cbc460cf45a9595bddd7ebb824857 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Remove StringCompatTest
by amureini＠redhat.com 26 Feb '13

26 Feb '13

Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove StringCompatTest ...................................................................... core: Remove StringCompatTest StringCompatTest did not in fact test StringCompat (which was already removed), but StringHelper's join method. This method is already thoroughly tested in StringHelperTest, so this test is redundant and can be removed. Change-Id: I9fc6ec3759f661e4da54957a2140a4d975cf9546 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- D backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/StringCompatTest.java 1 file changed, 0 insertions(+), 11 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12423 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9fc6ec3759f661e4da54957a2140a4d975cf9546 Gerrit-PatchSet: 3 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: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0