etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,633 Commits 322 Branches 325 Tags 975 MiB
Commit Graph

8300 Commits

Author SHA1 Message Date
Wei Zhou ae1b87ca23 CLOUDSTACK-7308: add tags to all security group rules 2014-08-18 14:41:53 +02:00
Wei Zhou b55c114932 CLOUDSTACK-7308: tags for security group rules (additional commit for 4.4) 2014-08-15 09:51:39 +02:00
Stephen Hoogendijk f41019d5b2 CLOUDSTACK-7308 - Adds tagging support for security group rules 
(cherry picked from commit 6978c18c3a)
 2014-08-15 09:41:15 +02:00
Luis Henrique Okama 260e694e89 bugfix CLOUDSTACK-7309 using findProjectByProjectAccountIdIncludingRemoved 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-08-13 00:06:17 +02:00
Murali Reddy de85c4d555 CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared 
networks

fix ensures only admin users can delete shared network

(cherry picked from commit 2f293f42d5)
 2014-08-08 12:15:40 +02:00
Rohit Yadav d79251853b CLOUDSTACK-7211: Add Guest OS mapping before returning VirtualMachineTO object 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 89fabe82b9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 19:04:22 +02:00
Kishan Kavala ccee282a74 CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm. 
(cherry picked from commit 89854de18d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-07-31 18:50:43 +02:00
Jayapal 865cdc08e5 CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate 
(cherry picked from commit 252e58381a)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:36:22 +02:00
Nitin Mehta 6d0e43d36b CLOUDSTACK-7000: Fix bugs in ListSnapshotPolicy and updateSnapshotPolicy command 
(cherry picked from commit 63c4f02897)
 2014-07-30 13:33:22 +02:00
Nitin Mehta 6f709f59cc CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command 
(cherry picked from commit fce21439fa)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 13:31:14 +02:00
Nitin Mehta 1fbee507ea CLOUDSTACK-6987: Add support for storing metadata for snapshot policy and controlling policy using display flag 
(cherry picked from commit 5cf8edd7ec)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-30 13:24:31 +02:00
Nitin Mehta adfb44ec33 CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name 
(cherry picked from commit 18c6ae0796)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-07-30 12:52:15 +02:00
Nitin Mehta fec9ccf446 CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume 
(cherry picked from commit 1e78354882)
 2014-07-28 16:02:49 +02:00
Prachi Damle 20a457dd6e CLOUDSTACK-6941: Can't choose storage for the volume, when attaching uploaded data volume to VM 
Changes:
- Only way to choose a certain storage pool is by using disk_offering_tags
- Added a parameter to take in a disk offering Id.
- Admin will have to create a custom sized disk offering and tag it as necessary for the user
- This custom offering Id should be passed during uploadVolume to associate the volume with this disk offering

(cherry picked from commit 13bd8beb91)
 2014-07-28 16:02:41 +02:00
Min Chen 30b22ae275 CLOUDSTACK-6940:Templates cannot be downloaded from URLs without 
matching file extensions.

(cherry picked from commit 008162a757)
 2014-07-28 16:02:41 +02:00
Alena Prokharchyk 388af6c349 CLOUDSTACK-6919: don't attempt to restart user vms having no Root volume attached 
(cherry picked from commit 146867eb07)
 2014-07-28 16:02:36 +02:00
Alena Prokharchyk 31ed30af56 CLOUDSTACK-6907: lisVolumes - make a decision whether to set service or disk offering in the response, based on the DiskOfferingVO type entry, not the volume Type 
(cherry picked from commit 43e479d238)
 2014-07-28 16:02:33 +02:00
Rajani Karuturi 713572887c Fixed few coverity issues unused assignments, boxing and unboxing of values etc. 
Signed-off-by: Koushik Das <koushik@apache.org>
(cherry picked from commit 32a7d5d387)
 2014-07-28 16:02:33 +02:00
Anthony Xu 9fbb35d13d fixed a typo 
(cherry picked from commit 40207929f7)
 2014-07-28 16:02:17 +02:00
Anthony Xu 742e1b1954 if networkID is not specified, get one network with free ips. 
(cherry picked from commit 8c5a9ec4de)
 2014-07-28 16:02:16 +02:00
Nitin Mehta 5c9ca6c22d CLOUDSTACK-6699: listResouceDetails - enhance it to list by (key,value) pair - allowed to Admin only. 
(cherry picked from commit d5425e1a4a)
 2014-07-28 16:02:13 +02:00
wrodrigues 3926f7e8b8 CLOUDSTACK-6139 router vm on local storage 
(cherry picked from commit 31b3f0a5ce)
 2014-07-28 16:02:05 +02:00
Daan Hoogland c9383c441e Updating pom.xml version numbers for release 4.4.1-SNAPSHOT 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-07-23 16:55:31 +02:00
amoghvk a72991a313 CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x 
(cherry picked from commit c8ca15b95a)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-07-17 23:40:49 +02:00
Alena Prokharchyk 92d1428c48 CLOUDSTACK-6595: allow to expunge the vm when its in Error state, in addition to Expunging/Destroyed states 
(cherry picked from commit 822b38761f)
 2014-07-17 09:49:29 +02:00
Prachi Damle 29b09b1e21 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
- removing unused imports

Conflicts:
	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java

(cherry picked from commit f37b152489)
 2014-07-03 16:13:15 +02:00
Prachi Damle b70bd23be3 CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account 
Changes:
-DeploymentPlanner should include disabled resources only when the VM owner is Admin account. The disabled resources should be ignored when VM is owned by any other user.

(cherry picked from commit 40e28de727)
 2014-07-03 16:13:05 +02:00
Jayapal 09022344ee CLOUDSTACK-7027: Removing left over static nat rule 
(cherry picked from commit a69c1ee31d)
 2014-07-01 14:36:33 +02:00
Sanjay Tripathi 8f9458e517 CLOUDSTACK-6884: List Capacity API always returns GPU capacity also even if type is different. 
(cherry picked from commit 48646ae186)
 2014-06-27 09:41:52 +02:00
Ian Duffy 0296c46f09 remove unused import 
(cherry picked from commit 2bb12f2a85)
 2014-06-25 21:33:08 +02:00
Ian Duffy c70cadff0e Allow for length of password on VMs to be set via global settings 
(cherry picked from commit 96412e3e58)

Conflicts:
	setup/db/db/schema-430to440.sql
 2014-06-25 21:22:06 +02:00
Daan Hoogland 86aff86b78 CLOUDSTACK-6747: call a more forgiving test on the supplied peer 
cidr-list
(cherry picked from commit 17850c7aff)
 2014-06-25 17:18:45 +02:00
Min Chen 0d23ad903d CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean 
injection.

(cherry picked from commit 31e250a9d2)
 2014-06-23 20:19:36 +02:00
Anshul Gangwar af37ade9e3 CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide primary 
store requires storage migration resulting in failure of VM migration. This also
improves the hostsformigration api. Firstly we were trying to list all hosts and
then finding suitable storage pools for all volumes and then we were checking
whether vm migration requires storage migration to that host. Now the process is
updated. We are checking for only those volumes which are not in zone wide primary
store. We are verifying by comparing volumes->poolid->clusterid to host clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.

(cherry picked from commit 64153a4371)

Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2014-06-23 09:56:17 +02:00
Anshul Gangwar 1b1a417bb4 CLOUDSTACK-6968: Allowing cluster scope volumes to attach to any VM. If migration is 
needed then first they will be migrated to appropriate cluster before attaching.

(cherry picked from commit e7ba46b5f7)
 2014-06-23 09:50:31 +02:00
Kelven Yang c422933719 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception 
(cherry picked from commit 06d8d3a03f)
 2014-06-20 22:31:56 +02:00
Murali Reddy 6bd9d1241b CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs 
disabled zone does not fail

Fix ensures that connectivity service provider is enabled in the zone on
to which nework is being streched.

(cherry picked from commit d8cbba1bc6)
 2014-06-19 15:24:05 +02:00
Jayapal 335f165b5b CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using stickinesspolicy id 
(cherry picked from commit b0d726a872)

Conflicts:
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
 2014-06-18 14:12:46 +02:00
Rajesh Battala 6b9ac8be8b CLOUDSTACK-6920 Support listing of LBHealthcheck policy with LBHealthcheck policy ID 
(cherry picked from commit 21e452ff4f)

Conflicts:
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
 2014-06-18 13:21:32 +02:00
Santhosh Edukulla 61cf175f1c Coverity issues: Fixed conflicts 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-06-17 13:49:55 +02:00
Jayapal c82b61a92f CLOUDSTACK-6922: Updated events for firewall ingress and egress 
(cherry picked from commit 2214bd2502)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
 2014-06-17 13:21:50 +02:00
amoghvk f8fe4c8795 CLOUDSTACK-6915: Include searching deleted OS entries 
(cherry picked from commit de04881da1)
 2014-06-17 08:22:27 +02:00
Santhosh Edukulla 87c3d77518 Fixed coverity issues 
(cherry picked from commit 4ba3aae2ea)
 2014-06-12 14:44:26 +02:00
Jayapal 80d8cef240 CLOUDSTACK-6899: Added vmId in listnics response 
(cherry picked from commit e9f60ee292)
 2014-06-12 14:18:42 +02:00
Santhosh Edukulla ce334b4ee5 CLOUDSTACK-6791 Fixed the issue 
(cherry picked from commit 62cc238e12)
 2014-06-12 13:43:44 +02:00
Saksham Srivastava 40d3503760 CLOUDSTACK-6812: Do not allow edit of storage.overprovision.factor for non supported types 
(cherry picked from commit f14f36170e)
 2014-06-12 12:25:55 +02:00
Saksham Srivastava 9771e79b1b CLOUDSTACK-6654: Configkey parameters are not validated 
(cherry picked from commit 5bcd017de6)
 2014-06-12 12:25:14 +02:00
Saksham Srivastava 23b7993d58 CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params 
(cherry picked from commit c5ee5ad5c8)
 2014-06-12 12:23:52 +02:00
Nitin Mehta a1ab3364f4 CLOUDSTACK-6895: 1. Populate firstclass entities as uuids in the context instead of dbids for performance. 
2. Add ctxDetails in the ParamGenericValidationWorker to avoid warning for api validation
3. Add some missing events.
4. Correcting mapping for ResourceObjectType.NetworkACL and ResourceObjectType.NetworkACLItem

(cherry picked from commit 8a9092c3cd)

Conflicts:
	api/src/com/cloud/event/EventTypes.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
 2014-06-12 12:18:12 +02:00
Harikrishna Patnala 0667f678b8 CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 
(cherry picked from commit aa75b43885)
 2014-06-11 16:10:49 +02:00