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,419 Commits 311 Branches 325 Tags
Commit Graph

22419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Prachi Damle
0908f64ec7 add @ACL and EntityType to VMSnapshot APIs 2014-02-04 18:05:29 -08:00
Prachi Damle
f6df4845fe Adding EntityType to vpn commands 2014-02-04 17:52:51 -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
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
a6d07c873c Changes to QuerySelector to list the parent group resources with recursive = true access 2014-02-03 17:49:33 -08:00
Prachi Damle
939b15169c changes to support the domain wide resources for Network 2014-02-03 17:34:03 -08: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
Prachi Damle
09eed3705d Fix for NPE in the dao 2014-01-31 12:00:26 -08:00
Alena Prokharchyk
158280181d generateAlert API: set max value of "description" parameter to match correspondig field's length in VO object 2014-01-31 09:21:55 -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
Abhinandan Prateek
d578d7ef85 update packages list before getting jre 7 
(cherry picked from commit 5121f8cd4e4adcdf23b6ec25cb1c28bec8f417a7)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-01-31 09:42:31 +01:00
Abhinandan Prateek
0685371179 updating the jre to version 7 on system vms 
(cherry picked from commit fc2e7ec70a1cc48a10a168ec3df607b49a7bcdf6)
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
 2014-01-31 09:41:41 +01:00
Hugo Trippaers
8f10dedce9 Fix findbugs findings and remove dead code 2014-01-31 09:37:16 +01:00
Hugo Trippaers
d56c5dfc13 Fix for a potential NPE 2014-01-31 09:37:11 +01:00
Marcus Sorensen
d409d709e3 CLOUDSTACK-6000: When expunging fails, move volume state back to 
Destroy, so that the cleanup thread will try again on next run.
 2014-01-30 23:33:27 -07:00
Likitha Shetty
7f6b3c08db CLOUDSTACK-5998. [AWSAPI] describe addresses call returns a fault with "domain cannot be null!!". 2014-01-31 10:52:50 +05:30
Koushik Das
580ebb0010 CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency 
The fix is to fail the start operation if a vm snapshot is in progress
 2014-01-31 10:39:43 +05:30
Koushik Das
f2f605dfda CLOUDSTACK-5993: Cloud agent fails to start on 32-bit system vms (cpvm and ssvm) created with 4GB RAM offering 
Capped the max heap size of the JVM at 2600M for 32-bit system VMs. For 64-bit, existing logic works fine.
 2014-01-31 10:39:30 +05:30
Hiroaki KAWAI
836a9caa72 add charset arg to InputStreamReader constructor 
thanks to findbugs.
 2014-01-31 12:57:13 +09:00
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
Jessica Wang
d84a6937d7 CLOUDSTACK-5996: UI - In project view, the first listRotuers API(without projectid=-1) will return the same objects as the second listRouters API(with projectid=-1), because in project view, all API calls are appended with projectid=[projectID]. Therefore, we only call the second listRouters API(with projectid=-1) in non-project view. 2014-01-30 14:44:49 -08:00
Daan Hoogland
c6118ad92e findbugs bitwise or guaranteed positively bitfields 2014-01-30 23:16:24 +01:00
Daan Hoogland
41fd0a2ab7 findbugs equals on same type of objects 2014-01-30 22:58:52 +01: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
Alena Prokharchyk
13e6c2fe72 Fixed API doc that got broken by adding new commands for stratosphere ssp plugin 
Conflicts:
	tools/apidoc/gen_toc.py
 2014-01-30 11:01:03 -08:00
Likitha Shetty
06f79a881c CLOUDSTACK-5994. Hitting IndexOutOfBoundsException in GetVmStatsCommand after upgrade. 
To obtain network read/write statistics, multiply sample duration with the
average of the particular performance metric obtained over the sample period.
 2014-01-30 18:31:38 +05:30
Hiroaki KAWAI
cb048f4108 Some rework stratosphere ssp plugin 
* add missing command entry in commands.properties
* migrate httpclient 3.x to 4.x
* fix the broken SspClient
* add webapp session checking in mock ssp server
 2014-01-30 21:31:44 +09:00
Hiroaki KAWAI
b32b49e853 Fix mock socket client/server test. 
Normally a server will bind to 0.0.0.0, which is not an
address that a client can specify to connect to.
127.0.0.1 or ::1 will do.
 2014-01-30 21:11:56 +09: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
Prachi Damle
d12422bf68 Add policies to domain group for CreateNetwork usecase for a domain wide shared network 2014-01-29 23:56:25 -08:00
Sanjay Tripathi
dfe744c4a9 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-30 13:26:00 +05:30
Prachi Damle
ce95f3122b add 'recursive' column to permission table 2014-01-29 23:48:13 -08:00
Sheng Yang
121d88743a CLOUDSTACK-5986: Make dnsmasq handle dnsmasq.leases when dhcp_release is available 
The original issue has been exposed due to CloudStack VR would modify the
dnsmasq.leases, thus make it unsync with dnsmasq's memory lease.

Make the modification to let dnsmasq handle the lease file if dhcp_release is
available.
 2014-01-29 18:02:11 -08:00
Min Chen
81323dce5d Add support to grant acl permission to access an individual resource. 2014-01-29 17:59:24 -08:00
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
Alena Prokharchyk
65c5de1cb6 Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url' 2014-01-29 14:57:01 -08:00
Alena Prokharchyk
fdb25d6f5b Resource metadata support for autoscaleVmProfile CS object 2014-01-29 14:57:00 -08:00
Alena Prokharchyk
3b781d1a22 ResizeVolume API - volumeId should be a required parameter 2014-01-29 14:57:00 -08:00
Alena Prokharchyk
68937cd207 CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands 2014-01-29 11:50:27 -08:00