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

8278 Commits

Author SHA1 Message Date
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
Olivier Lemasle c934e7b052 CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit a1f278e9d4)
 2014-06-10 13:39:43 +02:00
sedukull 6c0b43431f CLOUDSTACK-6793: Fixed an invalid Domain Id Issue 
Signed-off-by: sedukull <santhosh.edukulla@gmail.com>
(cherry picked from commit 91d054cb00)
 2014-06-06 15:54:45 +02:00
Alena Prokharchyk 0b08d5319c Fixed unittest 
(cherry picked from commit 96bfa8a73f)
 2014-06-06 13:43:56 +02:00
Koushik Das 5fe7eb3357 CLOUDSTACK-6843: [Automation] List listServiceOfferings api fails with NPE 
Incorrect parameter name used in query building resulted in a bad sql query.

(cherry picked from commit 025c143ac7)
 2014-06-05 15:51:39 +02:00
Rajesh Battala 1f7d2ee091 CLOUDSTACK-6833 [Hyper-V] Volume snapshot creation returns success even though snapshots are not supported for Hyper-V 
(cherry picked from commit 945e879bf2)
 2014-06-05 12:21:14 +02:00
Edison Su 3f0dcc76ae CLOUDSTACK-5505: if vpc public network with snat enabled, then will triger this issue 
(cherry picked from commit 5e80e5d33d)
 2014-06-04 09:26:25 +02:00
Nitin Mehta 9286417f05 CLOUDSTACK-6599: 
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls

(cherry picked from commit 48ea9e0b5e)
 2014-06-03 10:02:06 +02:00
Hiroki Ohashi 58d4a2400a Allow usaage reporting on removed service offering 2014-05-29 19:13:39 +02:00
Rajani Karuturi df42ce903d Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range 2014-05-27 10:37:55 +02:00
Daan Hoogland 6f2ee6daac CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router 2014-05-24 19:45:18 +02:00
Min Chen f002e4d161 CLOUDSTACK-6752: IAM command class separation caused ApiDoc warning of 
duplicated cmd class for the same api name.
 2014-05-23 10:10:12 +02:00
Amogh Vasekar b0b71e59e9 CLOUDSTACK-6671: Fixing NPE when a mapping is missing 
Adding missing KVM mappings

Testing Done:
Local testing with removing CentOS mapping and launch a VM.

Signed-off-by: Nitin Mehta <nitin.mehta@citrix.com>
 2014-05-22 20:38:57 +02:00
Min Chen c169ed1f3e CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and 
volumes of other users.
 2014-05-22 10:17:15 +02:00
Min Chen 6ba541afb7 Disable IAM feature from 4.4 release. 
Conflicts:
	test/integration/smoke/test_vm_iam.py
 2014-05-21 13:49:11 +02:00
Murali Reddy 019ac691f0 CLOUDSTACK-6721: VolumeApiServiceImpl is sending wrong type for 
updateAsyncJobAttachment

fix sends 'Volume' instead of 'volume'
 2014-05-20 14:26:13 +02:00
Murali Reddy 5b525aadf3 CLOUDSTACK-6712: NPE in findJobInstanceUuid() in ApiDBUtils 2014-05-20 10:20:20 +02:00
Murali Reddy 840938504b CLOUDSTACK-6672: [Automation] NPE observed while listing system vms 
fixing NPE
 2014-05-19 11:04:57 +02:00
Jayapal adcc21ef3b Fixed vpc private gateway backend issues 2014-05-15 20:09:26 +02:00
Sanjay Tripathi da97f3f6e5 CLOUDSTACK-6678: API:MS: listCapacity returns; errorcode":530,"cserrorcode":9999,"errortext":"Index: 0, Size: 0"}. 2014-05-15 11:13:08 +02:00
Nitin Mehta e796d885f3 CLOUDSTACK-6660: Dont assume every vm will have a root volume now. 2014-05-15 08:46:30 +02:00
Sanjay Tripathi 13ba59c5f0 CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce. 2014-05-14 13:52:46 +02:00
Amogh Vasekar a7bf66b9f0 This patch disallows deleting / modifying system defined guest OS mappings 
Local env
1. Create user defined mapping
2. Delete / modify user defined mapping. Should pass
3. Delete / modify system defined mapping. Should fail

Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>
 2014-05-13 22:55:14 +02:00