etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,155 Commits 323 Branches 325 Tags 836 MiB
Commit Graph

19155 Commits

Author SHA1 Message Date
Likitha Shetty 06c8e5bfd8 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-07-05 16:28:24 +05:30
Likitha Shetty 9c5da1c6e3 CLOUDSTACK-3361. [Projects] Allow a normal user to edit public templates created by him. 2013-07-05 16:21:47 +05:30
Radhika PC c56a75da9c CLOUDSTACK-2763 2013-07-05 16:07:42 +05:30
Isaac Chiang 0d7d345339 CLOUDSTACK-3230: UI add cluster remains in processing state 2013-07-05 18:21:34 +08:00
Prasanna Santhanam f96b89f25e CLOUDSTACK-3273: ClassCastException when adding cache store via API 
Filter the detail map sent over the wire into Map<String, String> before
processing underneath by  storage life cycle

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-05 15:32:41 +05:30
Sebastien Goasguen 88f67c128c [DOCS][GSOC] re-formatted GSoC guide for updates 2013-07-05 05:21:24 -04:00
Radhika PC 6efd337ef4 CLOUDSTACK-2762 2013-07-05 14:46:10 +05:30
Radhika PC e173060ab6 CLOUDSTACK-2762 2013-07-05 14:00:33 +05:30
Wei Zhou f93c51e2bd CLOUDSTACK-3345: createLBStickinessPolicy replaces old stickiness policy if exists 2013-07-05 10:02:29 +02:00
Wei Zhou ac438a6d1d CLOUDSTACK-3372: CapacityManager does not count destroyed volumes when deploy VMs 2013-07-05 09:49:56 +02:00
Isaac Chiang d1adefe284 CLOUDSTACK-3081: Even a dedicate pod operation fails, the system shows "Task Complete" 
Dedicate zone/pod/cluster/host operations have been fixed
 2013-07-05 15:41:09 +08:00
Radhika PC 1f54e647fb CLOUDSTACK-2762 2013-07-05 11:35:32 +05:30
Prasanna Santhanam 9e2224dd49 print debug message for the waiting time 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 313177a51e)
 2013-07-05 11:09:56 +05:30
Hugo Trippaers 41fa79f65c The millisecond to second calculation was done with a bit shift of 10. 
This is in effect a division by 1024, while time in ms should be divided
by 1000. The difference of 24 adds up to about a 381 day difference
today. This confuses anybody checking the timestamps in the logs.
 2013-07-04 18:39:03 +02:00
Prasanna Santhanam b3aa11ca39 Include definition for vm_3 in assign and load balance test 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-04 21:45:00 +05:30
Murali Reddy a8a23c4364 CLOUDSTACK-2045:[Multiple IPs Per Nic] This feature is not working well 
in case of networks with external devices after GC

adding missing 'retrun false' for isNetworkReadyForGc for the networks
that use external network devices and has secondary IP's associated with
nics.
 2013-07-04 21:30:31 +05:30
Prasanna Santhanam da9552b7f3 move isAlmostEqual to utils 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-04 20:14:54 +05:30
Gaurav Aradhye 048cf5aae8 CLOUDSTACK-2884: Fixed test_04_change_offering_small 
Added method to compare if two digits are almost equal within given range

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-04 20:14:54 +05:30
Jayapal daa4c326aa CLOUDSTACK-3312 Updated dhcp_release to listen on eth0 in edithosts.sh 2013-07-04 16:36:50 +05:30
Kishan Kavala 7a8d7eaa60 CLOUDSTACK-3172: Allow creation of private gateway with same Vlan in different VPCs 2013-07-04 16:11:12 +05:30
Prasanna Santhanam 248bea8b27 ipaddress is included 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-04 14:39:54 +05:30
Nitin Mehta bb6cd764c7 CLOUDSTACK-3267 
Improved logging by logging the memory values when exception is thrown for the constraint
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-07-04 14:24:41 +05:30
Harikrishna Patnala 968c252ca5 CLOUDSTACK-3351: Fix add cluster API to set right hypervisor type 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-04 14:23:08 +05:30
Prasanna Santhanam 1e646629fe CLOUDSTACK-3354: Fix scalevm test 
After you scale the vm, user is expected (oddly) to update the virtual
machine to signal that the PV tools are installed. This tells cloudstack
that the VM has been successfully scaled up/down.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit c8ad4e5ced)
 2013-07-04 13:52:36 +05:30
Prasanna Santhanam 30039e121b Separate the loadbalancing tests 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-04 13:37:27 +05:30
Likitha Shetty 4bf6c1e2f7 CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files 
[Support for EC2 API version 2012-08-15]
 2013-07-04 11:59:36 +05:30
