Commit Graph

7781 Commits

Author SHA1 Message Date
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
Daan Hoogland 920163f24f findbugs: possible nulpointer derefs 2014-01-29 13:09:17 +01:00
Daan Hoogland ee1e8a6c2a findbugs: use system account id instead of null (security considerations
to be made here)
2014-01-29 12:36:34 +01:00
Daan Hoogland fef2daf5d4 findbugs: compare strings with equals() 2014-01-29 12:06:34 +01:00
Min Chen 0063b60701 Remove ACL permission for a particular entity when it is deleted. The
hook is currently only done for deleteTemplateCmd.
2014-01-28 18:17:01 -08:00
Min Chen 72812cdf22 Grant public template permission to domain admin and normal user policy. 2014-01-28 17:41:27 -08:00
Daan Hoogland bd2acd1eff findbugs: comparison of wrapper objects 2014-01-28 23:20:45 +01:00
Prachi Damle 91317dc497 Changes for createDomain - create new group AND createAccount - add account to domain group 2014-01-28 09:48:19 -08:00
Marcus Sorensen 29e22384b7 fix checkstyle in DedicatedResourceVO.java, trailing space 2014-01-28 10:38:30 -07:00
Daan Hoogland 53777c9523 findbugs: removed obfuscating fields(cherry picked from commit
9495c68c13)
2014-01-28 17:42:17 +01:00
Daan Hoogland be21822cba findbugs: throw exceptions when found(cherry picked from commit
9772693dca)
2014-01-28 17:39:02 +01:00
Daan Hoogland 5d8e8fd3a2 findbugs: nullpointer guards and wrappertype comparisons(cherry picked
from commit 791b7f8f7f)
2014-01-28 16:46:05 +01:00
Daan Hoogland 9edeb24f3f findbugs: assign result of string manipulations(cherry picked from
commit 20127e09dc)
2014-01-28 16:36:27 +01:00
Daan Hoogland fae0556021 Findbugs: different issues solved(cherry picked from commit
0b13f8e59d)
2014-01-28 16:30:04 +01:00
Daan Hoogland 0daca84eff findbugs: removed fields injected in parent(cherry picked from commit 866a539b06)
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-01-28 15:59:04 +01:00
Daan Hoogland a16759a9b1 findbugs: byte[].toString -> Arrays.toString(byte[])(cherry picked from commit 23a3d99fc0)
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-01-28 15:51:08 +01:00
Daan Hoogland 44bc2beb14 findbugs: null-checks(cherry picked from commit
c58e509924)
2014-01-28 15:44:04 +01:00
Daan Hoogland fe262caa75 findbugs: retrieve the objects to remove from the collection(s) 2014-01-28 15:36:40 +01:00
Daan Hoogland 53feecaa76 findbugs: null check for gateway and netmask instead of gateway
twice(cherry picked from commit
d30ddf6d59)
2014-01-28 14:53:11 +01:00
Daan Hoogland a71871d11c findbugs: fixes for ApiServer, ApiSerializerHelper and
ApiXmlDocWriter(cherry picked from commit
9aced41d70)
2014-01-28 14:47:06 +01:00
Daan Hoogland 1c7361756c Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from
commit 9a1b882d0e)
2014-01-28 14:24:21 +01:00
Daan Hoogland 60e8d131cf findbugs: moved call on static object to synchronized block(cherry
picked from commit f3529a19a9)
2014-01-28 14:14:47 +01:00
Daan Hoogland 9eae5f6929 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git 2014-01-28 13:49:42 +01:00
Daan Hoogland 4f6638d7c7 findbugs: nullpointer dereference guarded(cherry picked from commit
43ba36f979)
2014-01-28 13:49:14 +01:00
Likitha Shetty 95bd04e449 CLOUDSTACK-5965. VM displayname is not returned by API.
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
2014-01-28 16:43:12 +05:30
Rajesh Battala 807dc09138 CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV 2014-01-28 07:03:08 +05:30
Min Chen f77974b5d2 Fix trailing whitespace from cherry-pick 2014-01-27 13:31:35 -08:00
Min Chen cfe7864618 CLOUDSTACK-5960: Domain admin or user cannot register a template using
S3/Swift object store.
2014-01-27 13:31:35 -08:00
Marcus Sorensen 0502d2f375 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-27 12:11:18 -07:00
Sanjay Tripathi b25ee92c34 CS-5950: Wrong storage tags are used for ISO deployed VMs. 2014-01-27 16:58:55 +05:30
Koushik Das a0f21ff6bf 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:43:20 +05:30
Min Chen d47d4bbd20 Guard NPE due to empty policies. 2014-01-23 18:32:48 -08:00
Prachi Damle 96a64b933e - Adding OperateEntry during loading of commands
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
2014-01-23 17:50:59 -08:00
Damodar Reddy 4925b9f6a1 CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic 2014-01-23 18:14:12 +05:30
Anshul Gangwar 513f1dba36 CLOUDSTACK-5705: fixed the thumbnail not wrking for hyperv 2014-01-23 10:54:08 +05:30
Anshul Gangwar b2de225f54 CLOUDSTACK-5703: putting rdp server port value in host details 2014-01-23 10:54:08 +05:30
Anshul Gangwar 5941ac46d2 CLOUDSTACK-5344 commit for console proxy rdp for hyperv 2014-01-23 10:54:08 +05:30
Nitin Mehta 1b89ae7acb CLOUDSTACK-5478:
Publish uuid for deployvm action event.
2014-01-22 16:50:50 -08:00
Prachi Damle 39c0a302b4 Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM 2014-01-22 13:59:59 -08:00
Min Chen 33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Alena Prokharchyk ab627bc767 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>
2014-01-21 17:45:53 -08:00
Alena Prokharchyk a0197006ef Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package 2014-01-21 17:19:52 -08:00
Min Chen c0da0a884a CLOUDSTACK-5921:S3 security key is stored in DB unencrypted 2014-01-21 14:34:32 -08:00
Mike Tutkowski 0846bfe1ff CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-20 23:10:54 -07:00
Min Chen 3689f72f27 CLOUDSTACK-5913:API rate limiting throws a different error than expected
when Throttle limit hit in the API.
2014-01-20 15:49:19 -08:00
Alena Prokharchyk 452c20b242 Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.
Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests
2014-01-20 13:37:52 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Kelven Yang a9733b5df2 CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations 2014-01-17 11:55:14 -08:00
Saksham Srivastava 06f8c1de75 CLOUDSTACK-5692: obscure passwords when using cifs as storage 2014-01-17 14:00:24 +05:30
Alena Prokharchyk bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Alena Prokharchyk 47fd67b7fa CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin 2014-01-16 13:34:45 -08:00
Mike Tutkowski 3ef560d925 CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false 2014-01-16 12:15:18 -07:00
Alena Prokharchyk aa6dddc778 CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin 2014-01-16 10:59:38 -08:00
Min Chen dd50210e74 CLOUDSTACK-5877: ListTemplates does not sort based on sort_key. 2014-01-15 17:39:00 -08:00
Sateesh Chodapuneedi 6d9146bf2d 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:30:06 +05:30
Min Chen 6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove
AclProxyService interface.
2014-01-14 16:19:25 -08:00
Alex Huang 68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Likitha Shetty 16d36dd75f Fix checkstyle 2014-01-14 14:04:57 +05:30
Likitha Shetty e5512960af CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid 2014-01-14 13:47:27 +05:30
Prachi Damle fac9f2da0f Adding messageBus events for adding and removal of an account. 2014-01-13 22:12:39 -08:00
Min Chen bae498c89e Handle search of those entities without db view created using new ACL
model.
2014-01-13 21:55:56 -08:00
Murali Reddy af657b3d71 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.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Prachi Damle 6cd121fe7b RootAdmin and DomainAdmin access check via IAM 2014-01-10 17:06:10 -08:00
Marcus Sorensen 8ee61f3a57 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
Min Chen 43f0f901dd Remove VO and DAO from cloud-engine-schema. 2014-01-10 15:57:39 -08:00
Min Chen e42a262f6c Remove old APIs and old security checker plugins. Also use QuerySelector
adapater in ACL search routine.
2014-01-10 14:54:31 -08:00
Prachi Damle 42e53702a2 CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel
- Added keyword support

