October 2016 - Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: webadmin: when breaking bond, we need to remove unmanaged ne...
by masayag＠redhat.com 02 Oct '16

02 Oct '16

Moti Asayag has submitted this change and it was merged. Change subject: webadmin: when breaking bond, we need to remove unmanaged networks as well. ...................................................................... webadmin: when breaking bond, we need to remove unmanaged networks as well. Change-Id: I8a342f0de7db42b8b77a5c394c80d50445dfd31d Bug-Url: https://bugzilla.redhat.com/1360630 Signed-off-by: Martin Mucha <mmucha(a)redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java 1 file changed, 12 insertions(+), 7 deletions(-) Approvals: Martin Mucha: Verified Jenkins CI: Passed CI tests Moti Asayag: Looks good to me, approved Yevgeny Zaspitsky: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/63056 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a342f0de7db42b8b77a5c394c80d50445dfd31d Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki <mmirecki(a)redhat.com> Gerrit-Reviewer: Martin Mucha <mmucha(a)redhat.com> Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek(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: @Spy gluster hooks tests
by amureini＠redhat.com 02 Oct '16

02 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: @Spy gluster hooks tests ...................................................................... core: @Spy gluster hooks tests Clean up the gluster hooks tests to use the @Spy annotation to spy the command under test in order to facilitate injecting dependencies to the command in subsequent patches. - Changing the command being tested to be initialized once and annotated with @Spy and @InjectMocks. - Thus, there is only only command object per test, so all the methods receiving commands as parameters were redone to use the member. - Since the command is now a member, it was removed from method signatures. Change-Id: I79fff2e3fb79f55d7054ff1d58ebb2fae3433e83 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DisableGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/EnableGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommandTest.java 6 files changed, 62 insertions(+), 92 deletions(-) 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/64615 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79fff2e3fb79f55d7054ff1d58ebb2fae3433e83 Gerrit-PatchSet: 5 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: Sahina Bose <sabose(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: AddVdsCommandTest spying
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: AddVdsCommandTest spying ...................................................................... core: AddVdsCommandTest spying Mocking an object and calling doRetrunRealMethod() on most of its methods is essentially spying it, but with the wrong default (a mocked result instead of the real one). Since the command is the actual object we want to test, it should NOT be mocked, and only the relevant parts (e.g., where it interacts with external resources) should be spied away. Change-Id: I804128d81482a83c26b6da595c6b7162f9492a4c Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommandTest.java 1 file changed, 31 insertions(+), 41 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64631 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I804128d81482a83c26b6da595c6b7162f9492a4c 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: Arik Hadas <ahadas(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: InstallVdsInternalCommandTest constants
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: InstallVdsInternalCommandTest constants ...................................................................... core: InstallVdsInternalCommandTest constants Remove unused constants from the class. Change-Id: I717070c195dcbbfea4eab71e3f2837aad91956b1 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommandTest.java 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Ravi Nori: Looks good to me, but someone else must approve Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64629 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I717070c195dcbbfea4eab71e3f2837aad91956b1 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: Arik Hadas <ahadas(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>

1 0

Change in ovirt-engine[master]: core: StartVdsCommandTest @InjectMocks
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: StartVdsCommandTest @InjectMocks ...................................................................... core: StartVdsCommandTest @InjectMocks Use the @InjectMocks annotation to inject mocks to the tested command in order to save some boiler-plated code and make the test cleaner and more concise. Change-Id: I0be6bdb8ac8851c26cd7e27d9a6620364cde49a7 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, 6 insertions(+), 13 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64628 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0be6bdb8ac8851c26cd7e27d9a6620364cde49a7 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: Arik Hadas <ahadas(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: RefreshGlusterHooksCommandTest @Spy
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: RefreshGlusterHooksCommandTest @Spy ...................................................................... core: RefreshGlusterHooksCommandTest @Spy Clean up RefreshGlusterHooksCommandTest to use the @Spy annotation to spy the command under test in order to facilitate injecting dependencies to the command in subsequent patches. - Changing the command being tested to be initialized once and annotated with @Spy and @InjectMocks. - Thus, there is only only command object per test, so all the methods receiving commands as parameters were redone to use the member. Change-Id: Ic761866ad707894d27a84b4a53fba16067722e0f Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64616 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic761866ad707894d27a84b4a53fba16067722e0f Gerrit-PatchSet: 5 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: Sahina Bose <sabose(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: StartVdsCommandTest @Test annotations
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: StartVdsCommandTest @Test annotations ...................................................................... core: StartVdsCommandTest @Test annotations Removed a useless empty argument list from the annotation. Change-Id: Ia2d51eda238319f07b4884b3141eef632b755867 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, 1 insertion(+), 1 deletion(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64627 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2d51eda238319f07b4884b3141eef632b755867 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: Arik Hadas <ahadas(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: AddExternalJobCommandTest mocking
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: AddExternalJobCommandTest mocking ...................................................................... core: AddExternalJobCommandTest mocking Remove the redundant (and wrong!) mocking from the test. Change-Id: Icac78a12426615c1ad284d21f8aa1d649bac9e71 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalJobCommandTest.java 1 file changed, 7 insertions(+), 28 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64637 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icac78a12426615c1ad284d21f8aa1d649bac9e71 Gerrit-PatchSet: 7 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: AddExternalJobCommandTest mock logger
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: AddExternalJobCommandTest mock logger ...................................................................... core: AddExternalJobCommandTest mock logger Remove the unused mocked logger. Change-Id: I3957f3671987c7b77e15d532862cabf4e0286762 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddExternalJobCommandTest.java 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Allon Mureinik: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64636 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3957f3671987c7b77e15d532862cabf4e0286762 Gerrit-PatchSet: 7 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: UpdateVdsCommandTest spying
by amureini＠redhat.com 01 Oct '16

01 Oct '16

Allon Mureinik has submitted this change and it was merged. Change subject: core: UpdateVdsCommandTest spying ...................................................................... core: UpdateVdsCommandTest spying Mocking an object and calling doRetrunRealMethod() on most of its methods is essentially spying it, but with the wrong default (a mocked result instead of the real one). Since the command is the actual object we want to test, it should NOT be mocked, and only the relevant parts (e.g., where it interacts with external resources) should be spied away. Change-Id: I505bfbaead2ea2f5b34971dee4b6dbc074f2fe3b Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommandTest.java 1 file changed, 35 insertions(+), 16 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/64634 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I505bfbaead2ea2f5b34971dee4b6dbc074f2fe3b Gerrit-PatchSet: 7 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 Peřina <mperina(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0