Change in ovirt-hosted-engine-setup[master]: automation: fix isort checkings
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: automation: fix isort checkings
......................................................................
automation: fix isort checkings
fixed isort checking. The test was not running
on fc24 due to missing package in check-patch.packages
Change-Id: I872de5966348af77534973c2c2f8d63f310488a1
Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com>
---
M .isort.cfg
A automation/check-patch.packages.fc24
M src/ovirt_hosted_engine_setup/engineapi.py
M src/ovirt_hosted_engine_setup/pkissh.py
M src/plugins/gr-he-common/network/bridge.py
M src/plugins/gr-he-common/sanlock/lockspace.py
M src/plugins/gr-he-common/vm/boot_disk.py
M src/plugins/gr-he-common/vm/cloud_init.py
M src/plugins/gr-he-setup/engine/add_host.py
M src/plugins/gr-he-setup/network/firewall_manager.py
M src/plugins/gr-he-setup/pki/vdsmpki.py
M src/plugins/gr-he-setup/storage/storage.py
M src/plugins/gr-he-upgradeappliance/engine/misc.py
M src/plugins/gr-he-upgradeappliance/vm/configurevm.py
14 files changed, 30 insertions(+), 29 deletions(-)
Approvals:
Sandro Bonazzola: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64998
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I872de5966348af77534973c2c2f8d63f310488a1
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: Rafael Martins <rmartins(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[master]: webadmin: Fix coverity issue in VmModelBehaviorBase
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: Fix coverity issue in VmModelBehaviorBase
......................................................................
webadmin: Fix coverity issue in VmModelBehaviorBase
This fixes Coverity issue 1353386 (logical dead code in
VmModelBehaviorBase:901)
Change I4706419295d67f7a022a85bc61f75bb46def2b6b made CPU pinning always
available for local data centers yet failed to remove the remaining logic
this patch removes it.
Change-Id: Ic4e8d7b87367354b6202d70e98c7ab0663ad1b46
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants.properties
3 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
Tal Nisan: Verified
Jenkins CI: Passed CI tests
Martin Betak: Looks good to me, approved
Allon Mureinik: Looks good to me, but someone else must approve
Idan Shaby: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/65137
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4e8d7b87367354b6202d70e98c7ab0663ad1b46
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(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: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine-sdk-java[master]: Add slf4j-log4j as test dependency
by omachace＠redhat.com
Ondra Machacek has submitted this change and it was merged.
Change subject: Add slf4j-log4j as test dependency
......................................................................
Add slf4j-log4j as test dependency
This way the debug output of tests, and the debug output generated when
running examples from the IDE, is written to the standard output, as
configured in the 'src/test/resources/log4j.xml' file, otherwise it is
just ignored.
Change-Id: Icb86a8c4a47d57f02d3cd546bc46405e35e514b8
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M sdk/pom.xml
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Ondra Machacek: Looks good to me, approved
Juan Hernandez: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/65628
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb86a8c4a47d57f02d3cd546bc46405e35e514b8
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine-sdk-java
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ondra Machacek <omachace(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[master]: core: AddAffinityGroupCommandTest @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: AddAffinityGroupCommandTest @Spy annotation
......................................................................
core: AddAffinityGroupCommandTest @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy in order to use injected mocks instead of explicitly
spying their return.
Note that as the order of execution between @Mock and @Spy can't be
relied upon the parameters objects was converted from a mock to a real
instance. As this object is a simple data-POJO, there is no real reason
to mock it anyway, and doing so just adds complexity to the test.
Change-Id: I0daa7eedb9b63fa78e8eb11a12e43bc705e4165c
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/commands/AddAffinityGroupCommandTest.java
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Roman Mohr: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64779
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0daa7eedb9b63fa78e8eb11a12e43bc705e4165c
Gerrit-PatchSet: 17
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: Roman Mohr <rmohr(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>
8 years, 2 months
Change in ovirt-engine[master]: core: VM Numa command test setup unification
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: VM Numa command test setup unification
......................................................................
core: VM Numa command test setup unification
Reworked the VM numa command test classes to have a unified setup,
as they all currently copy-paste very similar boiler-plate code.
As part of this reworking, a single command instance is annotated with
a @Spy annotation in order to prepare this test for injecting DAOs as
done in the subsequent patches.
With this patch, the class is left with a single command instance
which has a single instance of a list of numa nodes.
Since these issues remain between tests, they need to be cleaned up in
an @After method.
Change-Id: Id6e9746f4cba3767e4948ae066149226927ee352
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
---
A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/AbstractVmNumaNodeCommandTestBase.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/AddVmNumaNodesCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/RemoveVmNumaNodesCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/SetVmNumaNodesCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/numa/vm/UpdateVmNumaNodesCommandTest.java
5 files changed, 226 insertions(+), 398 deletions(-)
Approvals:
Tal Nisan: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64778
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6e9746f4cba3767e4948ae066149226927ee352
Gerrit-PatchSet: 17
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Roman Mohr <rmohr(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>
8 years, 2 months
Change in ovirt-engine[master]: core: RemoveAuditLogByIdCommandTest @Before annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: RemoveAuditLogByIdCommandTest @Before annotation
......................................................................
core: RemoveAuditLogByIdCommandTest @Before annotation
Use the @Before annotation to set up the test instead of having to
explicitly call prepareMocks(command) in each test case.
Change-Id: I9a675e257aad9eb5fd3b57178485ab3328566b7e
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java
1 file changed, 3 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/64789
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a675e257aad9eb5fd3b57178485ab3328566b7e
Gerrit-PatchSet: 17
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>
8 years, 2 months
Change in ovirt-engine[master]: core: RemoveAuditLogByIdCommandTest @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: RemoveAuditLogByIdCommandTest @Spy annotation
......................................................................
core: RemoveAuditLogByIdCommandTest @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy in order to facilitate using injected mocks instead of
explicitly spying their return.
Change-Id: I64e61b8e67d046d01b012359f6cb8bb2fa6c550b
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveAuditLogByIdCommandTest.java
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64788
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64e61b8e67d046d01b012359f6cb8bb2fa6c550b
Gerrit-PatchSet: 17
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>
8 years, 2 months
Change in ovirt-engine[master]: core: AbstractRolesCommandTestBase @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: AbstractRolesCommandTestBase @Spy annotation
......................................................................
core: AbstractRolesCommandTestBase @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy in order to use injected mocks instead of explicitly
spying their return.
Change-Id: I97ce644bd73c75e12485e98f981806df8d833304
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractRolesCommandTestBase.java
1 file changed, 7 insertions(+), 5 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
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64787
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97ce644bd73c75e12485e98f981806df8d833304
Gerrit-PatchSet: 17
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: Ravi Nori <rnori(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[master]: core: AttachNetworkToClusterInternalCommandTest stubbing
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: AttachNetworkToClusterInternalCommandTest stubbing
......................................................................
core: AttachNetworkToClusterInternalCommandTest stubbing
Remove TestAttachNetworkToClusterCommand and replace it with a standard
@Spy instance.
In order to accomplish this, AuditLogableBase#getNetworkClusterDao and
AuditLogableBase#getNetworkDao had to be made public like the other
getXYZDao methods in that class.
Note that they will be removed and replaced with injection at the end of
this series anyway.
Change-Id: I4db8895ed8ce9bd564c92cdad4eb21d8495fa35e
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
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/gluster/GlusterCommandBase.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToClusterInternalCommandTest.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
5 files changed, 17 insertions(+), 56 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64786
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4db8895ed8ce9bd564c92cdad4eb21d8495fa35e
Gerrit-PatchSet: 17
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>
8 years, 2 months
Change in ovirt-engine[master]: core: UpdateRngDeviceTest annotations
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: UpdateRngDeviceTest annotations
......................................................................
core: UpdateRngDeviceTest annotations
Convert mocking and spying to annotations as per the project's
standard in order to facilitate injecting mocks in the following
patches.
Change-Id: Id4c6a26723852cd5a1e56b8d3d6d9541dd4ac9e0
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateRngDeviceTest.java
1 file changed, 21 insertions(+), 12 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jakub Niedermertl: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64785
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4c6a26723852cd5a1e56b8d3d6d9541dd4ac9e0
Gerrit-PatchSet: 17
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: Jakub Niedermertl <jniederm(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>
8 years, 2 months