October 2016 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: CommandBaseTest @InjectMocks
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: CommandBaseTest @InjectMocks ...................................................................... core: CommandBaseTest @InjectMocks Cleaned up the code by using a single instance (where possible) and injecting mocks to it. Note that the sessionDataContainer member from the base had to be spied so Mockito will pick it up and inject it too. Change-Id: I9237395c1bd40168bfba2a7759ae0ebe68acfe97 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BaseCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java 2 files changed, 8 insertions(+), 17 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Ravi Nori: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Martin Betak: Looks good to me, but someone else must approve Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/65198 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9237395c1bd40168bfba2a7759ae0ebe68acfe97 Gerrit-PatchSet: 7 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: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Ravi Nori <rnori(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: CommandBaseTest: Remove redundant mocking/stubbing
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: CommandBaseTest: Remove redundant mocking/stubbing ...................................................................... core: CommandBaseTest: Remove redundant mocking/stubbing Change-Id: Ibe8a73330e58d5517ed0ee8b7a0980d848c7196b 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, 0 insertions(+), 32 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Martin Betak: Looks good to me, but someone else must approve Allon Mureinik: Verified Objections: Jenkins CI: Failed CI tests -- To view, visit https://gerrit.ovirt.org/65197 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe8a73330e58d5517ed0ee8b7a0980d848c7196b Gerrit-PatchSet: 7 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(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: Introduce LunHelper
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Introduce LunHelper ...................................................................... core: Introduce LunHelper Introduce a new helper class, LunHelper, and move the proceedLUNInDb methods from StorageDomainCommandBase there, where they fit better. Change-Id: Ic1871a64943991c586ff1bd495a7e27dca8811b9 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddExistingBlockStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddSANStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ExtendSANStorageDomainCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/LunHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/StorageDomainCommandBase.java 6 files changed, 73 insertions(+), 47 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Allon Mureinik: Verified Objections: Jenkins CI: Failed CI tests -- To view, visit https://gerrit.ovirt.org/64800 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1871a64943991c586ff1bd495a7e27dca8811b9 Gerrit-PatchSet: 18 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: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Move saveImage to ImagesHandler
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Move saveImage to ImagesHandler ...................................................................... core: Move saveImage to ImagesHandler saveImage is a utility method for images that is used in several different command hierarchies. This patch moves it to ImagesHandler, instead of having commands cross-depending on each other. Change-Id: I818bcfd34b0b9288aa1601e6cacb3c9585dcd9ed Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CreateImageTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java 5 files changed, 18 insertions(+), 21 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Allon Mureinik: Verified Objections: Jenkins CI: Failed CI tests -- To view, visit https://gerrit.ovirt.org/64802 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I818bcfd34b0b9288aa1601e6cacb3c9585dcd9ed Gerrit-PatchSet: 18 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: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Make LiveStorageMigrationHelper a @Singleton
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Make LiveStorageMigrationHelper a @Singleton ...................................................................... core: Make LiveStorageMigrationHelper a @Singleton Annotate the class as a @Singleton, @Inject it where its needed and @Inject the DAOs it needs to it instead of relying on them having public access from the command passed to it. Change-Id: I9d608a01351020f210af074be3c0255512f8f36e Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveStorageMigrationHelper.java 2 files changed, 22 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Allon Mureinik: Verified Objections: Jenkins CI: Failed CI tests -- To view, visit https://gerrit.ovirt.org/64801 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d608a01351020f210af074be3c0255512f8f36e Gerrit-PatchSet: 18 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: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: VmTemplateHandler#isVmTemplateImagesReady return value
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: VmTemplateHandler#isVmTemplateImagesReady return value ...................................................................... core: VmTemplateHandler#isVmTemplateImagesReady return value Use the standard ValidationResult as per the project's conventions instead of returning a boolean and updating an output parameter(!) containing the validation messages. Change-Id: I2f69d10848bc1a1a527d432d89b26060daf0a648 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- 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/CommonVmPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmTemplateCommand.java 5 files changed, 19 insertions(+), 33 deletions(-) Approvals: Tal Nisan: Looks good to me, approved; Passed CI tests Allon Mureinik: Verified Objections: Jenkins CI: Failed CI tests -- To view, visit https://gerrit.ovirt.org/64804 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f69d10848bc1a1a527d432d89b26060daf0a648 Gerrit-PatchSet: 18 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: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(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: VmTemplateHandler#isVmTemplateImagesReady
by tnisan＠redhat.com 25 Oct '16

25 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: VmTemplateHandler#isVmTemplateImagesReady ...................................................................... core: VmTemplateHandler#isVmTemplateImagesReady Move the isVmTemplateImagesReady static method to VmTemplateHandler, which is a utility class for handling templates, instead of having it in a command and forcing commands of several hierarchies to have cross dependencies. Change-Id: Id0937276fc3002ae3cd4f4d0af3eab4e50d8172c Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- 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/CommonVmPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmTemplateCommand.java 6 files changed, 67 insertions(+), 70 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/64803 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0937276fc3002ae3cd4f4d0af3eab4e50d8172c Gerrit-PatchSet: 18 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: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(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, restapi: random rng source is implicit
by mbetak＠redhat.com 25 Oct '16

25 Oct '16

Martin Betak has submitted this change and it was merged. Change subject: core,restapi: random rng source is implicit ...................................................................... core,restapi: random rng source is implicit /dev/random is automatically required for hosts in all clusters. Change shouldn't affect existing hosts since they are expected to support /dev/random anyway. This patch: * splits Cluster#requiredRngSources to Cluster#additionalRngSource that holds required rng sources except for /dev/random (currently only /dev/hwrng) and #requiredRngSources that works as computed property based on #additionalRngSource. * renames 'required_rng_sources' to 'additional_rng_sources' in DB related code. I.e. /dev/random won't be mentioned in DB any more. * adds migration sql script removing 'RANDOM' from column additional_rng_sources table. * removes redundant RandomDeviceClusterEditChecker. * [restapi] To keep API backward compatible rng sources will still be available through <required-rng-sources>. /dev/random will be always shown to client and ignored when set by client. Change-Id: I8d39e6210a64a8cae6187deb5c2712934a5d54d5 Bug-Url: https://bugzilla.redhat.com/1337101 Signed-off-by: Jakub Niedermertl <jniederm(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddClusterCommand.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RandomDeviceClusterEditChecker.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/ClusterDaoImpl.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/VirtMonitoringStrategyTest.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java 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 M packaging/dbscripts/clusters_sp.sql A packaging/dbscripts/upgrade/04_01_0340_random_rng_source_required.sql 19 files changed, 91 insertions(+), 44 deletions(-) Approvals: Jakub Niedermertl: Verified Martin Peřina: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Martin Betak: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/65143 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d39e6210a64a8cae6187deb5c2712934a5d54d5 Gerrit-PatchSet: 16 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Marek Libra <mlibra(a)redhat.com> Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-hosted-engine-setup[master]: packaging: setup: urllib from python-six
by sbonazzo＠redhat.com 24 Oct '16

24 Oct '16

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: urllib from python-six ...................................................................... packaging: setup: urllib from python-six Use python-six as compatibility layer for urllib. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1379674 Change-Id: I51b342619d66b1bd5a325a2eb592389d6b5a28ed Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M .isort.cfg M ovirt-hosted-engine-setup.spec.in M src/ovirt_hosted_engine_setup/check_liveliness.py M src/ovirt_hosted_engine_setup/ohttpshandler.py M src/ovirt_hosted_engine_setup/pkissh.py 5 files changed, 10 insertions(+), 12 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me, approved Jenkins CI: Passed CI tests Rafael Martins: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/65558 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51b342619d66b1bd5a325a2eb592389d6b5a28ed Gerrit-PatchSet: 6 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Lev Veyde <lveyde(a)redhat.com> Gerrit-Reviewer: Rafael Martins <rmartins(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(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[master]: packaging: setup: urllib from python-six
by sbonazzo＠redhat.com 24 Oct '16

24 Oct '16

Sandro Bonazzola has submitted this change and it was merged. Change subject: packaging: setup: urllib from python-six ...................................................................... packaging: setup: urllib from python-six Use python-six as compatibility layer for urllib. Change-Id: I68aa9e643037e83a931495f6c5c608379844c0f9 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1379674 Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M ovirt-engine.spec.in M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me, approved Jenkins CI: Passed CI tests Rafael Martins: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/65550 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68aa9e643037e83a931495f6c5c608379844c0f9 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Amit Aviram <aaviram(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Lev Veyde <lveyde(a)redhat.com> Gerrit-Reviewer: Rafael Martins <rmartins(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0