-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/9541/
-----------------------------------------------------------
(Updated Feb. 25, 2013, 12:46 p.m.)
Review request for cloudstack, Devdeep Singh and Min Chen.
Changes
-------
Resolved conflicts cause by storage related checkins.
Description
-------
CLOUDSTACK-1156: Limit Primary and Secondary storage for domain/accounts
Addition of two new resource types i.e. Primary and Secondary storage space
in the existing pool of
resource types.
Added methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls
in the
Templates, Volumes, Snapshots life cycle to check these limits and to
increment/decrement the new
resource types
Resource Name :: Resource type number
Primary Storage 10
Secondary Storage 11
Also added jUnit Tests for the same.
This addresses bug CLOUDSTACK-1156.
Diffs (updated)
-----
api/src/com/cloud/configuration/Resource.java 7614c8a
api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java
f6d3a98
api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java
0039f62
api/src/org/apache/cloudstack/api/response/AccountResponse.java 9a98a35
api/src/org/apache/cloudstack/api/response/ResourceCountResponse.java a7fbbf2
api/src/org/apache/cloudstack/api/response/ResourceLimitResponse.java b444e7a
server/src/com/cloud/api/ApiResponseHelper.java eafee8a
server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java 898bafc
server/src/com/cloud/api/query/vo/AccountJoinVO.java cd7231c
server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java 0cf19fb
server/src/com/cloud/configuration/Config.java 8c77715
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java 7ff06af
server/src/com/cloud/storage/VolumeManagerImpl.java a69607f
server/src/com/cloud/storage/dao/SnapshotDao.java 0e378a7
server/src/com/cloud/storage/dao/SnapshotDaoImpl.java 5b3f273
server/src/com/cloud/storage/dao/VolumeDao.java d7a2667
server/src/com/cloud/storage/dao/VolumeDaoImpl.java ca3b82a
server/src/com/cloud/storage/download/DownloadMonitorImpl.java 1fd1996
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java ed48bd1
server/src/com/cloud/template/HyervisorTemplateAdapter.java ad41af5
server/src/com/cloud/template/TemplateManagerImpl.java 29659d3
server/src/com/cloud/vm/UserVmManagerImpl.java cf9eb27
server/test/com/cloud/resourcelimit/ResourceLimitManagerImplTest.java d311ad3
server/test/com/cloud/vpc/MockResourceLimitManagerImpl.java b9fc861
setup/db/db/schema-40to410.sql 74f0dba
setup/db/db/schema-410to420.sql 4637b6d
utils/src/com/cloud/utils/UriUtils.java a8b5ccb
Diff: https://reviews.apache.org/r/9541/diff/
Testing
-------
Tested life cycle of templates, volumes, snapshots, vm on my local CloudStack
setup.
Thanks,
Sanjay Tripathi
