March 2017 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: Use a default answer for MockConfigRule
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: Use a default answer for MockConfigRule ...................................................................... core: Use a default answer for MockConfigRule Before this patch, MockConfigRule used the Answers.CALLS_REAL_METHODS default answer and another Answer to implement the logic of returning the default config value. This meant that it was still performing a stubbing operation, which could potentially cause some tests to fail with an UnnecessaryStubbingException and forcing those tests to use the Silent runner. This patch unifies the parts of the stubbing logic to a single default answer, meaning that this mock now has no stubbing recorded on it, making it safe to use with the normal MockitoJUnitRunner. Another side effect this patch has is that it consolidates the mocking to a single mock object instead of [re]creating it each test, which should, at least in theory, offer a slight performance improvement. Change-Id: If2dcd48aad2596b379eb694d0bf36788ea0f5611 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java 1 file changed, 19 insertions(+), 13 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/73944 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2dcd48aad2596b379eb694d0bf36788ea0f5611 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: Jenkins CI Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(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: StartVdsCommand runner
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: StartVdsCommand runner ...................................................................... core: StartVdsCommand runner MockConfigRule used to mock the default values in a way which couldn't be avoided, making it appealing to use the Silent runner in this test. Now that this is not longer the case, this test removes the one stubbing call that is indeed redundant and restores the stricter MokcitoJUnitRunner to this test. Change-Id: I01c6bee154d5e50a2653cf8dd3309501a2f99d21 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/StartVdsCommandTest.java 1 file changed, 2 insertions(+), 13 deletions(-) Approvals: Tal Nisan: Looks good to me, approved 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/73952 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01c6bee154d5e50a2653cf8dd3309501a2f99d21 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: 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: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: [Import|Export]RepoImageCommandTest runners
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: [Import|Export]RepoImageCommandTest runners ...................................................................... core: [Import|Export]RepoImageCommandTest runners This patch pushes members down from the base class to where they're actually used in order to clean up the tests and make them easier to maintain. Now that the base class does not contain any redundant mocking, the subclasses can use stricter runners. Change-Id: I8a92124e4cb2a49237f842f7c206239bfed42526 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportExportRepoImageCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ExportRepoImageCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportRepoImageCommandTest.java 3 files changed, 25 insertions(+), 29 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/73950 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a92124e4cb2a49237f842f7c206239bfed42526 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: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> 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: NetworkDeviceHelperImplTest stubbing
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: NetworkDeviceHelperImplTest stubbing ...................................................................... core: NetworkDeviceHelperImplTest stubbing While this stubbing doesn't seem to break the official maven build, it is, in fact, redundant, and causes the test to fail when run independently in IntelliJ IDEA. This patch removes the redundant stubbing. Change-Id: Ia794d64c4dd8c3d47c3f12dd37f8a45343bfcde1 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/NetworkDeviceHelperImplTest.java 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified Yevgeny Zaspitsky: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/73955 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia794d64c4dd8c3d47c3f12dd37f8a45343bfcde1 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: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(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: ImportExportRepoImageCommandTest package
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: ImportExportRepoImageCommandTest package ...................................................................... core: ImportExportRepoImageCommandTest package Move ImportExportRepoImageCommandTest to org.ovirt.engine.core.bll.storage.repoimage, where it conceptually belongs. Change-Id: Icbfb018d86f0b23bae89959bc1d67cf606d73f5f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ExportRepoImageCommandTest.java R backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportExportRepoImageCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportRepoImageCommandTest.java 3 files changed, 2 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/73951 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbfb018d86f0b23bae89959bc1d67cf606d73f5f 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: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> 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: StartVdsCommandTest base class
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: core: StartVdsCommandTest base class ...................................................................... core: StartVdsCommandTest base class StartVdsCommandTest does not need the functionality of the DbDependantTestBase, allowing this patch to replace its base class with the simpler, faster, BaseCommandTest. Change-Id: Ia526ff2a1b1de83e057ba63c8bbbe07c4e470a9c Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/StartVdsCommandTest.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Looks good to me, approved 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/73953 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia526ff2a1b1de83e057ba63c8bbbe07c4e470a9c 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: 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]: engine: refactor UpdateNetworkValidatorTest to use a real ob...
by Code Review 15 Mar '17

15 Mar '17

