94ebc90877
Remove usage of sameOwner checkAccess invocation, and convert to
...
OperateEntry IAM check.
2014-04-04 16:38:29 -07:00
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
5d8e8fd3a2
findbugs: nullpointer guards and wrappertype comparisons(cherry picked
...
from commit 791b7f8f7f
2014-01-28 16:46:05 +01:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
c3d8e207c8
CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.
2014-01-07 15:07:02 +05:30
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
414d415dba
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
e0fbc3f147
CLOUDSTACK-5272: return unlimit if max.account.* or max.project.* is set to negative
...
(cherry picked from commit 888ddd724a
2013-11-26 14:43:23 +01:00
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
edeaf98117
Cleaner and more type safe Transaction API for checked exceptions
2013-10-23 10:02:43 -07:00
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
aed5e9dc2a
Add Manage Context framework
...
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system. As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context. This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
aba54356d5
Account_Type Refactoring for Root Admin Role
...
- change the AccountService::isRootAdmin(short) to isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
2013-09-24 15:31:09 -07:00
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc
2013-08-08 15:02:40 -07:00
b59e3aaefc
Reverting the range of commits that broke the build
...
This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
5287f4c9ec
Got everything running through testing
2013-08-07 16:41:06 -07:00
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
539eb38908
CLOUDSTACK-3492: [Regression]Update Resource Count for an account is updating the primary storage incorretly.
...
The issue is that while calculating the used primary storage size, the updateResourceCount
API is also calculating the disk size of virtual router VM, created for that account and
because of this, the API is returning the incorrect result.
2013-07-19 16:04:10 +05:30
11971b5a58
Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master
2013-07-17 18:29:42 -07:00
fff763ef81
CLOUDSTACK-3514: [Automation] Vmware - Failed to download default template for first zone
...
Description:
Fixing reference to null object.
2013-07-16 16:14:51 -07:00
11e1e585b1
UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch
2013-07-16 11:24:21 -07:00
fd354dbd7c
CLOUDSTACK-2116
...
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 19:41:49 -07:00
3047929367
Merged
2013-05-10 16:21:43 -07:00
f5d5526d41
Fix unit test to test NFS template download flow.
2013-05-06 18:02:52 -07:00
85a1cc962c
CLOUDSTACK-2087: Destroying the instance is not decrementing the primary storage usage [Resource Count table - No of volumes is not got decremented]
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-05-02 16:17:13 +05:30
7543f314a7
Remove more VMTemplateHostDao references.
2013-04-23 17:12:21 -07:00
95fce11215
CLOUDSTACK-1156 Fix small typo
2013-03-29 12:05:58 +01:00
18695276f7
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.
Reviewed by : nitin mehta<nitin.mehta@citrix.com>
2013-03-29 11:26:38 +05:30
9b288c758b
CLOUDSTACK-1574: updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type.
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-07 11:43:39 +05:30
5828e526b3
CLOUDSTACK-713: Limit Resources(CPU and Memory) to domain/accounts
...
Addition of two new resource types i.e. CPU and Memory in the existing pool of
resource types.
Added some methods to set the limits on these resources using updateResourceLimit
API command and to get a count using updateResourceCount. Also added calls in the
Virtual machine life cycle to check these limits and to increment/decrement the new
resource types
Resource Name :: Resource type number
CPU 8
Memory 9
Also added Unit Tests for the same.
2013-02-12 12:02:07 -08:00
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
ed0637b8c2
api: Refactor move acl to org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:30:58 -08:00
ebfb90e217
Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-02 17:38:58 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
b92d2336ad
VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
...
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
c8bbf04c81
CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account.
...
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-03 04:35:53 +05:30
e87558256c
Patch from Chip Childers
...
https://reviews.apache.org/r/5704/
License header updates for the server folder
2012-07-02 09:51:21 -04:00
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
ad1192e264
bug 14239: limit number of Isolated account specific networks per account
...
status 14239: resolved fixed
Conflicts:
api/src/com/cloud/api/commands/CreateNetworkCmd.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-03-12 15:53:30 -07:00
e992a25e1a
bug 14033: root/domain admin limits are always Unlimited. Return it as Unlimited in listResourceLimit response
...
status 14033: resolved fixed
2012-02-29 15:15:36 -08:00
1490e45a1c
Fixed format style in a bunch of files (replaced tabs with spaces as a part of it)
2012-02-03 13:49:11 -08:00
08bb9eaf47
Bug 11426 - UpdateResourceCount api: don't recalculate the resources for System account
...
Changes:
- Throw error is anyone tries to update the resource limits for ROOT domain using updateResourceLimit API
- For ROOT domain always return -1 (infinite) limit
- DB upgrade: remove any limits set for ROOT domain
2012-01-31 14:21:03 -08:00
Min Chen
Prachi Damle
Daan Hoogland
Sanjay Tripathi
Nitin Mehta
Alex Huang
Alena Prokharchyk
Wei Zhou
Darren Shepherd
Prasanna Santhanam
Vijayendra Bhamidipati
Likitha Shetty
Alex Huang
Hugo Trippaers
Sanjay Tripathi
Kelven Yang
Rohit Yadav
Deepti Dohare
David Nalley
frank