Change in ovirt-engine[master]: core: log4j configuration for utils tests
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: log4j configuration for utils tests
......................................................................
core: log4j configuration for utils tests
Introducing log4j configuration for running unit tests in the utils
package.
The configuration is based on the configuration in the bll package,
without the jboss references, which are not relevant in a low-level
project like utils.
Change-Id: I1a4b06f9446f5d19122e20d9abd5436b3e2a886f
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
A backend/manager/modules/utils/src/test/resources/log4j.xml
1 file changed, 176 insertions(+), 0 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4356
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4b06f9446f5d19122e20d9abd5436b3e2a886f
Gerrit-PatchSet: 2
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Cleanup OpenSslCAWrapperTest
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Cleanup OpenSslCAWrapperTest
......................................................................
core: Cleanup OpenSslCAWrapperTest
Added @PowerMockIgnore on log4j clases to prevent useless error from
being printed to the screen during the build process.
Change-Id: If871d53596c669026d9dbb194eff89061a7c9972
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4355
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If871d53596c669026d9dbb194eff89061a7c9972
Gerrit-PatchSet: 2
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Cleanup MinaInstallWrapperTimeoutTest
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Cleanup MinaInstallWrapperTimeoutTest
......................................................................
core: Cleanup MinaInstallWrapperTimeoutTest
Removed unused log, and suppressed a null warning wrongfully detected by
Eclipse IDE.
Change-Id: I0724853e5d0f614b15bc3efe3ad11634a2a0ab14
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/MinaInstallWrapperTimeoutTest.java
1 file changed, 9 insertions(+), 12 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4354
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0724853e5d0f614b15bc3efe3ad11634a2a0ab14
Gerrit-PatchSet: 2
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Cleanup TransactionSupportTest
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Cleanup TransactionSupportTest
......................................................................
core: Cleanup TransactionSupportTest
Use non-deprecated @Mock annotation, and ignore power-mocking log4j
classes.
Change-Id: I512cf7a174797af429c3d447f4fa7f2d57072bab
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/transaction/TransactionSupportTest.java
1 file changed, 21 insertions(+), 15 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4353
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I512cf7a174797af429c3d447f4fa7f2d57072bab
Gerrit-PatchSet: 2
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Cleanup RandomUtils
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Cleanup RandomUtils
......................................................................
core: Cleanup RandomUtils
Added missing @Overrider annotationm and replaced FQCN
java.util.Random with import.
Change-Id: I85c9535c7566bae24ff3d92f50f555349b7cb16d
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/RandomUtils.java
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4352
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85c9535c7566bae24ff3d92f50f555349b7cb16d
Gerrit-PatchSet: 2
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Better syntax for MockConfigRule
by lhornyak@redhat.com
Laszlo Hornyak has submitted this change and it was merged.
Change subject: core: Better syntax for MockConfigRule
......................................................................
core: Better syntax for MockConfigRule
Added the static mockConfig utility to allow handling all the mocking in
a single line, when the rule is created.
LdapSearchQueryTestBase was updated with the new syntax as an exmaple.
Change-Id: Iace3e7735e3e30b99a0d597f08980874c6826ef5
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapSearchQueryTestBase.java
M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigRule.java
2 files changed, 71 insertions(+), 17 deletions(-)
Approvals:
Laszlo Hornyak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4260
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iace3e7735e3e30b99a0d597f08980874c6826ef5
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: db - prevent installing same script content twice
by emesika@redhat.com
Eli Mesika has submitted this change and it was merged.
Change subject: core: db - prevent installing same script content twice
......................................................................
core: db - prevent installing same script content twice
This patch should resolve the following scenario:
Example:
database last installed script is 03010130
latest database version file in repository 03010250
There is a need to install 03010250 without the 03010140 - 03010240 scripts because
03010140 - 03010240 deals with new feature A and 03010250 deals with new feature B
and we currently want to skip feature A changes from some reason (stability, etc.)
The way to do that is to copy 03010250 file as 03010131 and run the upgrade regularly
(you will not be able to run the original 03010250 directly without this change)
However, later we want to take feature A and all latest scripts , we have again 03010250
Running it again may lead to an ERROR if we are lucky (since upgrade scrips are not reentrant)
or to data corruption in the worst case.
This patch ensure that 03010250 will be skipped and a comment will be inserted to the schema_verson table
(in a new comment column added to that table in the pre_upgrade step) saying that 03010250 state is SKIPPED
since it was already installed by 03010131.
The patch is based on checking the file md5 and comparing it to the md5 of installed scripts inside the
schema_version table.
Change-Id: Id41a4b9406a9e60de783f779c9a51e5de7ce7676
Signed-off-by: Eli Mesika <emesika(a)redhat.com>
---
M backend/manager/dbscripts/dbfunctions.sh
A backend/manager/dbscripts/upgrade/pre_upgrade/add_comment_col_to_schema_version.sql
2 files changed, 30 insertions(+), 11 deletions(-)
Approvals:
Eli Mesika: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4169
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id41a4b9406a9e60de783f779c9a51e5de7ce7676
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: webadmin: Allow disk interface type to be changed
by tnisan@redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: Allow disk interface type to be changed
......................................................................
webadmin: Allow disk interface type to be changed
Change-Id: Ia72e094837521d53af918a6cb32b691331e5b8d7
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Tal Nisan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4262
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia72e094837521d53af918a6cb32b691331e5b8d7
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
12 years, 7 months
Change in ovirt-engine-sdk[master]: __extendCollection miss one argument, add it
by mpastern@redhat.com
Michael Pasternak has submitted this change and it was merged.
Change subject: __extendCollection miss one argument, add it
......................................................................
__extendCollection miss one argument, add it
one call to the __extendCollection method are missing one of
the mandatory parameters, fix it.
Change-Id: Ibf05865c7248448d5f69b7fe93317dd5d159e4fa
Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
---
M src/codegen/main.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Michael Pasternak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4287
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf05865c7248448d5f69b7fe93317dd5d159e4fa
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine-sdk
Gerrit-Branch: master
Gerrit-Owner: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Adam Litke <agl(a)us.ibm.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
12 years, 7 months
Change in ovirt-engine[master]: webadmin: edit cluster policy doesn't open
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: edit cluster policy doesn't open
......................................................................
webadmin: edit cluster policy doesn't open
Change-Id: If818f056c1537ab6e01c57815116a2866c54ee2c
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/cluster/ClusterPolicyPopupPresenterWidget.java
1 file changed, 1 insertion(+), 11 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4351
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If818f056c1537ab6e01c57815116a2866c54ee2c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
12 years, 7 months