Change in ovirt-engine[master]: core: MoveOrCopyDiskCommandTest @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: MoveOrCopyDiskCommandTest @Spy annotation
......................................................................
core: MoveOrCopyDiskCommandTest @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy in order to set the ground for using injected mocks in
these tests in the future.
Note that the MoreOrCopyImageGroupParameters#setOperation method had
to be exposed in order to allow overriding its value after the
parameters object was created.
Change-Id: Icdb834aa28e2d54d0c4dfc397d647a82114f4363
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MoveOrCopyImageGroupParameters.java
2 files changed, 39 insertions(+), 30 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
Freddy Rolland: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/64718
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icdb834aa28e2d54d0c4dfc397d647a82114f4363
Gerrit-PatchSet: 13
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: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[master]: core: Pool command tests @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Pool command tests @Spy annotation
......................................................................
core: Pool command tests @Spy annotation
Spy the commands with the @Spy annotation instead of explicitly calling
Mockito.spy. This change has two advantages - first, it's a tad more
elegant, as it saves the duplicate Mockito.spy calls. Second, and more
importantly, it sets the ground for using injected mocks in these tests
in the future.
Change-Id: I8913ed27aeadba957385055122368c718d284077
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmPoolCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmPoolCommandTest.java
3 files changed, 10 insertions(+), 19 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/64661
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8913ed27aeadba957385055122368c718d284077
Gerrit-PatchSet: 12
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>
8 years, 3 months
Change in ovirt-engine[master]: core: MoveOrCopyDiskCommand#init
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: MoveOrCopyDiskCommand#init
......................................................................
core: MoveOrCopyDiskCommand#init
Override the init() method and move the logic from
defineVmTemplate() there, so we don't have to make any database calls
from the constructor.
This change allows us to clean up the test and remove [now] redundant
the MoveOrCopyDiskCommandDummy class.
Change-Id: I32fb4306af2d2e05292cf23614c991d3499627b8
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommandTest.java
2 files changed, 6 insertions(+), 20 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
Freddy Rolland: Looks good to me, but someone else must approve
--
To view, visit https://gerrit.ovirt.org/64717
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32fb4306af2d2e05292cf23614c991d3499627b8
Gerrit-PatchSet: 13
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: Amit Aviram <aaviram(a)redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[master]: core: storage connection command tests @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: storage connection command tests @Spy annotation
......................................................................
core: storage connection command tests @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy. This change has two advantages - first, it's a tad more
elegant, as it saves the duplicate Mockito.spy calls. Second, and more
importantly, it sets the ground for using injected mocks in these tests
in the future.
Change-Id: I2744292707142216c1906c70c5ea5225faf584c4
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/StorageServerConnectionTestCommon.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java
3 files changed, 44 insertions(+), 41 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Jenkins CI: Passed CI tests
Allon Mureinik: Verified
--
To view, visit https://gerrit.ovirt.org/64711
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2744292707142216c1906c70c5ea5225faf584c4
Gerrit-PatchSet: 12
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>
8 years, 3 months
Change in ovirt-engine[master]: core: HotPlugDiskToVmCommandTest @Spy annotation
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: HotPlugDiskToVmCommandTest @Spy annotation
......................................................................
core: HotPlugDiskToVmCommandTest @Spy annotation
Spy the command with the @Spy annotation instead of explicitly calling
Mockito.spy in order to set the ground for using injected mocks in
these tests in the future.
Note that VmCommand initializes its osRepository directly as a data
members with a SimpleDependencyInjector, so it must be mocked before the
command is created - i.e., in a @BeforeClass method in a static context.
Change-Id: Iddf8b1ae36e0466dc4b6e121fbac05789834788f
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/HotPlugDiskToVmCommandTest.java
1 file changed, 13 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/64716
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddf8b1ae36e0466dc4b6e121fbac05789834788f
Gerrit-PatchSet: 13
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: Amit Aviram <aaviram(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[master]: core: Replace VmHandlerRule with injection
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Replace VmHandlerRule with injection
......................................................................
core: Replace VmHandlerRule with injection
The current injection facilities provide a much simpler, safer (as they
don't rely on field name reflection) way to inject dependencies into the
VmHandler.
This patch removes the outdated VmHandlerRule and replaces its usages
with more straight-forward injections.
Change-Id: I795db463f7be8e48e4e51042ba8be10f510f7451
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RunVmCommandTest.java
D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerRule.java
2 files changed, 2 insertions(+), 79 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/65191
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I795db463f7be8e48e4e51042ba8be10f510f7451
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: Arik Hadas <ahadas(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: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[master]: core: Pool command tests line breaks
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Pool command tests line breaks
......................................................................
core: Pool command tests line breaks
Remove redundant line breaks to ease the reading flow.
Change-Id: I06241daa8ab692410bcdaaf3474bb2f9fa29f319
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmPoolCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmPoolCommandTest.java
2 files changed, 2 insertions(+), 4 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/64658
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06241daa8ab692410bcdaaf3474bb2f9fa29f319
Gerrit-PatchSet: 12
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>
8 years, 3 months
Change in ovirt-engine[master]: restapi: Update to model 4.1.15 and metamodel 1.1.7
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Update to model 4.1.15 and metamodel 1.1.7
......................................................................
restapi: Update to model 4.1.15 and metamodel 1.1.7
The more relevant changes in the new version of the model are the
following:
* Add missing `template` and `storage_domain` parameters to the
operation that imports an image.
* Add the `next_run` parameter to the operation that updates a virtual
machine.
* Add the `all_content` parameters to the operations that list and
retrieve virtual machines.
Change-Id: Ic79f394ff485dd28a52f3c1f4f5aa6c91cef56a3
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/65559
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic79f394ff485dd28a52f3c1f4f5aa6c91cef56a3
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
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: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[master]: restapi: Don't add actions to links to slaves of bonds
by juan.hernandez＠redhat.com
Juan Hernandez has submitted this change and it was merged.
Change subject: restapi: Don't add actions to links to slaves of bonds
......................................................................
restapi: Don't add actions to links to slaves of bonds
Currently the links to slaves of bonds contain the 'href' and 'id'
attributes, but also links to nested actions:
<slaves>
<host_nic id="..." href="...">
<actions>
<link href="..." id="..."/>
...
</actions>
</host_nic>
...
</slaves>
This isn't correct, as links should only contain the 'href' and 'id'
attributes, and no nested elements:
<slaves>
<host_nic id="..." href="..."/>
...
</slaves>
This patch solves that problem.
Change-Id: I6571e228be7dd1c1c7b8538e95ad71fa57ed3973
Signed-off-by: Juan Hernandez <juan.hernandez(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dominik Holler: Verified; Looks good to me, but someone else must approve
Juan Hernandez: Verified; Looks good to me, approved
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/65593
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6571e228be7dd1c1c7b8538e95ad71fa57ed3973
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Dominik Holler <dholler(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months
Change in ovirt-engine[ovirt-engine-4.0.5]: build: post ovirt-engine-4.0.5.2
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: build: post ovirt-engine-4.0.5.2
......................................................................
build: post ovirt-engine-4.0.5.2
Change-Id: Ib8e3582f4be2ab1a654faa4bf763ca726e606ba1
Signed-off-by: Rafael Martins <rmartins(a)redhat.com>
---
M automation/build-artifacts.sh
M backend/manager/dependencies/common/pom.xml
M backend/manager/dependencies/pom.xml
M backend/manager/dependencies/tools/pom.xml
M backend/manager/extensions-tool/pom.xml
M backend/manager/modules/aaa/pom.xml
M backend/manager/modules/auth-plugin/pom.xml
M backend/manager/modules/bll/pom.xml
M backend/manager/modules/branding/pom.xml
M backend/manager/modules/builtin-extensions/pom.xml
M backend/manager/modules/common/pom.xml
M backend/manager/modules/compat/pom.xml
M backend/manager/modules/dal/pom.xml
M backend/manager/modules/docs/pom.xml
M backend/manager/modules/enginesso/pom.xml
M backend/manager/modules/extensions-api-root/extensions-api/pom.xml
M backend/manager/modules/extensions-api-root/pom.xml
M backend/manager/modules/extensions-manager/pom.xml
M backend/manager/modules/logger/pom.xml
M backend/manager/modules/pom.xml
M backend/manager/modules/restapi/interface/common/jaxrs/pom.xml
M backend/manager/modules/restapi/interface/common/pom.xml
M backend/manager/modules/restapi/interface/definition/pom.xml
M backend/manager/modules/restapi/interface/pom.xml
M backend/manager/modules/restapi/jaxrs/pom.xml
M backend/manager/modules/restapi/pom.xml
M backend/manager/modules/restapi/types/pom.xml
M backend/manager/modules/restapi/webapp/pom.xml
M backend/manager/modules/root/pom.xml
M backend/manager/modules/scheduler/pom.xml
M backend/manager/modules/searchbackend/pom.xml
M backend/manager/modules/services/pom.xml
M backend/manager/modules/utils/pom.xml
M backend/manager/modules/uutils/pom.xml
M backend/manager/modules/vdsbroker/pom.xml
M backend/manager/modules/welcome/pom.xml
M backend/manager/pom.xml
M backend/manager/tools/pom.xml
M backend/pom.xml
M build-tools-root/checkstyles/pom.xml
M build-tools-root/ovirt-checkstyle-extension/pom.xml
M build-tools-root/ovirt-findbugs-filters/pom.xml
M build-tools-root/pom.xml
M build/validations/pom.xml
M ear/pom.xml
M frontend/pom.xml
M frontend/webadmin/modules/frontend-symbols/pom.xml
M frontend/webadmin/modules/frontend/pom.xml
M frontend/webadmin/modules/gwt-common/pom.xml
M frontend/webadmin/modules/gwt-extension/pom.xml
M frontend/webadmin/modules/pom.xml
M frontend/webadmin/modules/uicommonweb/pom.xml
M frontend/webadmin/modules/uicompat/pom.xml
M frontend/webadmin/modules/userportal-gwtp/pom.xml
M frontend/webadmin/modules/webadmin/pom.xml
M frontend/webadmin/pom.xml
M mavenmake/pom.xml
M pom.xml
M version.mak
59 files changed, 66 insertions(+), 63 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, approved
Simone Tiraboschi: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Rafael Martins: Verified
--
To view, visit https://gerrit.ovirt.org/65592
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8e3582f4be2ab1a654faa4bf763ca726e606ba1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0.5
Gerrit-Owner: Rafael Martins <rmartins(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.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: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 3 months