- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: Move CertificateSubjectHelper to utils
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: Move CertificateSubjectHelper to utils ...................................................................... core: Move CertificateSubjectHelper to utils CertificateSubjectHelper is a utility, so the logically right place for it is in utils. Change-Id: Ibed61771ea2594a922dfe69b96972473ed58fc6b Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsCertificateSubjectByVmIdQuery.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/CertificateSubjectHelper.java R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/CertificateSubjectHelperTest.java 4 files changed, 5 insertions(+), 4 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65028 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibed61771ea2594a922dfe69b96972473ed58fc6b Gerrit-PatchSet: 4 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: Jenkins CI 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: MockConfigRule default values
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: MockConfigRule default values ...................................................................... core: MockConfigRule default values Enhance MockConfigRule to return the default value of a config value if its not explicitly mocked. Note that now the MockConfigRule depends on production code from the utils module, so modules that do not depend on it must have it added (in the test scope) This change has four main advantages: 1. Ease of use: With this change, not every config value has to be mocked, only the ones the developer is explicitly interested in. 2. Better simulation: With this change, tests with MockConfigRule act more like production code - if a config value is missing in their [mocked] environment, the default value is used. 3. Ease of maintenance: With this change, adding a new config value dependency in the production code won't break all the tests with a NullPointerException. Instead, the tests will silently use the default value. 4. Ease of reading: With this change, the only MockCongfigDescriptors that need to be used are for exceptional values that differ from the defaults. This way, these values draw the reader's attention to their special nature and allow him to focus on them instead of loosing them between all the values that just mock their defaults. NOTE: The SearchQueryTest relies on the old behavior. In order to not break it, nulls were explicitly mocked where expected by that old test. Change-Id: I32c99fd9cba88d2f58db4878565251a30a0bf125 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SearchQueryTest.java M backend/manager/modules/searchbackend/pom.xml M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java 3 files changed, 21 insertions(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65032 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32c99fd9cba88d2f58db4878565251a30a0bf125 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI 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: Remove VDS#getCertifaicateSubject
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove VDS#getCertifaicateSubject ...................................................................... core: Remove VDS#getCertifaicateSubject Business entities are shared between the back backend and the frontend, and as such should be simple data POJO and not contain any logic. This patch removes the complicated VDS#getCertificateSubject and changed the few places that used it to use the CertificateSubjectHelper directly. This decouples the VDS[Static] class from the config value and allows for better layering of the project's logic. Change-Id: I219df6ed8b40b93645a38b49883b927ac1e9fd2c Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsCertificateSubjectByVmIdQuery.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/VdsStatic.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java 7 files changed, 26 insertions(+), 32 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Juan Hernandez: Looks good to me, but someone else must approve Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65027 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I219df6ed8b40b93645a38b49883b927ac1e9fd2c Gerrit-PatchSet: 4 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: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez(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: Remove MockConfigRule default constructor
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: Remove MockConfigRule default constructor ...................................................................... core: Remove MockConfigRule default constructor The default no-arg constructor is just a private case of the MockConfigDescriptor varargs constructor with a zero-length argument list. There's no need to explicitly state it, and having it just bloats up the code. Change-Id: I9d6acb91e8676840c887fd5b6d2243b87a46b6c7 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, 0 insertions(+), 6 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65031 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d6acb91e8676840c887fd5b6d2243b87a46b6c7 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: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Jenkins CI 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: LableNicCommand#init()
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: LableNicCommand#init() ...................................................................... core: LableNicCommand#init() Move initialization logic from constructor to the init() method where it belongs (see 6188d4e for details). Change-Id: I50ada8fad004e20af9e3f8086c573db798831921 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65820 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50ada8fad004e20af9e3f8086c573db798831921 Gerrit-PatchSet: 1 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: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-guest-agent[ovirt-4.0]: Report session-startup on refresh
by vfeenstr＠redhat.com 27 Oct '16

27 Oct '16

Vinzenz Feenstra has submitted this change and it was merged. Change subject: Report session-startup on refresh ...................................................................... Report session-startup on refresh To show that we support session-startup and session-shutdown we need to send upon receiving a refresh message also the session-startup message. Otherwise VDSM will assume that we do not support session-{startup,shutdown} reporting. Change-Id: Ia19348cd66552fcf029d6725ba78e22619ce77e9 Backport-To: 4.0 Bug-Url: https://bugzilla.redhat.com/1389332 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> (cherry picked from commit baa1be15dde19743ee0b7a7a412952fec5ea387e) --- M ovirt-guest-agent/OVirtAgentLogic.py M tests/message_validator.py 2 files changed, 11 insertions(+), 6 deletions(-) Approvals: Jenkins CI: Passed CI tests Vinzenz Feenstra: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/65805 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia19348cd66552fcf029d6725ba78e22619ce77e9 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: fix check for whether vm is starting up
by ahadas＠redhat.com 27 Oct '16

27 Oct '16

Arik Hadas has submitted this change and it was merged. Change subject: core: fix check for whether vm is starting up ...................................................................... core: fix check for whether vm is starting up Previously the check relied on the result of getLastVdsRunOn to see if the VM is starting up since preferred hosts are supposed to be used only during VM startup. But VmDynamic#lastVdsRunOn never contains the real host that the VM ran on when getting to this method (it is always null so this check is passed also for migrating VMs). Therefore, this check is changed. Change-Id: I02832a76d94f7a02d6f2b82970461d14a628ed74 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnit.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Martin Sivák: Looks good to me, approved Jenkins CI: Passed CI tests Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/65282 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02832a76d94f7a02d6f2b82970461d14a628ed74 Gerrit-PatchSet: 10 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-guest-agent[master]: Report session-startup on refresh
by vfeenstr＠redhat.com 27 Oct '16

27 Oct '16

Vinzenz Feenstra has submitted this change and it was merged. Change subject: Report session-startup on refresh ...................................................................... Report session-startup on refresh To show that we support session-startup and session-shutdown we need to send upon receiving a refresh message also the session-startup message. Otherwise VDSM will assume that we do not support session-{startup,shutdown} reporting. Change-Id: Ia19348cd66552fcf029d6725ba78e22619ce77e9 Backport-To: 4.0 Bug-Url: https://bugzilla.redhat.com/1341106 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M ovirt-guest-agent/OVirtAgentLogic.py M tests/message_validator.py 2 files changed, 11 insertions(+), 6 deletions(-) Approvals: Jenkins CI: Passed CI tests Vinzenz Feenstra: Verified; Looks good to me, approved Milan Zamazal: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/65394 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia19348cd66552fcf029d6725ba78e22619ce77e9 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: SchedulingManager#schedule
by amureini＠redhat.com 27 Oct '16

27 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: SchedulingManager#schedule ...................................................................... core: SchedulingManager#schedule The @NotNull constraint introduced on this by 0e4ae6 method caused RunVmCommand to fail with the following error: 2016-10-27 05:31:41,519 ERROR [org.ovirt.engine.core.bll.RunVmOnceCommand] (default task-19) [7b964e35] Exception: javax.validation.UnexpectedTypeException: HV000186: The constraint of type 'javax.validation.constraints.NotNull' defined on 'schedule.<return value>' has multiple matching constraint validators which is due to an additional value handler of type 'org.hibernate.validator.internal.engine.valuehandling.OptionalValueUnwrapper'. It is unclear which value needs validating. Clarify configuration via @UnwrapValidatedValue. This patch removes the problematic annotation and fixes the issue. Change-Id: I60fa11fe9e3805e293334dabc6cff156833e0310 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/65784 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60fa11fe9e3805e293334dabc6cff156833e0310 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 Sivák <msivak(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Yaniv Kaul <ykaul(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in ovirt-engine[master]: core: Remove synchronization of OVirtNodeInfo getInstance
by tnisan＠redhat.com 27 Oct '16

27 Oct '16

Tal Nisan has submitted this change and it was merged. Change subject: core: Remove synchronization of OVirtNodeInfo getInstance ...................................................................... core: Remove synchronization of OVirtNodeInfo getInstance Commit 0736d3c2 removed the pointless null check before the double locking check, this patch now removes the synchronized from the getInstance method as the actual initialization part is taking part in a synchronized block Change-Id: Ibba279dcca897b4496ff90f98449c29bb8adf5dc Signed-off-by: Tal Nisan <tnisan(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/OVirtNodeInfo.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tal Nisan: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/65785 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibba279dcca897b4496ff90f98449c29bb8adf5dc Gerrit-PatchSet: 1 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: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0