>From Allon Mureinik <amureini(a)redhat.com>: Allon Mureinik has submitted this change and it was merged. Change subject: engine: refactor UpdateNetworkValidatorTest to use a real objects ...................................................................... engine: refactor UpdateNetworkValidatorTest to use a real objects Refactor UpdateNetworkValidatorTest to use a real business objects instead of mocks. Change-Id: Iff51b0aea6ee776963628176c448a4b2f7c46523 Signed-off-by: Yevgeny Zaspitsky <yzaspits(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkValidatorTest.java 1 file changed, 45 insertions(+), 53 deletions(-) Approvals: Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Yevgeny Zaspitsky: Verified -- To view, visit https://gerrit.ovirt.org/74015 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff51b0aea6ee776963628176c448a4b2f7c46523 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yevgeny Zaspitsky <yzaspits(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: restapi: used new NetworkUsage.DEFAULT_ROUTE enum value.
by Code Review 14 Mar '17

14 Mar '17

>From Juan Hernandez <juan.hernandez(a)redhat.com>: Juan Hernandez has submitted this change and it was merged. Change subject: restapi: used new NetworkUsage.DEFAULT_ROUTE enum value. ...................................................................... restapi: used new NetworkUsage.DEFAULT_ROUTE enum value. Change-Id: I33da487af6e3f103c00b695f5fe90f15e32a4a51 Bug-Url: https://bugzilla.redhat.com/1200963 Signed-off-by: Martin Mucha <mmucha(a)redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworkResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java 5 files changed, 27 insertions(+), 13 deletions(-) Approvals: Juan Hernandez: Looks good to me, approved Martin Mucha: Verified Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/71182 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33da487af6e3f103c00b695f5fe90f15e32a4a51 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: Alona Kaplan <alkaplan(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: scheduling: Refactor swap check to follow the same logic as ...
by Code Review 14 Mar '17

14 Mar '17

>From Martin Sivák <msivak(a)redhat.com>: Martin Sivák has submitted this change and it was merged. Change subject: scheduling: Refactor swap check to follow the same logic as other policy units ...................................................................... scheduling: Refactor swap check to follow the same logic as other policy units This allows per-cluster configuration of the allowed swap usage check. The global option BlockMigrationOnSwapUsagePercentage is still used, but can be overriden by the standard cluster policy mechanisms. The global option EnableSwapCheck will disable this unit for all clusters independently on the cluster policy configuration. Swap check can be disabled for a single cluster by creating a new cluster policy with the new Swap policy unit removed from the list of filters. This change also modifies the algorithm slightly and uses Free memory instead of the Available memory approximation VDSM provides. Change-Id: I8af60f54e31142a851fccc3e1a5b9df30dce93b7 Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPolicies.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/InternalPolicyUnits.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitParameter.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/MemoryPolicyUnit.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/SwapFilterPolicyUnit.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/resources/org/ovirt/engine/ui/frontend/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, 118 insertions(+), 36 deletions(-) Approvals: Martin Sivák: Verified; Looks good to me, approved Jenkins CI: Passed CI tests Jenny Tokar: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/68007 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8af60f54e31142a851fccc3e1a5b9df30dce93b7 Gerrit-PatchSet: 13 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Clarify meaning of memory fields in VDS and VdsStatistics
by Code Review 14 Mar '17

14 Mar '17

>From Martin Sivák <msivak(a)redhat.com>: Martin Sivák has submitted this change and it was merged. Change subject: core: Clarify meaning of memory fields in VDS and VdsStatistics ...................................................................... core: Clarify meaning of memory fields in VDS and VdsStatistics The memAvailable field returned by VDSM is an approximation of how much RAM would be available for starting a new VM if all running VMs used all their allocated memory. But the overhead calculation is more complicated than that and the engine also has overcommit rules and so the memAvailable field is not really useful anymore. Also document the units for related swap fields. Change-Id: Ib58aecbd9036730f24e38e797f8bc6133c4b7bc7 Signed-off-by: Martin Sivak <msivak(a)redhat.com> --- 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/VdsStatistics.java 2 files changed, 21 insertions(+), 0 deletions(-) Approvals: Martin Sivák: Verified; Looks good to me, approved Jenkins CI: Passed CI tests Francesco Romani: Looks good to me, but someone else must approve Milan Zamazal: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/73870 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib58aecbd9036730f24e38e797f8bc6133c4b7bc7 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com> Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com> Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com> Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0