- Engine-commits - oVirt List Archives

Change in ovirt-engine[ovirt-engine-4.0]: core: Avoid an infinite loop when untar an entry
by tnisan＠redhat.com 01 Jun '16

01 Jun '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Avoid an infinite loop when untar an entry ...................................................................... core: Avoid an infinite loop when untar an entry Avoid going into infinite loop in case there is an error during an entry extraction from a tar archive. For example if the tar contains a corrupted or simply an empty file, this will trigger the infinite loop. The fix will just skip to the next entry and will add empty files into the archive (we reflect the tar entries and not ignoring them) Change-Id: I64a8d019cb5c13df19ee21eecb2ab81b42a9b3cc Bug-Url: https://bugzilla.redhat.com/1167262 Signed-off-by: Roy Golan <rgolan(a)redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OvfUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/TarInMemoryExport.java A backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/archivers/tar/TarInMemoryExportTest.java A backend/manager/modules/utils/src/test/resources/mixed-content.tar A backend/manager/modules/utils/src/test/resources/non-empty.tar A backend/manager/modules/utils/src/test/resources/tar-with-empty-file.tar 6 files changed, 83 insertions(+), 7 deletions(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Verified Maor Lipchuk: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/58343 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64a8d019cb5c13df19ee21eecb2ab81b42a9b3cc Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Jenkins CI 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[ovirt-engine-4.0]: webadmin: v2v -moving vms between lists got stuck
by tnisan＠redhat.com 01 Jun '16

01 Jun '16

Tal Nisan has submitted this change and it was merged. Change subject: webadmin: v2v -moving vms between lists got stuck ...................................................................... webadmin: v2v -moving vms between lists got stuck when choosing vms to import in the import VMs dialog, then clicking "Next" to next import dialog for choosing cluster and then clicking "Back" to display the first import dialog again: in this senario when moving vms from importedVmModels list to externalVmModels and vice versa, at some point clicking the arrow button does nothing (arrow button is clicked and button callback is called but VM is not moved). This problem occurred because when clicking "back" button and displaying 1st dialog, new UI objects are created for the 1st dialog (SplitTable,ImportVmsPopupView...), but the old ones for this 1st dialog are still alive and both old and new UI objects share the same model. This causes the old UI button callbacks to disrupt the data for the new UI objects. in some point when clicking on a vm to select it with checkbox, the "old" button callback calulated it as 2 vms checked although only one vm is actually checked. Trying to move this VM by clicking the arrow causes failure and nothing is moved. The fix for this bug includes reseting both importedVmModels and externalVmModels lists of the model (copying the items list only) before creating the new UI instances for the "Back" operation. Change-Id: Ib34d108a2959a50df0e39edd21360d2e5feb4f54 Bug-Url: https://bugzilla.redhat.com/1338740 Signed-off-by: Sharon Gratch <sgratch(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Jenkins CI: Passed CI tests Sharon Gratch: Verified -- To view, visit https://gerrit.ovirt.org/58354 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib34d108a2959a50df0e39edd21360d2e5feb4f54 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Sharon Gratch <sgratch(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Gratch <sgratch(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: aaa : Automatic logout does not terminate user session
by mperina＠redhat.com 01 Jun '16

01 Jun '16

Martin Peřina has submitted this change and it was merged. Change subject: aaa : Automatic logout does not terminate user session ...................................................................... aaa : Automatic logout does not terminate user session Automatic logout at the expiration of UserSessionTimeOutInterval should terminate the session if the session has been inactive Change-Id: I6712291801ba579b3c4ac7da161f39fbaf38a32e Bug-Url: https://bugzilla.redhat.com/1340471 Signed-off-by: Ravi Nori <rnori(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Martin Peřina: Looks good to me, approved Ravi Nori: Verified Jenkins CI: Passed CI tests Moti Asayag: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/58398 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6712291801ba579b3c4ac7da161f39fbaf38a32e Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rnori(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: Domain Object builder for unit, DAO and integration tests
by rgolan＠redhat.com 01 Jun '16

01 Jun '16

Roy Golan has submitted this change and it was merged. Change subject: Domain Object builder for unit, DAO and integration tests ...................................................................... Domain Object builder for unit, DAO and integration tests Add builders vor VMs, Hosts and clusters. These builders contain two methods to actually create an entity: * AbstractBuilder#persist() to persist the built object in a real database. This is very useful when running DAO or integration tests with an available database. * AbstractBuilder#build() to just build the objects and return them. This is very useful when writing unit tests. No database needs to be present and no DAOs are involved. Change-Id: Ia02585332f997e4eab151f62c5c2208e65b84346 Signed-off-by: Roman Mohr <rmohr(a)redhat.com> --- A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/builder/AbstractBuilder.java A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/builder/ClusterBuilder.java A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/builder/MacPoolBuilder.java A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/builder/VdsBuilder.java A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/builder/VmBuilder.java M backend/manager/modules/dal/src/test/resources/test-beans.xml 6 files changed, 481 insertions(+), 0 deletions(-) Approvals: Martin Sivák: Looks good to me, but someone else must approve Martin Peřina: Looks good to me, but someone else must approve Roman Mohr: Verified Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/47007 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia02585332f997e4eab151f62c5c2208e65b84346 Gerrit-PatchSet: 17 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: packaging: setup: postgres applyEnvironment: Allow missing keys
by sbonazzo＠redhat.com 01 Jun '16