Conflicts:

	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
2014-01-10 14:45:08 -08:00
Nitin Mehta 2571dd7713 CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
2014-01-10 14:19:36 -08:00
Harikrishna Patnala 5bf78b82c0 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:26:10 -08:00
Bharat Kumar 7053c222f9 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-01-10 10:01:43 -08:00
Kishan Kavala 9486a9652e 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.
Conflicts:
	engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
Mike Tutkowski 6944bf9bba Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:02:43 -07:00
Mike Tutkowski ae35782ccd Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 21:36:34 -07:00
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Mike Tutkowski 8b6e89c012 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:44:02 -07:00
Kelven Yang 1e2e1ea051 CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-09 14:29:13 -08:00
Kelven Yang 87381d4236 CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging 2014-01-09 14:29:12 -08:00
Kelven Yang ad6454d2bf CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic. 2014-01-09 14:29:12 -08:00
Kelven Yang 737a382c38 Fix a typo caused problem in attach-volume process 2014-01-09 14:29:12 -08:00
Kelven Yang ac0faeb091 Fix auto-merge caused issues 2014-01-09 14:29:12 -08:00
Kelven Yang 0587382265 CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement 2014-01-09 14:29:12 -08:00
Kelven Yang 8c93bd6080 CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Kelven Yang bf9a554522 CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Mike Tutkowski caf87ac5d9 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 15:06:25 -07:00
Mike Tutkowski 03118c2969 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 14:44:35 -07:00
Kishan Kavala 0e315f16c0 CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules. 2014-01-09 22:01:59 +05:30
Nitin Mehta 5c1d639bc4 CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
2014-01-08 18:32:51 -08:00
Min Chen ac8bc74269 CLOUDSTACK-5840:Remove old API method. 2014-01-08 18:11:12 -08:00
Min Chen 649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
(updateCloudToUseObjectStore) instead of two APIs.
2014-01-08 17:25:13 -08:00
Min Chen 858b9b1177 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 17:15:04 -08:00
Sheng Yang 1ea02fed4a Revert "CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default"
This reverts commit 3c68b9f850.

Refer to the latest comment in the bug.
2014-01-08 16:03:21 -08:00
Alena Prokharchyk c3680cc111 CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type 2014-01-08 15:38:50 -08:00
Alena Prokharchyk 07557eb570 CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse 2014-01-08 14:40:10 -08:00
Wei Zhou cbe2560a78 CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
(cherry picked from commit 4bb85cd7f9)

Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2014-01-08 15:38:06 +01:00
Kishan Kavala 3e45dfb942 CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering. 2014-01-08 19:10:40 +05:30
Bharat Kumar 776b5059fb CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/UserVmStateListener.java
2014-01-08 19:10:39 +05:30