Change in ovirt-engine[master]: core: UnPowerMock AutoRecoveryManagerTest
by mkolesni＠redhat.com
Mike Kolesnik has submitted this change and it was merged.
Change subject: core: UnPowerMock AutoRecoveryManagerTest
......................................................................
core: UnPowerMock AutoRecoveryManagerTest
Removed PowerMock dependency from AutoRecoveryManagerTest, by spying a
AutoRecoveryManager instance.
In order to facilitate this change, getDbFacade() and getBackend()
methods were added to AutoRecoveryManager.
Change-Id: Id1a0d6746e007c87df359bcc8b51ff50da734b55
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AutoRecoveryManagerTest.java
2 files changed, 33 insertions(+), 30 deletions(-)
Approvals:
Mike Kolesnik: Looks good to me, approved
Allon Mureinik: Verified
--
To view, visit http://gerrit.ovirt.org/4635
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1a0d6746e007c87df359bcc8b51ff50da734b55
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: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: webadmin: DirectLun - DiskModel and Disks main-tab
by derez＠redhat.com
Daniel Erez has submitted this change and it was merged.
Change subject: webadmin: DirectLun - DiskModel and Disks main-tab
......................................................................
webadmin: DirectLun - DiskModel and Disks main-tab
* Update DataCenters list in DiskModel.
* Display VMs sub-tab under Disk main-tab for DirectLUN disk.
Change-Id: Iab248e58e612abe9fe0e54db01e140bb9fe48bf3
Signed-off-by: Daniel Erez <derez(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGuideModel.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/popup/vm/VmDiskPopupView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/VmDiskPopupView.java
5 files changed, 46 insertions(+), 17 deletions(-)
Approvals:
Daniel Erez: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4667
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab248e58e612abe9fe0e54db01e140bb9fe48bf3
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: userportal: Guide link doesn't work [ERROR 404] (#809738)
by vszocs＠redhat.com
Vojtech Szocs has submitted this change and it was merged.
Change subject: userportal: Guide link doesn't work [ERROR 404] (#809738)
......................................................................
userportal: Guide link doesn't work [ERROR 404] (#809738)
https://bugzilla.redhat.com/809738
The problem was, that the link to the documentation was
hard coded. Changed to be the same as in WebAdmin, which means:
- at the start of the application the server call is issued
(AsyncDataProvider.GetDocumentationBaseURL) in the
Configurator.updateDocumentationBaseURL(). This reads the
DocsURL field from the vdc_options table. If it is set,
the documentation URL is composed like this:
<module base URL without module name>/<base url>/<lang>/
User_Portal_Guide/index.html
This patch contains the following refactorings:
- The UserPortalConfigurator and WebAdminConfigurator
had quite a lot of logic copy-pasted. It has been
extracted to the parent Configurator class
- The logic which handles the guide link is the same
for web admin and user portal - extracted to newly created
class AbstractHeaderPresenterWidget
Change-Id: I2f1413c4368e983285917525d9c3e881f73f2cdd
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/main/AbstractHeaderPresenterWidget.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/HeaderPresenterWidget.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/HeaderView.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
12 files changed, 403 insertions(+), 473 deletions(-)
Approvals:
Vojtech Szocs: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4507
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f1413c4368e983285917525d9c3e881f73f2cdd
Gerrit-PatchSet: 4
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: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: core: added HotPlugEnabled config option for 2.2 cluster lev...
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: core: added HotPlugEnabled config option for 2.2 cluster level
......................................................................
core: added HotPlugEnabled config option for 2.2 cluster level
Previous patch added this option, but it didn't have a value for 2.2
cluster level. This patch adds this value.
Change-Id: Ibf6426a46885117108a4a9571701c330baaba964
Signed-off-by: Oved Ourfali <oourfali(a)redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/config.sql
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Omer Frenkel: Looks good to me, approved
Oved Ourfali: Verified
--
To view, visit http://gerrit.ovirt.org/4670
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf6426a46885117108a4a9571701c330baaba964
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: core : Fixing a list parameters for direct Lun scenario
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core : Fixing a list parameters for direct Lun scenario
......................................................................
core : Fixing a list parameters for direct Lun scenario
Fixing a list of parameters at direct lun scenario
Change-Id: Ie77e1ee71202179a67d7135801127dbc4876a294
Signed-off-by: Michael Kublin <mkublin(a)redhat.com>
---
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4668
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie77e1ee71202179a67d7135801127dbc4876a294
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: webadmin: StorageModel NPE (#822459)
by vszocs＠redhat.com
Vojtech Szocs has submitted this change and it was merged.
Change subject: webadmin: StorageModel NPE (#822459)
......................................................................
webadmin: StorageModel NPE (#822459)
https://bugzilla.redhat.com/822459
Have a data center "Defaul (NFS, V1)" which can import NO storage, than:
1. open WebAdmin, switch to Storage main tab
2: click Import Domain - immediately a NPE mentioned above is thrown
3: switch Data Center to "(none)"
4: both "Domain Function / Storage Type" and "Use Host"
are correctly filled
5: let in "Domain Function / Storage Type" selected for example on
"Export/NFS"
6: switch the "Data Center" back to "Defaul (NFS, V1)"
7: the gui will show the same filled in "Domain Function / Storage Type"
as was for "(none)" ("Export/NFS" in this case).
There were more problems.
- StorageModel.DataCenter_SelectedItemChanged() called in row the
following methods:
- UpdateItemsAvailability
- UpdateFormat
- UpdateHost
Where the UpdateItemsAvailability after some returns from server calls
prepared the selectedItem on the model, and UpdateHost
(again after some server calls) used it. It was basically random if
the selected item will be prepared when the UpdateHost will need it.
Fixed by moving the call to UpdateFormat and UpdateHost to
StorageModelBehavior.OnStorageModelUpdated() to call them only after
the selectedItem will be prepared.
- The value NULL for selected storage domain is valid. To let the code
deal with it correctly, added some null checks, othervise it fails
on NPE.
- Added resetting of the selected host and selected item to prevent
the remembering of the old value when there is no new value to select.
Change-Id: I62b83fcd60c5db9078ed9fffa46dd0081c2f00eb
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModelBehavior.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/StoragePopupView.java
3 files changed, 40 insertions(+), 23 deletions(-)
Approvals:
Vojtech Szocs: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4545
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62b83fcd60c5db9078ed9fffa46dd0081c2f00eb
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: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: core: using config option for NativeUSB support
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: core: using config option for NativeUSB support
......................................................................
core: using config option for NativeUSB support
Previous patch checked the cluster level to validate the type of USB
support for the VM. This patch extracted it into a config option.
Change-Id: Iba3b6fadc4a0357687d4e9c9266a92f131018982
Signed-off-by: Oved Ourfali <oourfali(a)redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/config.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
3 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
Oved Ourfali: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4666
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3b6fadc4a0357687d4e9c9266a92f131018982
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: engine: fixed integer comparison bug
by yzaslavs＠redhat.com
Yair Zaslavsky has submitted this change and it was merged.
Change subject: engine: fixed integer comparison bug
......................................................................
engine: fixed integer comparison bug
Found by find-bug in jenkins build.
Integer variables were being compared using ==
whereas they should be compared using equals
Change-Id: Id5dbf11d45890062ada7718dd6a069bd2ab51465
Signed-off-by: Shireesh Anjal <sanjal(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Shireesh Anjal: Verified
Yair Zaslavsky: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4658
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5dbf11d45890062ada7718dd6a069bd2ab51465
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shireesh Anjal <sanjal(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: userportal, webadmin: Add GlusterTaskOperation to Common.gwt....
by vszocs＠redhat.com
Vojtech Szocs has submitted this change and it was merged.
Change subject: userportal,webadmin: Add GlusterTaskOperation to Common.gwt.xml
......................................................................
userportal,webadmin: Add GlusterTaskOperation to Common.gwt.xml
This removes the "No source code is available for type
GlusterTaskOperation" validation error message during
GWT compilation.
Change-Id: I8516081755bfac55526ff51d97082e6a941878cd
Signed-off-by: Vojtech Szocs <vszocs(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Vojtech Szocs: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4626
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8516081755bfac55526ff51d97082e6a941878cd
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
12 years, 1 month
Change in ovirt-engine[master]: core : Fixing direct lun scenario
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core : Fixing direct lun scenario
......................................................................
core : Fixing direct lun scenario
The following fix should solve a problem which are occurring at direct lun scenario
Change-Id: I5a489839c939c36d0f7c7ee66208a69c32bf4d16
Signed-off-by: Michael Kublin <mkublin(a)redhat.com>
---
M backend/manager/dbscripts/storages_san_sp.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractDiskVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectAllHostsToLunCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAO.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOHibernateImpl.java
10 files changed, 73 insertions(+), 20 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4662
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a489839c939c36d0f7c7ee66208a69c32bf4d16
Gerrit-PatchSet: 3
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: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 1 month