01 Jun '16

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: postgres applyEnvironment: Allow missing keys ...................................................................... packaging: setup: postgres applyEnvironment: Allow missing keys This allows not calling setdefault for each key separately. Change-Id: I4cbcdb4160df403fc6f58b6757e52c7bcfbe6485 Signed-off-by: Yedidyah Bar David <didi(a)redhat.com> --- M packaging/setup/ovirt_engine_setup/engine_common/postgres.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, approved Jenkins CI: Passed CI tests Yedidyah Bar David: Verified -- To view, visit https://gerrit.ovirt.org/57967 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cbcdb4160df403fc6f58b6757e52c7bcfbe6485 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[ovirt-engine-4.0]: restapi: Add V3 IO exception mapper
by tnisan＠redhat.com 31 May '16

31 May '16

Tal Nisan has submitted this change and it was merged. Change subject: restapi: Add V3 IO exception mapper ...................................................................... restapi: Add V3 IO exception mapper Currently version 3 of the API doesn't have a specific IO exception mapper, as exceptions are handled by version 4, and then tranlsated to the version 3 format. But some exceptions happen before version 4 is called, for example the exceptions that happen during validation of integer values. In order to handle this kind of exceptions like we used to do in the past, we need a version 3 specific mapper. This patch adds it. Change-Id: I2622a162bfd92bc29bb35271e918c9cc7f3c8b6f Bug-Url: https://bugzilla.redhat.com/1339907 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit 9c23fd98783402d559ab156810ee5f445c9aa48c) --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/V3Application.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/V3IOExceptionMapper.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/V3UsageFinder.java 3 files changed, 187 insertions(+), 0 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/58404 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2622a162bfd92bc29bb35271e918c9cc7f3c8b6f Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(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-4.0]: restapi: Check watchdog model and action before mapping
by tnisan＠redhat.com 31 May '16

31 May '16

Tal Nisan has submitted this change and it was merged. Change subject: restapi: Check watchdog model and action before mapping ...................................................................... restapi: Check watchdog model and action before mapping This patch changes the API so that watchdog model and action attributes are checked before trying to map them, as otherwise the mapping produces NPEs. Change-Id: Ie7f188500df909f8c123fb90e7dd4c46a7c0787a Bug-Url: https://bugzilla.redhat.com/1338502 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit 63d4ffcda24f312eb67ca311a976aa428c1fba04) --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResource.java 6 files changed, 54 insertions(+), 12 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/58403 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7f188500df909f8c123fb90e7dd4c46a7c0787a Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(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-4.0]: restapi: Fix V3 input mapping of boot sequence
by tnisan＠redhat.com 31 May '16

31 May '16

Tal Nisan has submitted this change and it was merged. Change subject: restapi: Fix V3 input mapping of boot sequence ...................................................................... restapi: Fix V3 input mapping of boot sequence With the introduction of type safe enums in the API the boot devices need to be mapped using the BootDevice.fromValue method. Change-Id: Ic31e6b8c824b808ae64670033d1f4cdbd1608aad Bug-Url: https://bugzilla.redhat.com/1333340 Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com> (cherry picked from commit afc2e483717220504248230ae4c5f15d752d62c6) --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/v3/adapters/V3OperatingSystemInAdapter.java 1 file changed, 5 insertions(+), 11 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/58405 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic31e6b8c824b808ae64670033d1f4cdbd1608aad Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.0 Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-dwh[master]: build: after build dwh for 4.0 rc
by Shirly Radco 31 May '16

31 May '16

Shirly Radco has submitted this change and it was merged. Change subject: build: after build dwh for 4.0 rc ...................................................................... build: after build dwh for 4.0 rc Fixed version. Change-Id: Iec6a29578613579f2dd4a3e842cfa29e84abb146 Signed-off-by: Shirly Radco <sradco(a)redhat.com> --- M version.mak 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Shirly Radco: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/58362 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec6a29578613579f2dd4a3e842cfa29e84abb146 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Shirly Radco <sradco(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Shirly Radco <sradco(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-dwh[master]: build: dwh build for 4.0 rc
by Shirly Radco 31 May '16

31 May '16

Shirly Radco has submitted this change and it was merged. Change subject: build: dwh build for 4.0 rc ...................................................................... build: dwh build for 4.0 rc bumped RPM_RELEASE. Change-Id: I977c71611f321eaaf7b11d460e017fdb0029eaf6 Signed-off-by: Shirly Radco <sradco(a)redhat.com> --- M version.mak 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Shirly Radco: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/58361 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I977c71611f321eaaf7b11d460e017fdb0029eaf6 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Shirly Radco <sradco(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Shirly Radco <sradco(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0