Change in ovirt-engine[master]: core: ImportVmCommandStub ctor arguments
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmCommandStub ctor arguments
......................................................................
core: ImportVmCommandStub ctor arguments
The MacPoolPerCluster and the ExternalVmFinder are injected into the
command, so there's no reason to explicitly pass them to the constructor
and save them to the command.
Change-Id: Ib9e5592b14554a75246c950054afee54a0ce4223
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
1 file changed, 12 insertions(+), 26 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64674
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9e5592b14554a75246c950054afee54a0ce4223
Gerrit-PatchSet: 11
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: ImportVmTemplateCommandTest signatures
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmTemplateCommandTest signatures
......................................................................
core: ImportVmTemplateCommandTest signatures
Remove the command parameter from various method signatures as it's now
a member, and should not be passed between methods or returned from
them.
Change-Id: I2536e28b27c0699420e011636c495205fc0dd4d7
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandTest.java
1 file changed, 16 insertions(+), 26 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64687
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2536e28b27c0699420e011636c495205fc0dd4d7
Gerrit-PatchSet: 11
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: ImportVmTemplateCommandTest @Spy annotation
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmTemplateCommandTest @Spy annotation
......................................................................
core: ImportVmTemplateCommandTest @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 allows using injected mocks.
Change-Id: I65a4b8ac7c728e315cad293b1bd8d88139fed8a1
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandTest.java
1 file changed, 23 insertions(+), 28 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64686
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65a4b8ac7c728e315cad293b1bd8d88139fed8a1
Gerrit-PatchSet: 11
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: Split ImportVmTemplateCommandTest test
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: Split ImportVmTemplateCommandTest test
......................................................................
core: Split ImportVmTemplateCommandTest test
Since testOtherFieldsNotValidatedInImpor validates two different
things, it's better style to separate it into two different tests.
Change-Id: Ic621c47ab0dfb7d8a1a8fd5c4ed872fc3cc2436c
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandTest.java
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64685
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic621c47ab0dfb7d8a1a8fd5c4ed872fc3cc2436c
Gerrit-PatchSet: 11
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: ImportVmTemplateCommand#init
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmTemplateCommand#init
......................................................................
core: ImportVmTemplateCommand#init
Move the complicated initializations (e.g., those that need a dao
call) to the init() method, where they belong.
Note that performing this change allows us to remove the redundant
stubbing in the test and rely on Mockito's mocking.
Change-Id: I436c47340566578956aed4cd3e84d0f327e2d9ac
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommand.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandTest.java
2 files changed, 6 insertions(+), 12 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64684
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I436c47340566578956aed4cd3e84d0f327e2d9ac
Gerrit-PatchSet: 11
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: ImportVmTemplateCommandTest local var
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmTemplateCommandTest local var
......................................................................
core: ImportVmTemplateCommandTest local var
Inlined a useless local variable.
Change-Id: I4e03dc351b90bc110b17d45cc7c71e0cbce84295
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandTest.java
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64683
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e03dc351b90bc110b17d45cc7c71e0cbce84295
Gerrit-PatchSet: 11
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: ImportVmCommandTest ClusterDao
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmCommandTest ClusterDao
......................................................................
core: ImportVmCommandTest ClusterDao
Remove the redundant ClusterDao mocking.
Change-Id: Ie65acd7eda5e472fae9c25418a9fd3975f88d41c
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Martin Betak: Looks good to me, but someone else must approve
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64682
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie65acd7eda5e472fae9c25418a9fd3975f88d41c
Gerrit-PatchSet: 11
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: ImportVmCommandTest single command instance
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmCommandTest single command instance
......................................................................
core: ImportVmCommandTest single command instance
Rework the test to use a single command instance, annotated with @Spy
and @InjectMocks in order to reduce code duplication and allow easier
injections.
Note that the OsRepository is used to initialize a data member in
VmCommand, so it must be mocked in a static context, before the
command instance is created.
Change-Id: Ieced27c9f6ff5b60ece9a8927133b9b9833804b1
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
1 file changed, 78 insertions(+), 100 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64680
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieced27c9f6ff5b60ece9a8927133b9b9833804b1
Gerrit-PatchSet: 11
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: ImportVmCommandTest rules
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmCommandTest rules
......................................................................
core: ImportVmCommandTest rules
Remove the InjectorRule - there's one defined in the base class, and
there's no point in having two of them.
Change-Id: I7cb62fa6c6463cb66ac8ef8584a529f0064913fe
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64679
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb62fa6c6463cb66ac8ef8584a529f0064913fe
Gerrit-PatchSet: 11
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: ImportVmCommandStub: remove redundant ctor
by amureini@redhat.com
Allon Mureinik has submitted this change and it was merged.
Change subject: core: ImportVmCommandStub: remove redundant ctor
......................................................................
core: ImportVmCommandStub: remove redundant ctor
Removed a constructor that was just used by another constructor as part
of the effort to remove this class completely.
Change-Id: Icaca3f5545f68a75d383db5666f5a434570a547b
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
1 file changed, 1 insertion(+), 13 deletions(-)
Approvals:
Tal Nisan: Looks good to me, approved
Allon Mureinik: Verified; Passed CI tests
--
To view, visit https://gerrit.ovirt.org/64673
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icaca3f5545f68a75d383db5666f5a434570a547b
Gerrit-PatchSet: 11
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