Likitha Shetty 4cda7a5d97 CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files 
[Support for EC2 API version 2012-08-15]
 2013-07-04 11:58:23 +05:30
Likitha Shetty 26af71b23b CLOUDSTACK-1444. Adding ASF license header to the regenerated JAVA files 
[Support for EC2 API version 2012-08-15]
 2013-07-04 11:11:21 +05:30
Likitha Shetty d908f85749 CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15] 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 10:09:00 +05:30
Likitha Shetty 7a80031ce6 CLOUDSTACK-1444. Fixing cloudstack-aws-api-register to set ec2 api version to the latest. [Support for EC2 API version 2012-08-15] 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 10:08:48 +05:30
Likitha Shetty 3cfaa92917 CLOUDSTACK-3258. In AWSAPI provide Tags support for resource 'security group' 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 10:08:42 +05:30
Likitha Shetty 135b688a00 CLOUDSTACK-1444. Updated EC2SoapService and EC2SoapServiceImpl to be compatible with the java stubs generated from EC2 WSDL 2012-08-15. 
- by adding stubs for the new EC2 APIs (unsupported by CS AWSAPI)
  - by setting the new EC2 API response elements
  - by adding support for the new EC2 API request elements
[Support for EC2 API version 2012-08-15]
 2013-07-04 10:06:51 +05:30
Likitha Shetty 2570b66756 CLOUDSTACK-1444. Modified services.xml. [Support for EC2 API version 2012-08-15] 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 10:01:34 +05:30
Likitha Shetty 33df54edaf CLOUDSTACK-1444. Contains regenerated JAVA stubs and services.xml obtained by generating code from ec2 wsdl 2012-08-15 [Support for EC2 API version 2012-08-15] 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 10:01:19 +05:30
Likitha Shetty e4ba348ef0 CLOUDSTACK-1444. Add 3 awsapi profiles 1. Download ec2 wsdl for 2012-08-15 2. Generate stubs (server and client) from the wsdl 3. Remove the ec2 wsdl [Support for EC2 API version 2012-08-15] 
Signed-off-by: Likitha Shetty <likitha.shetty@citrix.com>
 2013-07-04 09:58:54 +05:30
Likitha Shetty c08b927b86 CLOUDSTACK-3295. Code should look for xes.keystore under cloud-awsapi-4.2.0-SNAPSHOT and not under generated-webapp. 2013-07-04 09:46:41 +05:30
Alex Huang 43ab9506ab Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation. 2013-07-03 17:48:53 -07:00
Jessica Wang 410dff9d89 CLOUDSTACK-1676: UI > zone wizard > basic zone > pass securitygroupenabled=true if selected network offering includes security group service; pass securitygroupenabled=false if selected network offering does not include security group service. 2013-07-03 17:05:00 -07:00
Jessica Wang 1bd74420cc CLOUDSTACK-3207: UI > domain page > get total number of instances, volumes by both listAccounts API and listProjects API. 2013-07-03 15:24:52 -07:00
Edison Su b59b1b4c93 fix can't find host ip address on Mac OS 2013-07-03 14:34:37 -07:00
Edison Su 810c64e387 fix marvin when deploy vmware setup 2013-07-03 14:34:33 -07:00
Alena Prokharchyk d8560281a4 CLOUDSTACK-3347: fixed project deletion for project's owned template 
Conflicts:
	server/src/com/cloud/template/TemplateAdapterBase.java
 2013-07-03 13:48:06 -07:00
Milamber 0a241b8ea8 Update L10N strings from Transifex to repo 2013-07-03 20:52:32 +01:00
Alex Huang ab5f5809c3 VMSync: Added copyright 2013-07-03 11:23:22 -07:00
Alex Huang bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -07:00
Harikrishna Patnala d2739cde2e Fix file name in DnsMasqConfigCommand 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-03 20:43:42 +05:30
Prasanna Santhanam 9ba36fd173 uncomment the cleanup. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-03 20:03:50 +05:30
Prasanna Santhanam 9f0c9ee20c CLOUDSTACK-3184: integration test for the updateVirtualMachine 
updateVirutalMachine fails if no args are passed. this test also further
verifies that the displayname is changed when vm is started up
successfully.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-03 19:39:02 +05:30
Sanjay Tripathi 31df729008 CLOUDSTACK-3184: updateVirtualMachine api gives java NPE. 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-03 19:39:02 +05:30
Chip Childers c49674300a Adding license header to server/test/com/cloud/network/security/SecurityGroupManagerImplTest.java 2013-07-03 10:05:29 -04:00