Change in ovirt-engine[master]: core: fix quota tests
by mkublin＠redhat.com
Michael Kublin has submitted this change and it was merged.
Change subject: core: fix quota tests
......................................................................
core: fix quota tests
get relevant quota for cluster/storage have changed to get
quotas without any limitation of the other entity.
because getRelatedVdsGroup now doesn't get the other 'only storage' quota
the count is now lower.
Change-Id: I44b2e0efe28c60828c12fafc7a38cd68a9d669d9
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/QuotaDAOTest.java
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Michael Kublin: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6524
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I44b2e0efe28c60828c12fafc7a38cd68a9d669d9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: Remove forking from bll tests
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: Remove forking from bll tests
......................................................................
core: Remove forking from bll tests
Now that there are only very few PowerMock tests left, there is no need
for forking, so it was removed.
This patch reduces the time requried to run bll's test suite by circa
65%-70%.
Change-Id: If54bed027904056c9e09cdebd8b1fb80cd0b5df6
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/pom.xml
1 file changed, 0 insertions(+), 8 deletions(-)
Approvals:
Allon Mureinik: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6528
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If54bed027904056c9e09cdebd8b1fb80cd0b5df6
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: Omer Frenkel <ofrenkel(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: engine: Fetching cluster Id code moved from constructor to c...
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Fetching cluster Id code moved from constructor to canDoAction method.
......................................................................
engine: Fetching cluster Id code moved from constructor to canDoAction method.
It is difficult to write test case without static mocking,
because the code uses DbFacade from constructor.
Hence it is moved to canDoAction.
Change-Id: I187f4fa678389dbbd271d487bbbf2b81e5c0080c
Signed-off-by: Selvasundaram <sesubram(a)redhat.com>
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeCommandBase.java
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Allon Mureinik: Verified; Looks good to me, but someone else must approve
Omer Frenkel: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6365
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I187f4fa678389dbbd271d487bbbf2b81e5c0080c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Selvasundaram <sesubram(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(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, 5 months
Change in ovirt-engine[master]: engine: Static mock removed in gluster command tests
by ofrenkel＠redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: engine: Static mock removed in gluster command tests
......................................................................
engine: Static mock removed in gluster command tests
Change-Id: I23ce2c8cedf2dbcf8a287585fee02aae8d9c2e6d
Signed-off-by: Selvasundaram <sesubram(a)redhat.com>
Signed-off-by: Allon Mureinik <amureini(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/DeleteGlusterVolumeCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterVolumeRemoveBricksCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StartRebalanceGlusterVolumeCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommandTest.java
9 files changed, 181 insertions(+), 332 deletions(-)
Approvals:
Allon Mureinik: Verified
Omer Frenkel: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6392
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I23ce2c8cedf2dbcf8a287585fee02aae8d9c2e6d
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Selvasundaram <sesubram(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(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, 5 months
Change in ovirt-engine[master]: restapi: Don't use network_cluster delegate access
by mkolesni＠redhat.com
Mike Kolesnik has submitted this change and it was merged.
Change subject: restapi: Don't use network_cluster delegate access
......................................................................
restapi: Don't use network_cluster delegate access
Don't use the delegating accessors from Network class to access fields
on the network_cluster field, but access the field directly.
Change-Id: I82c628f339cadd365360688da9cab28cc9e90707
Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com>
---
M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResourceTest.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
2 files changed, 15 insertions(+), 10 deletions(-)
Approvals:
Ori Liel: Looks good to me, approved
Mike Kolesnik: Verified
--
To view, visit http://gerrit.ovirt.org/6513
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I82c628f339cadd365360688da9cab28cc9e90707
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: Change network_cluster status to enum type
by mkolesni＠redhat.com
Mike Kolesnik has submitted this change and it was merged.
Change subject: core: Change network_cluster status to enum type
......................................................................
core: Change network_cluster status to enum type
Status should be enum type and not an int, so change it to be of the
enum type.
Change-Id: I6f68b76f8d0529a1207dd0907819570e765ed08c
Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachNetworkToVdsGroupCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AttachNetworkToVdsGroupParameter.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Network.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network_cluster.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/NetworkClusterDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/NetworkClusterDAOTest.java
8 files changed, 17 insertions(+), 15 deletions(-)
Approvals:
Mike Kolesnik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6512
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f68b76f8d0529a1207dd0907819570e765ed08c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: restapi: Group cluster related fields in mapper
by mkolesni＠redhat.com
Mike Kolesnik has submitted this change and it was merged.
Change subject: restapi: Group cluster related fields in mapper
......................................................................
restapi: Group cluster related fields in mapper
These fields are related to cluster-network attachment, so grouped
together to make them easier to distinguish.
Change-Id: I37207f7985e3fdcde36fb89e9eacc30341456f30
Signed-off-by: Mike Kolesnik <mkolesni(a)redhat.com>
---
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java
M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/NetworkMapperTest.java
2 files changed, 10 insertions(+), 14 deletions(-)
Approvals:
Ori Liel: Looks good to me, approved
Mike Kolesnik: Verified
--
To view, visit http://gerrit.ovirt.org/6511
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37207f7985e3fdcde36fb89e9eacc30341456f30
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Mike Kolesnik <mkolesni(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: webadmin: fix infinite hourglass in quota
by gchaplik＠redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: fix infinite hourglass in quota
......................................................................
webadmin: fix infinite hourglass in quota
Change-Id: Ie86fc63229f4b36494c4882a1c939bd404eebdaa
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaListModel.java
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6522
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie86fc63229f4b36494c4882a1c939bd404eebdaa
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: mark MoveOrCopyTemplateCommand as deprecated
by gchaplik＠redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: core: mark MoveOrCopyTemplateCommand as deprecated
......................................................................
core: mark MoveOrCopyTemplateCommand as deprecated
This command isn't in use.
Change-Id: Ic76ebe45d9812291c58c916658f14bedb5c256d9
Signed-off-by: Gilad Chaplik <gchaplik(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6521
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic76ebe45d9812291c58c916658f14bedb5c256d9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
12 years, 5 months
Change in ovirt-engine[master]: core: Change error message to be more clear
by yzaslavs＠redhat.com
Yair Zaslavsky has submitted this change and it was merged.
Change subject: core: Change error message to be more clear
......................................................................
core: Change error message to be more clear
Changed the message for VDS_REGISTER_UNIQUE_ID_AMBIGUOUS to be:
Cannot add host which has the same unique ID as one of the hosts: ${HostNameList}.
This might occur in case this host was already added to the system.
This message was arpproved by Andrew Cathrow
Change-Id: I8fcddd775c5d25d9f3eed4719f972568a13d9d65
Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/userportal-gwtp/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
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yair Zaslavsky: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/6057
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fcddd775c5d25d9f3eed4719f972568a13d9d65
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com>
Gerrit-Reviewer: Sharad Mishra <snmishra(a)linux.vnet.ibm.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
12 years, 5 months