Change in ovirt-engine[master]: core: UnPowerMock GetUserVmsByUserIdAndGroupsQueryTest
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: UnPowerMock GetUserVmsByUserIdAndGroupsQueryTest
......................................................................
core: UnPowerMock GetUserVmsByUserIdAndGroupsQueryTest
Removed PowerMock depedency from GetUserVmsByUserIdAndGroupsQueryTest,
and replaced it by spying the query's protected methods.
In order to achieve this improvement, some refactoring was required in
GetUserVmsByUserIdAndGroupsQuery and in
GetUserVmsByUserIdAndGroupsQueryTest. First, some protected metods were
extracted to prevent executeQuery() to call VmHandler and ImagesHandler
directly. Second, the test itslef was slightly simplified so it would
actually test the query's flow and not the underlying handlers'
implementations - which is not appropriate in a UNIT test.
Change-Id: I82f99e6deeb0df9b44bfdbfc41f5da675af858e8
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQuery.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetUserVmsByUserIdAndGroupsQueryTest.java
2 files changed, 22 insertions(+), 26 deletions(-)
Approvals:
Michael Kublin: Looks good to me, approved
Allon Mureinik: Verified; Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/4933
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82f99e6deeb0df9b44bfdbfc41f5da675af858e8
Gerrit-PatchSet: 8
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: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(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: UnPowerMock Hot[Un]PlugDiskToVmCommandTest
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: UnPowerMock Hot[Un]PlugDiskToVmCommandTest
......................................................................
core: UnPowerMock Hot[Un]PlugDiskToVmCommandTest
Removed PowerMock depedency from HotPlugDiskToVmCommandTest and
HotUnPlugDiskToVmCommandTest and replaced it with spying the commands'
DAOs and the new MockConfigRule.
Change-Id: I43236e55964a67422b5762a412744edade44d5e5
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotUnPlugDiskFromVmCommandTest.java
2 files changed, 37 insertions(+), 34 deletions(-)
Approvals:
Michael Kublin: Looks good to me, approved
Allon Mureinik: Verified; Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/4934
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43236e55964a67422b5762a412744edade44d5e5
Gerrit-PatchSet: 8
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: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(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: Remove ConfigMocker
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: Remove ConfigMocker
......................................................................
core: Remove ConfigMocker
Removed the old, deprecated ConfigMocker utility which assumes PowerMock
usage.
Instead, use MockConfigRule, as described in
http://ovirt.org/wiki/MockConfigRule.
Change-Id: I8e0acd709531f12ef7e67fe4d9c5ce8a1be29792
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ConfigMocker.java
1 file changed, 0 insertions(+), 51 deletions(-)
Approvals:
Michael Kublin: Looks good to me, approved
Allon Mureinik: Verified; Looks good to me, but someone else must approve
--
To view, visit http://gerrit.ovirt.org/4935
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e0acd709531f12ef7e67fe4d9c5ce8a1be29792
Gerrit-PatchSet: 8
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: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: nic validations on running VM
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: core: nic validations on running VM
......................................................................
core: nic validations on running VM
This patch does some changes and additional validations when running a
VM:
1. Check that the networks are defined in the cluster.
2. Check that the networks are configured in the VM interface (they can
be empty due to import of non-existing networks)
3. Change error messages + adding new ones.
Change-Id: I1b7d9b5f879b17f384d8a2b540fa6f6b55bf8f46
Signed-off-by: Oved Ourfali <oourfali(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmInterfaceCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Entities.java
M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/EntitiesTest.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/userportal/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
11 files changed, 129 insertions(+), 14 deletions(-)
Approvals:
Oved Ourfali: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5054
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1b7d9b5f879b17f384d8a2b540fa6f6b55bf8f46
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Permission filtering for GetAllVmTemplates query. (#78...
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: core: Permission filtering for GetAllVmTemplates query. (#783087)
......................................................................
core: Permission filtering for GetAllVmTemplates query. (#783087)
https://bugzilla.redhat.com/783087
Support for permission filtering for 'GetAllVmTemplates' query.
Change-Id: I78b5078dcdcfcf01a6b95f444975b2d8c75996cc
Signed-off-by: Asaf Shakarchi <asaf(a)redhat.com>
---
M backend/manager/dbscripts/vm_templates_sp.sql
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllVmTemplatesQuery.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAO.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmTemplateDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDAOTest.java
6 files changed, 57 insertions(+), 5 deletions(-)
Approvals:
Tal Nisan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5104
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78b5078dcdcfcf01a6b95f444975b2d8c75996cc
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Asaf Shakarchi <asaf(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Asaf Shakarchi <asaf(a)redhat.com>
Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: webadmin: Filter search objects according to main model avai...
by gchaplik＠redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: Filter search objects according to main model availability
......................................................................
webadmin: Filter search objects according to main model availability
ApplicationMode value impacts the availability (Model.getIsAvailable)
of main models, which indicates if those models should be accessible
on UI (by showing main tab, by changing URL place token, etc.).
This patch modifies search suggestion logic so that main models,
which are not available, will be excluded from search object suggestions.
Change-Id: Ibcd3026a0b2fb6ce9bbd19613a4ff42cac034f43
Signed-off-by: Vojtech Szocs <vszocs(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
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/events/EventListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/SearchPanelPresenterWidget.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/SearchPanelView.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/autocomplete/SearchSuggestOracle.java
18 files changed, 155 insertions(+), 46 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5036
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcd3026a0b2fb6ce9bbd19613a4ff42cac034f43
Gerrit-PatchSet: 5
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: Kanagaraj M <kmayilsa(a)redhat.com>
Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: userportal: ClassCastException when edit a VM
by gchaplik＠redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: userportal: ClassCastException when edit a VM
......................................................................
userportal: ClassCastException when edit a VM
In user portal extended view:
VM side tab -> select a VM -> press edit
A ClassCastException is thrown from the VmModelBehaviorBase.
The problem was, that it called the
AsyncDataProvider.GetIrsImageList() which returns an
ArrayList but it tried to convert it to VdcQueryReturnValue.
This patch fixes this problem.
Change-Id: Ifb88dd255ef8efc6f36b28038ed38ae48f213fac
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5075
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb88dd255ef8efc6f36b28038ed38ae48f213fac
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>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: engine: Changed string "host" to "server" in gluster related...
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Changed string "host" to "server" in gluster related messages
......................................................................
engine: Changed string "host" to "server" in gluster related messages
Change-Id: I35461f84c2f3b8f2d7dd720cd27eb7ba0ecdbde5
Signed-off-by: Dhandapani <dgopal(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
4 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Omer Frenkel: Looks good to me, approved
Dhandapani Gopal: Verified
--
To view, visit http://gerrit.ovirt.org/4972
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35461f84c2f3b8f2d7dd720cd27eb7ba0ecdbde5
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dhandapani Gopal <dgopal(a)redhat.com>
Gerrit-Reviewer: Dhandapani Gopal <dgopal(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Selvasundaram <sesubram(a)redhat.com>
Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: engine: Fix for GUI should check for volume name uniqueness
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Fix for GUI should check for volume name uniqueness
......................................................................
engine: Fix for GUI should check for volume name uniqueness
https://bugzilla.redhat.com/826454
Added the can do action to check whether volume name already exists.
Change-Id: I6a0c36273fafdf4acd7a37a21de04a989ba18656
Signed-off-by: Dhandapani <dgopal(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
4 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/4963
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a0c36273fafdf4acd7a37a21de04a989ba18656
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dhandapani Gopal <dgopal(a)redhat.com>
Gerrit-Reviewer: Dhandapani Gopal <dgopal(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Selvasundaram <sesubram(a)redhat.com>
Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com>
12 years, 7 months
Change in ovirt-engine[master]: core: Remove AsyncQuery leftovers
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: Remove AsyncQuery leftovers
......................................................................
core: Remove AsyncQuery leftovers
AsyncQuery was removed in a previous patch
(I3734abc8a99ebcfdd8e8c8ea8c6b3a674a139f10).
This patch removed some left-overs that were forgotten in it.
Change-Id: Ia28c0f938ce70c300693320b6a2e6d1b69c71778
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/interfaces/BackendLocal.java
M frontend/api/genericapi/src/main/java/org/ovirt/engine/ui/genericapi/GenericApiService.java
3 files changed, 18 insertions(+), 33 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/5010
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia28c0f938ce70c300693320b6a2e6d1b69c71778
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: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 7 months