apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,500 Commits 311 Branches 325 Tags
Commit Graph

7989 Commits

Author SHA1 Message Date
Prachi Damle
42a7d41c55 Adding annotations to router commands 2014-02-19 12:22:35 -08:00
Prachi Damle
f0a9b3b510 @ACL from some commands 2014-02-19 12:22:30 -08:00
Min Chen
13e25d2aae Fixed a bug in constructing search parameters with accountName passed. 2014-02-19 11:35:00 -08:00
Min Chen
586ee74000 Clean up SecurityChecker.AccessType and modify code to use them 
consistently.
 2014-02-14 11:23:05 -08:00
Min Chen
8072e50845 Fixed a bug for listTemplates with TemplateFilter=shared. 2014-02-13 16:47:41 -08:00
Min Chen
7bab0bc304 Optimize fix for CLOUDSTACK-5987. 2014-02-07 16:08:12 -08:00
Min Chen
3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Hugo Trippaers
b6db18fae4 Slightly improve the error message to make it clean what the problem actually is 2014-02-07 14:10:02 +01:00
Alena Prokharchyk
782c530685 Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type 
This reverts commit 447430c3df38c36d947c44c4aebd961d8cbb14c4.

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-02-06 14:46:58 -08:00
Hugo Trippaers
cbbe3e0cd7 Fix several AssertionErrors caused by improper transaction handling. Rewrite to new way of doing transactions. 2014-02-06 16:51:20 +01:00
Min Chen
c440d90466 Merge fix for CLOUDSTACK-5987 in master to RBAC. 2014-02-05 16:34:01 -08:00
Min Chen
7c0170e3e9 Hook up IAM update for updateTemplatePermission api. 2014-02-05 16:04:13 -08:00
Alena Prokharchyk
4305d817ba External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection 2014-02-05 15:56:40 -08:00
Alena Prokharchyk
a873a0efdd Fixed the build broken by changes made to MonitoringServiceVO 2014-02-05 10:37:03 -08:00
Alena Prokharchyk
9641e1dbee External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer 2014-02-05 10:36:21 -08:00
Hugo Trippaers
3cfa5fbfe1 Fix camelcasing inconsistency causing an assertion error. 2014-02-05 19:32:32 +01:00
Alex Huang
54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alex Huang
03a424e45a Removed some useless imports 2014-02-05 01:39:16 +00:00
Alex Huang
7f34282dfa Removed references to secondarystoragevmmanager from code that doesn't use it. 2014-02-05 01:39:15 +00:00
Alena Prokharchyk
aaa20947a9 ExternalUUID control support for Firewall and Egress Firewall rules 2014-02-04 17:06:04 -08:00
Alena Prokharchyk
7cb4b571c8 ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching 2014-02-04 15:47:13 -08:00
Alena Prokharchyk
e5335cd6e4 CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter 2014-02-04 15:47:13 -08:00
Alena Prokharchyk
8065ee445f External UUID control support for VPC and NetworkACLItemp 2014-02-04 15:47:12 -08:00
Alena Prokharchyk
7cd0ad336b External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup 2014-02-04 15:47:12 -08:00
Alena Prokharchyk
6af6ce7e9e 1) Added External UUID control support for network. 
2) Moved UUIDManager interface to cloud-util package
 2014-02-04 15:47:12 -08:00
Prachi Damle
9e92197dfd Fixing Build after merge 2014-02-04 15:10:24 -08:00
Prachi Damle
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
Antonio Fornie
447430c3df CLOUDSTACK-6003 fixing plus refactoring dispatcher 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-04 13:37:08 +01:00
Prachi Damle
72c0f1a617 Remove trailing whitespace 2014-02-03 18:28:09 -08:00
Prachi Damle
cb4d3a3c54 Support deleteAffinitygroup - remove access 2014-02-03 18:22:57 -08:00
Prachi Damle
022b9b8f80 Add access for domain wide createAffinityGroup 2014-02-03 18:14:56 -08:00
Prachi Damle
939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08:00
Alena Prokharchyk
ea355d7383 listSslCerts: removed an exception thrown when there is no certificate mapped to the lbId specified in the list* command. Exception in the list* command should be thrown only when id specified in the command, is invalid CS id, but never in the case when we can't find data satisfying search criteria. In this case we just return empty list 2014-02-03 17:20:28 -08:00
Alena Prokharchyk
fc56f0cf42 Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response 
This reverts commit fae05560218ef3bcb962bd424ae5dbf5cb8ede68.

Conflicts:
	server/src/com/cloud/dc/DedicatedResourceVO.java
 2014-02-03 17:20:28 -08:00
Anthony Xu
657d9e4789 Allow different VLANs have ovveride subnet for shared network 2014-02-03 15:03:31 -08:00
Likitha Shetty
f4a96d4c85 CLOUDSTACK-6011 . When detach is called on a deleted volume, avoid the NPE and throw an appropriate exception instead 2014-02-03 18:17:25 +05:30
Likitha Shetty
9cb37ec349 CLOUDSTACK-6007. Restore VM command fails with NPE. 
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store.
 2014-02-03 12:32:14 +05:30
David Grizzanti
ce4b718f4a CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating usage events are enabled 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit fc796632ed984f37fdf32e6aedf26d179a70b22f)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-01 21:08:24 +01:00
Prachi Damle
7d0472bdaa CLOUDSTACK-5995 ; change service offering is not honouring host tags 
- Check host tag when the lastHostId is set.
 2014-01-31 12:02:44 -08:00
Alena Prokharchyk
48361d8a8b Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId) 2014-01-31 09:21:55 -08:00
Sanjay Tripathi
e8438f1b6d CLOUDSTACK-5566: "Entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@aeb3d75 
and entity com.cloud.event.EventVO$$EnhancerByCGLIB$$9e317420@5a0fd1ec belong to
different accounts"  message while deleting multiple events .
 2014-01-31 17:10:04 +05:30
sbalineni
ed3e1b95b0 VPC Support for contrail networking 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2014-01-30 18:13:48 -08:00
Nitin Mehta
0e2e6995b7 CLOUDSTACK-5997: 
Template state changes side affects
 2014-01-30 17:59:55 -08:00
Alena Prokharchyk
02bdb28d76 Resource metadata support for autoscale vm group object 2014-01-30 13:04:56 -08:00
Alena Prokharchyk
cb073e0634 listAutoscaleVmProfiles: added zoneId to the list of optional api parameters 2014-01-30 12:36:56 -08:00
David Grizzanti
5de9ae0bce CLOUDSTACK-5496 : Account included in ActionEvents is Project Account ID 
When Action Events are generated and placed on the Event Bus, an
"account" parameter is included with the event. When these events are
generated for resources within projects, this "account" parameter is not
useful as it's the UUID of the project account, instead of the project.

To solve this, I updated ActionEventsUtil class to include a "project"
parameter in the generated events when the resource is being
changed/add/deleted in a project.
 2014-01-30 17:35:01 +05:30
Saksham Srivastava
85d0f8f93a CLOUDSTACK-5916: associateIpAddress leaves an IP in allocating state 2014-01-30 17:11:02 +05:30
Sanjay Tripathi
20fd2769a9 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"". 2014-01-30 16:29:18 +05:30
Alena Prokharchyk
b38c033d5c LOUDSTACK-5987: when listTemplates with filter=community/featured, get public templates from all domains in the system, not just parent/child subdomains of the caller 2014-01-29 17:12:46 -08:00
Alena Prokharchyk
37fa8012f8 Resource metadata for autoscaleVmProfile - forgot to add dao mapping to the ResourceMetaDataManagerImpl 2014-01-29 14:57:01 -08:00