Commit Graph

7689 Commits

Author SHA1 Message Date
Daan Hoogland 6aa3fd8a81 findbugs get from map with proper key-type
(cherry picked from commit a4f2f0b39f)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:17:21 +01:00
Daan Hoogland 5d11f9b149 findbugs explicit toString on enum for call get(Object)
(cherry picked from commit cce4a055ae)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:16:55 +01:00
Daan Hoogland 92ac450ca0 findbugs get proper object from map
(cherry picked from commit 901cf8ab32)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:16:30 +01:00
Daan Hoogland f5f22c9d3b findbugs: assign result of string manipulations
(cherry picked from commit 20127e09dc)

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 19:15:55 +01:00
Sanjay Tripathi b811bc0945 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:03:47 +05:30
David Grizzanti 62a259ffa9 CLOUDSTACK-5062: Deleting Load Balancing Rule fails when generating
usage events are enabled

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-01-31 11:25:59 +01:00
Daan Hoogland f4db8df66f findbugs Long comparison == -> equals() 2014-01-31 09:07:55 +01:00
Daan Hoogland a4f2f0b39f findbugs get from map with proper key-type 2014-01-31 09:06:11 +01:00
Daan Hoogland cce4a055ae findbugs explicit toString on enum for call get(Object) 2014-01-31 08:58:50 +01:00
Daan Hoogland 901cf8ab32 findbugs get proper object from map 2014-01-31 08:53:14 +01:00
Daan Hoogland 353060e578 Revert "Findbugs: different issues solved"
This reverts commit dcda79e2c0.
2014-01-31 08:41:24 +01:00
Sanjay Tripathi d7e1d38d48 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm".
(cherry picked from commit cff312ef74)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:44:48 -08:00
Jayapal ccc8aa78cd CLOUDSTACK-5966 Updated service monitoring config to start by default.
Global settings EnableServiceMonitoring param set to true
(cherry picked from commit 7255e50f20)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:42:42 -08:00
Alena Prokharchyk 45e45b930a 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
Conflicts:
	server/src/com/cloud/api/query/QueryManagerImpl.java
