- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: webadmin: Fix getFriendlyVersion
by yzaslavs＠redhat.com 25 Jun '12

25 Jun '12

Yair Zaslavsky has submitted this change and it was merged. Change subject: webadmin: Fix getFriendlyVersion ...................................................................... webadmin: Fix getFriendlyVersion getFriendlyVersion should return 3.1 for vdsm version 4.10. Most of the usages of getFriendlyVersion compare the result with the minimum compatibility version (check that it is equal or greater than the mimimum compatbility version for a feature) Prior to this patch, 4.10 would have resulted as version 4.10 so the comparsion would have returned a value greater than 0, now the Version returned from getFriendlyVersion will be 3.1 (as for 4.9 it returned 3.0). So the comparsion would also return a value greater than 0 (So no regression here). The only change is that at UI for host you will see vdsm version 3.1.x.y instead of 4.10.x.y This is an interim patch until we start working with RpmVersion and then we should revisit this. Change-Id: I88e55c73d4b7747d8af8dcda5e112694aeea3030 Acked-By: Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Extensions.java 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5489 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88e55c73d4b7747d8af8dcda5e112694aeea3030 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: block vm migration if cpu pinning enabled
by dfediuck＠redhat.com 25 Jun '12

25 Jun '12

Doron Fediuck has submitted this change and it was merged. Change subject: core: block vm migration if cpu pinning enabled ...................................................................... core: block vm migration if cpu pinning enabled Blocks VM migration of cpu pinning is enabled. Change-Id: I38e7585d96ff0c5d5ea29222495b8d987f6aeb7b Signed-off-by: Laszlo Hornyak <lhornyak(a)redhat.com> --- M backend/manager/dbscripts/upgrade/pre_upgrade/config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmManagementCommandBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 9 files changed, 42 insertions(+), 3 deletions(-) Approvals: Doron Fediuck: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5065 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38e7585d96ff0c5d5ea29222495b8d987f6aeb7b Gerrit-PatchSet: 15 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Add a profile to exclude gluster tests
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: Add a profile to exclude gluster tests ...................................................................... core: Add a profile to exclude gluster tests Gluster tests are the main users of PowerMock, which forces the build to fork its tests. This new optional profile (-Pdisable-gluster-tets) allows runnign the build without gluster tests, which allows using -Dengine.powermock.fork=once, to dramatically shorten the build time. Change-Id: I2d495d4ba6e8fc6a0463fd0c9d225c588563b675 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/pom.xml 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5654 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d495d4ba6e8fc6a0463fd0c9d225c588563b675 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: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Introducing engine.powermock.fork build flag
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: Introducing engine.powermock.fork build flag ...................................................................... core: Introducing engine.powermock.fork build flag The default behavior of the build is to always fork tests in modules containing powermock tests in order to make sure no PermGen error occur. This flag allows different forking modes to allow older Maven versions to work faster. To use, just specify -Dengine.powermock.fork=once in your Maven command line. Change-Id: I606a84289f516c4f18a5725cdbc7270b7d112644 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/pom.xml M backend/manager/modules/restapi/types/pom.xml 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5653 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I606a84289f516c4f18a5725cdbc7270b7d112644 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: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Session in GetUserBySessionIdQueryTest
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: Session in GetUserBySessionIdQueryTest ...................................................................... core: Session in GetUserBySessionIdQueryTest Properly close the user session defined in GetUserBySessionIdQueryTest in an @After method so it doesn't leak into other tests. Change-Id: I888eadee7e1651f1829724e30d4b5577b001e7bf Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserBySessionIdQueryTest.java 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5652 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I888eadee7e1651f1829724e30d4b5577b001e7bf 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: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Session in CommandBaseTest
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: Session in CommandBaseTest ...................................................................... core: Session in CommandBaseTest Properly close the user session defined in CommandBasseTest in an @After method so it doesn't leak into other tests. Change-Id: I50f722b0d550ed7c9e9beaa1fbc9a9e93703de7b Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5651 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50f722b0d550ed7c9e9beaa1fbc9a9e93703de7b 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: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: session in AbstractGetEntitiesWithPermittedActionParam...
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: session in AbstractGetEntitiesWithPermittedActionParametersQueryTest ...................................................................... core: session in AbstractGetEntitiesWithPermittedActionParametersQueryTest Properly close the user session defined in AbstractGetEntitiesWithPermittedActionParametersQueryTest in an @After method so it doesn't leak into other tests. Change-Id: I35a30c9861a4ea623de9500882d0452ef2777399 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractGetEntitiesWithPermittedActionParametersQueryTest.java 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5650 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35a30c9861a4ea623de9500882d0452ef2777399 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: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Clean up casts in SessionDataContainer[Test]
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: Clean up casts in SessionDataContainer[Test] ...................................................................... core: Clean up casts in SessionDataContainer[Test] Fix casts to the concrete VdcUser in both SessionDataContainer and its test to the interface IVdcUser. The concrete implementation is not needed, and represents an abstraction error. Change-Id: Ida6807a1a182204da64f6c08d000895863f35634 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/session/SessionDataContainer.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/session/SessionDataContainerTest.java 2 files changed, 2 insertions(+), 4 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5649 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida6807a1a182204da64f6c08d000895863f35634 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: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: UnPowerMock and clean pools with vm commands
by lhornyak＠redhat.com 25 Jun '12

25 Jun '12

Laszlo Hornyak has submitted this change and it was merged. Change subject: core: UnPowerMock and clean pools with vm commands ...................................................................... core: UnPowerMock and clean pools with vm commands Removed PowerMock depedency and replaced it with directly spying the relevant methods in the tests of commands relevant to manipulating pools which contain VMs. Some refactoring in the commands themselves and their base classes was required in order to achieve this functionality - mainly extracting DAOs and other methods which access external resources to their own helper methods. Change-Id: I43cdf43682d3ab2a3e75ca965490982888b93763 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmPoolWithVmsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommandTestAbstract.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommandTest.java 6 files changed, 158 insertions(+), 196 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5517 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43cdf43682d3ab2a3e75ca965490982888b93763 Gerrit-PatchSet: 6 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: 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: Michael Kublin <mkublin(a)redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: restapi: Add Missing Disk Counters
by oliel＠redhat.com 25 Jun '12

25 Jun '12

Ori Liel has submitted this change and it was merged. Change subject: restapi: Add Missing Disk Counters ...................................................................... restapi: Add Missing Disk Counters read latency, write latency, flush latency. Change-Id: I6fb8b4e33cde879a97aca4f34bfbc4d8ee95f1b6 Signed-off-by: Ori Liel <oliel(a)redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQuery.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendDisksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java A backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQueryTest.java 5 files changed, 89 insertions(+), 5 deletions(-) Approvals: Ori Liel: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5585 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fb8b4e33cde879a97aca4f34bfbc4d8ee95f1b6 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <oliel(a)redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com> Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>

1 0