Change in ovirt-engine[master]: core: AuditLogDirectorTest: use JDKs' emptyMap
by yzaslavs@redhat.com
Yair Zaslavsky has submitted this change and it was merged.
Change subject: core: AuditLogDirectorTest: use JDKs' emptyMap
......................................................................
core: AuditLogDirectorTest: use JDKs' emptyMap
Replaced the usage of MapUtils.EMPTY_MAP with the standard JDK approach
of Collections.emptyMap()
Change-Id: If05c11a887e2272683db08d8763a77f384512966
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Allon Mureinik: Verified
Yair Zaslavsky: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6579
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If05c11a887e2272683db08d8763a77f384512966
Gerrit-PatchSet: 1
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: AuditLogDirectorTest: partial UnPowerMock
by yzaslavs@redhat.com
Yair Zaslavsky has submitted this change and it was merged.
Change subject: core: AuditLogDirectorTest: partial UnPowerMock
......................................................................
core: AuditLogDirectorTest: partial UnPowerMock
Used regular Mockito (instead of PowerMock) to mock DbFacade's behaviour
in AuditLogDirectorTest.
This change is incomplete, but it's a step in the right direction of
totally eliminating PowerMock from the project.
Change-Id: I77b34c76484feaa18887501fa40c55a7868f843b
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirectorTest.java
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Allon Mureinik: Verified
Yair Zaslavsky: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6578
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77b34c76484feaa18887501fa40c55a7868f843b
Gerrit-PatchSet: 1
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: Laszlo Hornyak <lhornyak(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core:After VM migration fail, dead lock is reached on the en...
by mkublin@redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core:After VM migration fail, dead lock is reached on the engine.log (#840553)
......................................................................
core:After VM migration fail, dead lock is reached on the engine.log (#840553)
https://bugzilla.redhat.com/840553
The bug was caused by JobRepository, in order to fix a deadlock order of operation was changed
from now all operation will be done on job table and after that on all other tables
Change-Id: I4fb5fb5b332a030678085ac21d72233f244e56c5
Signed-off-by: Michael Kublin <mkublin(a)redhat.com>
---
M backend/manager/dbscripts/job_sp.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java
2 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6568
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4fb5fb5b332a030678085ac21d72233f244e56c5
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: QueriesCommandTest: removed wrong test
by rgolan@redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: core: QueriesCommandTest: removed wrong test
......................................................................
core: QueriesCommandTest: removed wrong test
Removed a test in QueriesCommandBase that essentially checked that
the construction of a query from VdcQueryType works.
First, this test should not be here.
Second, since several queries init static blocks that depend on external
resources (that should be mocked, but aren't here), it may cause other
tests to fail.
Change-Id: I9f8d5df49dbe78a8288021567907e31ff53a75a3
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/QueriesCommandBaseTest.java
1 file changed, 0 insertions(+), 40 deletions(-)
Approvals:
Allon Mureinik: Verified
Roy Golan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6570
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f8d5df49dbe78a8288021567907e31ff53a75a3
Gerrit-PatchSet: 1
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: Roy Golan <rgolan(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: import task SD is unknown (#840874)
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: core: import task SD is unknown (#840874)
......................................................................
core: import task SD is unknown (#840874)
https://bugzilla.redhat.com/840874
adding storage domain name to getJobMessageProperties
Change-Id: I7ee1faa0171b2c55e4bdca40845f8102f454051f
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java
M backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Gilad Chaplik: Verified
Moti Asayag: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6565
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee1faa0171b2c55e4bdca40845f8102f454051f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: webadmin: New pool contained template provisioning (#839046)
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: New pool contained template provisioning (#839046)
......................................................................
webadmin: New pool contained template provisioning (#839046)
https://bugzilla.redhat.com/839046
If there are no templates in the environment, than:
Pools->New->Resource Allocation
It contains the Template Provisioning.
The template provisioning makes actually no sense for the
pool dialog, so it never should be there.
It was there, because the logic which disabled it was in the
Template_SelectedItemChanged method which is called when the
selected template changes. The problem is, that when there is
no template in the system at all, this method gets never called.
Fixed by moving this logic into the Initialize method.
Change-Id: I5ade45b807f35161511e352ebd0ffb818730fcee
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6452
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ade45b807f35161511e352ebd0ffb818730fcee
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: engine: Edit Pool shows different RAM than defined (#833829)
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: engine: Edit Pool shows different RAM than defined (#833829)
......................................................................
engine: Edit Pool shows different RAM than defined (#833829)
https://bugzilla.redhat.com/833829
Have a template X with 256 MB memory, than:
Pools->New->select template X->change RAM to 512 MB->save
Than select the newly created pool and Edit.
The memory will be 256 MB.
The problem was, that both the
(New/Existing)PoolModelBehavior classes let the filling of the
window model to the parent class (PoolModelBehaviorBase) which
used the template. It is correct for the
NewPoolModelBehavior but not for the ExistingPoolModelBehavior.
Fixed by generalizing the logic of setting up the window model
to take VmBase instead of VmTemplate and calling this from the
specific classes (New/Existing)PoolModelBehavior with the
correct parameter.
Change-Id: I7fbc3774cdf4ed4209724fd8d5053bbef0a76f7b
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmTemplate.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewPoolModelBehavior.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
6 files changed, 83 insertions(+), 45 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6459
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fbc3774cdf4ed4209724fd8d5053bbef0a76f7b
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: webadmin: Add DiskStorageType enum values to enum translator
by tnisan@redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: webadmin: Add DiskStorageType enum values to enum translator
......................................................................
webadmin: Add DiskStorageType enum values to enum translator
Added DiskStorageType enum values to enum translator to avoid error
message on compile time and in dev mode
Change-Id: I72abea00a3db7060d0caa143c2e719120c5f37ce
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
---
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Tal Nisan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72abea00a3db7060d0caa143c2e719120c5f37ce
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, 5 months
Change in ovirt-engine[master]: webadmin: edit pool dialog freezes when when SD is down (#83...
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: edit pool dialog freezes when when SD is down (#839594)
......................................................................
webadmin: edit pool dialog freezes when when SD is down (#839594)
https://bugzilla.redhat.com/839594
Have a pool on a storage domain which is down.
Go to pool tab, press edit. The window will
stack forever.
Fixed in a way, that the dialog opens the same way as if
the SD would not be down. When the OK button is pressed,
an error comes back from the server.
Fixed by avoiding NPEs and ClassCastExceptions on different
places.
This patch also refactors the Edit method to use the
GetVmDataByPoolId query, which is more efficient than the
AsyncDataProvider.GetVmList and selecting the first element.
Change-Id: Ic9635873a04c71bdf94a011a27dd47cb5c9b259b
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/key_value/KeyValueWidget.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
2 files changed, 243 insertions(+), 218 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6480
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9635873a04c71bdf94a011a27dd47cb5c9b259b
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: packaging: Disable versionlock plugin during upgrade
by oschreib@redhat.com
Ofer Schreiber has submitted this change and it was merged.
Change subject: packaging: Disable versionlock plugin during upgrade
......................................................................
packaging: Disable versionlock plugin during upgrade
Change-Id: Idb1520476e3334f16288b96a0a8c60eb92975534
Signed-off-by: Alex Lourie <alourie(a)redhat.com>
---
M packaging/fedora/setup/engine-upgrade.py
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Ofer Schreiber: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6501
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb1520476e3334f16288b96a0a8c60eb92975534
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com>
12 years, 5 months