(cherry picked from commit b1d4c06ad1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-30 17:39:28 -08:00
Animesh Chaturvedi 210b19c1f5 Reverting this change as it caused issues with userVmResponse. "Findbugs: different issues solved"
This reverts commit dcda79e2c0.
2014-01-30 15:33:31 -08:00
Sanjay Tripathi cff312ef74 CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as "Failed to migrate the system vm". 2014-01-30 16:18:41 +05:30
Jayapal 7255e50f20 CLOUDSTACK-5966 Updated service monitoring config to start by default.
Global settings EnableServiceMonitoring param set to true
2014-01-30 14:20:21 +05:30
Alena Prokharchyk b1d4c06ad1 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
Conflicts:
	server/src/com/cloud/api/query/QueryManagerImpl.java
2014-01-29 17:14:56 -08:00
Daan Hoogland d6bbfbbc59 findbugs: nullpointer guards and wrappertype comparisons 2014-01-29 21:44:06 +01:00
Daan Hoogland dcda79e2c0 Findbugs: different issues solved 2014-01-29 21:40:21 +01:00
Daan Hoogland 1fb32b58eb findbugs: null-checks 2014-01-29 21:39:11 +01:00
Daan Hoogland eb239b9689 findbugs: retrieve the objects to remove from the collection(s) 2014-01-29 21:38:40 +01:00
Daan Hoogland 594fd42d5d findbugs fixes for ApiServer, ApiSerializerHelper and ApiXmlDocWriter 2014-01-29 21:36:46 +01:00
Daan Hoogland c3a63b6b5a Findbugs issues in ApiResponseHelper fixes 2014-01-29 21:31:54 +01:00
Daan Hoogland da344bb234 restored imports 2014-01-29 21:29:50 +01:00
Daan Hoogland 30b7fa5919 moved call on static object to synchronized block 2014-01-29 21:28:25 +01:00
Daan Hoogland 5296c12d2a nullpointer dereference guarded 2014-01-29 21:27:49 +01:00
Daan Hoogland 85868d81fb findbugs: null check for gateway and netmask instead of gateway twice(cherry picked from commit d30ddf6d59)
Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 14:23:03 -08:00
Jayapal 63e839c0f8 CLOUDSTACK-5966 Added enable/disable monitoring service in global config
(cherry picked from commit 782265e713)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:31:37 -08:00
Sanjay Tripathi 3fa300b132 CS-5950: Wrong storage tags are used for ISO deployed VMs.
(cherry picked from commit 1f4e2a51a4)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-28 13:25:14 -08:00
Jayapal 782265e713 CLOUDSTACK-5966 Added enable/disable monitoring service in global config 2014-01-28 20:08:54 +05:30
Sanjay Tripathi 1f4e2a51a4 CS-5950: Wrong storage tags are used for ISO deployed VMs. 2014-01-28 14:11:20 +05:30
Min Chen 7e8b8e6cd0 CLOUDSTACK-5960: Domain admin or user cannot register a template using
S3/Swift object store.(cherry picked from commit 6d1475182c)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-27 19:52:06 -08:00
Koushik Das 8d1d0c54f2 CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
Removed unused field. This will ensure that list VM queries are not blocked.
(cherry picked from commit 3fae917ebe)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-27 19:51:04 -08:00
Min Chen 6d1475182c CLOUDSTACK-5960: Domain admin or user cannot register a template using
S3/Swift object store.
2014-01-27 11:54:38 -08:00
Koushik Das 3fae917ebe CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
Removed unused field. This will ensure that list VM queries are not blocked.
2014-01-27 15:23:28 +05:30
Daan Hoogland 9495c68c13 findbugs: removed obfuscating fields 2014-01-27 00:55:19 +01:00
Daan Hoogland 9772693dca findbugs: throw exceptions when found 2014-01-27 00:54:23 +01:00
Daan Hoogland 791b7f8f7f findbugs: nullpointer guards and wrappertype comparisons 2014-01-27 00:23:57 +01:00
Daan Hoogland 20127e09dc findbugs: assign result of string manipulations 2014-01-26 23:49:56 +01:00
Daan Hoogland 0b13f8e59d Findbugs: different issues solved 2014-01-26 23:14:17 +01:00
Daan Hoogland 866a539b06 findbugs: removed fields injected in parent 2014-01-26 16:49:18 +01:00
Daan Hoogland 23a3d99fc0 findbugs: byte[].toString -> Arrays.toString(byte[]) 2014-01-26 16:38:53 +01:00
Daan Hoogland c58e509924 findbugs: null-checks 2014-01-26 16:35:48 +01:00
Daan Hoogland f3b9a7f123 findbugs: retrieve the objects to remove from the collection(s) 2014-01-26 16:07:59 +01:00
Daan Hoogland b40156313a findbugs: serialized class serializable 2014-01-26 16:03:56 +01:00
Daan Hoogland df6f40fe73 Revert "findbugs: remove compatible objects from collection"
This reverts commit 390325c50b.
2014-01-26 15:25:19 +01:00
Daan Hoogland 390325c50b findbugs: remove compatible objects from collection 2014-01-26 15:20:24 +01:00
Daan Hoogland d30ddf6d59 findbugs: null check for gateway and netmask instead of gateway twice 2014-01-26 15:11:56 +01:00
Daan Hoogland 9aced41d70 findbugs fixes for ApiServer, ApiSerializerHelper and ApiXmlDocWriter 2014-01-26 13:27:37 +01:00
Daan Hoogland 9a1b882d0e Findbugs issues in ApiResponseHelper fixes 2014-01-26 12:25:18 +01:00
Daan Hoogland 437ff438af restored imports 2014-01-26 00:34:41 +01:00
Daan Hoogland f3529a19a9 moved call on static object to synchronized block 2014-01-25 23:46:18 +01:00
Daan Hoogland 43ba36f979 nullpointer dereference guarded 2014-01-25 23:26:53 +01:00
Kelven Yang 29e44b1b67 CLOUDSTACK-5928: Use legacy vmsync logic by default 2014-01-22 14:09:22 -08:00
Alena Prokharchyk aa6f4dc8a7 CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
	plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
	plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
	plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
	server/src/com/cloud/server/auth/UserAuthenticator.java
	server/src/com/cloud/user/AccountManagerImpl.java
(cherry picked from commit f160b31f51)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>
2014-01-22 13:07:43 -08:00
Alena Prokharchyk f160b31f51 CLOUDSTACK-5930: Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
	plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
	plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
	plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
	server/src/com/cloud/server/auth/UserAuthenticator.java
	server/src/com/cloud/user/AccountManagerImpl.java
2014-01-22 12:53:27 -08:00
Kelven Yang 50f311ed94 CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled 2014-01-22 11:17:25 -08:00
Alena Prokharchyk d5e0dcd2a7 Revert "Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased"
This reverts commit 7884bb8aaf.
2014-01-21 19:50:46 -08:00
Alena Prokharchyk 7884bb8aaf Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java
	plugins/user-authenticators/md5/src/com/cloud/server/auth/MD5UserAuthenticator.java
	plugins/user-authenticators/plain-text/src/com/cloud/server/auth/PlainTextUserAuthenticator.java
	plugins/user-authenticators/sha256salted/src/com/cloud/server/auth/SHA256SaltedUserAuthenticator.java
	server/src/com/cloud/server/auth/UserAuthenticator.java
	server/src/com/cloud/user/AccountManagerImpl.java
2014-01-21 18:09:15 -08:00
Min Chen afb8a79321 CLOUDSTACK-5921: S3 security key is stored in DB unencrypted 2014-01-21 14:17:30 -08:00
Mike Tutkowski 413c61b519 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-20 23:08:27 -07:00
Min Chen aa2d25bf92 CLOUDSTACK-5913:API rate limiting throws a different error than expected
when Throttle limit hit in the API.
2014-01-20 14:57:48 -08:00
edison 7c2449dabd CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm 2014-01-17 15:23:43 -08:00
Kelven Yang be0d688511 CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations 2014-01-17 10:42:04 -08:00
Saksham Srivastava 330571cea6 CLOUDSTACK-5692: obscure passwords when using cifs as storage 2014-01-17 13:49:46 +05:30
Alena Prokharchyk 9c32605f2b CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin 2014-01-16 13:35:04 -08:00
Alena Prokharchyk c375ec62e2 CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin 2014-01-16 11:12:35 -08:00
Sateesh Chodapuneedi 90e01b1e10 CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"
Bump up RAM size of system offering for SSVM to 512MB. Fix if default service offering is already not present.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-01-16 01:35:25 +05:30
Min Chen 64350b6f2e CLOUDSTACK-5877: ListTemplates does not sort based on sort_key. 2014-01-15 16:58:30 -08:00
Mike Tutkowski fef4c79cb2 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-15 00:18:34 -07:00
Murali Reddy b6698f354c CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
2014-01-13 23:24:12 +05:30
Kelven Yang b2d5e374d9 CLOUDSTACK-5734: Fix the regression caused by adding hyper-V support 2014-01-10 17:58:48 -08:00
Marcus Sorensen 1f9ad23ba0 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 16:30:43 -07:00
Harikrishna Patnala 7a39b0a2e1 CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
2014-01-10 10:24:35 -08:00
Bharat Kumar 35e09c81e6 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-01-10 09:42:33 -08:00
Kishan Kavala 202a935fcd CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters. 2014-01-10 19:57:02 +05:30
Kishan Kavala ac68ebd631 CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. 2014-01-09 22:00:32 +05:30
Prachi Damle ce9760f4ce CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel
- Added keyword support
2014-01-08 17:59:23 -08:00
Min Chen 02f6e02a73 CLOUDSTACK-5840:Remove old API method. 2014-01-08 17:57:15 -08:00
edison 1f70154c34 CLOUDSTACK-5831: Fix NPE, in case the volume isn't attached to any pool 2014-01-08 17:07:45 -08:00
Min Chen 62aa14771c CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
(updateCloudToUseObjectStore) instead of two APIs.
2014-01-08 16:33:37 -08:00
Min Chen 5b07590786 CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 16:33:37 -08:00
edison f7e0a540d8 Merge remote-tracking branch 'origin/4.3' into 4.3 2014-01-08 16:27:16 -08:00
edison 086475647c CLOUDSTACK-5831: return quiescevm field in volumeresponse 2014-01-08 16:04:21 -08:00
Sheng Yang 4aad42e823 Revert "CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default"
This reverts commit 62be5fad12.

Refer to the latest comment in the bug.
2014-01-08 16:02:23 -08:00
edison d1c0aa157a CLOUDSTACK-5763: if vm is stopped, then don't check hypervisor support live storage migration capabilities. 2014-01-08 15:25:26 -08:00
edison b3d4b72508 CLOUDSTACK-5607: Don't delete the template if its stored in other zones. 2014-01-08 15:05:27 -08:00
edison b180717473 CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-01-08 14:35:15 -08:00
Wei Zhou 4bb85cd7f9 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
(cherry picked from commit fa43987e43)
2014-01-08 15:34:51 +01:00
Bharat Kumar 55a9b5d2a2 CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering. 2014-01-08 19:11:01 +05:30
Jayapal cb48c97801 CLOUDSTACK-5552 Setup private gateway state to ready on delete failure
On delete private gateway failure set the state to ready, So that it can be
deleted later.
2014-01-08 11:42:25 +05:30
Kelven Yang c75b0044ef CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-07 17:12:06 -08:00
Marcus Sorensen 5a8ea8ae71 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-07 17:03:36 -07:00
Alena Prokharchyk 6fd030cbf2 CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr 2014-01-07 15:01:27 -08:00
Jayapal 279e9cbe49 CLOUDSTACK-5552 fixed private gateway DB clean up on router upgrade required 2014-01-07 17:57:20 +05:30
Sanjay Tripathi 0706757e00 CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table. 2014-01-07 14:27:35 +05:30
Sanjay Tripathi 96823d3a62 CLOUDSTACK-5406: Not able to take snapshot becasue of secondary_storage limit of 400 gb exceeded even though we have not really consumed this limit in secondary store. 2014-01-06 15:48:23 +05:30
edison db25228b23 CLOUDSTACK-5329: fix NPE in storage migration for zone-wide primary storage, and also the serization error. 2014-01-03 16:44:21 -08:00
Kelven Yang ce7bc8fd90 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-03 15:47:03 -08:00