etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,677 Commits 334 Branches 325 Tags 944 MiB
Commit Graph

2071 Commits

Author SHA1 Message Date
Alena Prokharchyk bbf5a912c6 list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only) 2014-03-03 14:37:46 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Jayapal 100a911229 CLOUDSTACK-6187: Fixed MigrateSystemVMCmd response for router 2014-02-28 16:46:57 +05:30
Alena Prokharchyk bb6fddf434 listVirtualMachines API: ability to search by service offering the vm is created from 
listVolumes API: ability to search by disk offering the volume is created from
 2014-02-26 16:56:33 -08:00
Daan Hoogland e431538b0a findbugs possible nullpointer mitigated 2014-02-26 11:56:49 +01:00
Prachi Damle f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-25 22:59:10 +01:00
Alena Prokharchyk e2ec094722 Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn 2014-02-21 14:51:22 -08:00
Alena Prokharchyk 0f489732c8 Display flag support for LB/InternalLB/NetworkACL rules 2014-02-21 14:03:10 -08:00
Alena Prokharchyk 92064e347a Display flag support for autoscale vmGroup and vmProfile 2014-02-21 11:52:50 -08:00
Alena Prokharchyk 27a790bdc1 DisplayFlag update support for PF/Firewall/EgressFirewall rules 2014-02-21 11:06:52 -08:00
Alena Prokharchyk 21d016b3dd API response: added new field to @Param - RoleType[] authorized() default {}. The field defines who is authorized to see this partciluar reponse field. If not specified, the parameter is returned to everybody 2014-02-20 17:15:43 -08:00
Alena Prokharchyk 2f7bfc0c73 Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only 2014-02-20 17:15:42 -08:00
Nitin Mehta c171e2c3e4 CLOUDSTACK-4744: Enhance root admin API updateVolume with chaininfo parameter as a part of "Better control over first party objects" feature. 2014-02-19 18:01:18 -08:00
Min Chen 8072e50845 Fixed a bug for listTemplates with TemplateFilter=shared. 2014-02-13 16:47:41 -08:00
Alena Prokharchyk e0de79b170 Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
Devdeep Singh 306ffa0218 CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't 
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
 2014-02-10 10:29:09 +05:30
Min Chen 7bab0bc304 Optimize fix for CLOUDSTACK-5987. 2014-02-07 16:08:12 -08:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Alena Prokharchyk 782c530685 Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type 
This reverts commit 447430c3df.

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-02-06 14:46:58 -08:00
Min Chen c440d90466 Merge fix for CLOUDSTACK-5987 in master to RBAC. 2014-02-05 16:34:01 -08:00
Alena Prokharchyk 7cb4b571c8 ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching 2014-02-04 15:47:13 -08:00
Prachi Damle f84375442e Merge branch 'master' into rbac 
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
 2014-02-04 12:07:32 -08:00
Antonio Fornie 447430c3df CLOUDSTACK-6003 fixing plus refactoring dispatcher 
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2014-02-04 13:37:08 +01:00
Alena Prokharchyk fc56f0cf42 Revert "Findbugs: different issues solved(cherry picked from commit" as it breaks UserVm API Response 
This reverts commit fae0556021.

Conflicts:
	server/src/com/cloud/dc/DedicatedResourceVO.java
 2014-02-03 17:20:28 -08:00
Alena Prokharchyk 48361d8a8b Fixed listAutoScaleVmGroups: used to return incorrect value in lbruleid field (wrong parameter was used when search in firewall_rules table - profileId instead of lbRuleId) 2014-01-31 09:21:55 -08:00
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
Daan Hoogland fae0556021 Findbugs: different issues solved(cherry picked from commit 
0b13f8e59d)
 2014-01-28 16:30:04 +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
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
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
Min Chen 33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Min Chen c0da0a884a CLOUDSTACK-5921:S3 security key is stored in DB unencrypted 2014-01-21 14:34:32 -08: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
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Saksham Srivastava 06f8c1de75 CLOUDSTACK-5692: obscure passwords when using cifs as storage 2014-01-17 14:00:24 +05:30
Min Chen dd50210e74 CLOUDSTACK-5877: ListTemplates does not sort based on sort_key. 2014-01-15 17:39:00 -08:00
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
Min Chen bae498c89e Handle search of those entities without db view created using new ACL 
model.
 2014-01-13 21:55:56 -08: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
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
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
Nitin Mehta 5c1d639bc4 CLOUDSTACK-5829: 
listvms should return the diskoffering id when deployed with an iso
 2014-01-08 18:32:51 -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
Min Chen 89a20d3eed CLOUDSTACK-5771:listImageStores returns error in keyword search. 2014-01-06 14:50:10 -08:00
Min Chen e02e19a6f1 Make AclApiServiceTest pass without changing ApiServerService signature. 2014-01-06 10:43:01 -08:00
Min Chen d374cd5a2c Add Unit Testcases for AclApiService. 2014-01-03 17:18:44 -08:00
Devdeep Singh e59420c514 CLOUDSTACK-5691: Fix for attaching an uploaded volume to instance running 
on hyperv. There were multiple issues here. Upload volume was actually
failing because the post download check for vhd on the cifs share was
unsuccessful. Also the agent code wasn't parsing the volume path correctly.
Fixed it too.
 2014-01-03 16:55:28 +05:30
Prachi Damle e5b4a1d869 Moved the loading of commands.properties to the IAM plugin 2014-01-02 18:39:18 -08:00
Sanjay Tripathi db8d5f602a CLOUDSTACK-5422: Changing XenServer Tools Version 6.1 + doesnt work. 2013-12-30 20:01:06 +05:30
Prachi Damle b7c3411be9 Fixing the issues in loading the beans 2013-12-26 15:17:10 -08:00
Alena Prokharchyk 526af5e326 Included guestOsId to userVmResponse - as we let to change this param through updateVm call, we should return it in the response 2013-12-26 13:28:29 -08:00
Alena Prokharchyk 03226ba539 Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm 2013-12-24 15:34:43 -08:00
Min Chen 630b7fb4a1 Fix listTemplates issues with new ACL model. 2013-12-20 17:57:44 -08:00
Prachi Damle ce774e184e Fixing the management server startup 2013-12-18 14:14:55 -08:00
Kishan Kavala cc27a740dc CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true 
Conflicts:
	server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
 2013-12-18 18:29:08 +05:30
Min Chen e53081fe26 CLOUDSTACK-5534: MySQL exception raised when searching for users with 
keyword.
 2013-12-17 16:58:22 -08:00
Min Chen 729a79e85c Refactor db view based list apis to use new IAM acl search criteria. 2013-12-16 14:31:32 -08:00
Likitha Shetty 7cac5aa9fc CLOUDSTACK-5514. Response of listAccounts API call includes removed users 2013-12-16 15:53:08 +05:30
Prachi Damle 3f092d14cc Adding the AclEntityType attribute to APICommand annotation 2013-12-13 16:04:25 -08:00
Min Chen d2922b9254 Separate ListAccounts cmd to use two different views. 2013-12-12 17:52:45 -08:00
Min Chen 312ff76f69 Separate listZones cmd to use two different views, also renamed previous 
listZonesByCmd to listZonesCmd.
 2013-12-12 17:40:30 -08:00
Min Chen a6d03cd826 Separate IpAddress related cmds to use two different views. 2013-12-12 17:20:34 -08:00
Min Chen add277a4aa Separate network and VPC related cmd to use two different views. 2013-12-12 16:53:59 -08:00
Alena Prokharchyk 9df10718e4 Resource metadata support for S2SVpnConnection 
Conflicts:
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
	setup/db/db/schema-421to430.sql
 2013-12-12 16:39:02 -08:00
Prachi Damle 7c6f1c14c2 ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and 2013-12-12 16:31:00 -08:00
Nitin Mehta b084cc469a CLOUDSTACK-5283: 
Not able to list snapshots when few snapshots are in "CreatedOnPrimary" state. Dont throw an exception when snapshot doesnt have an entry in the snapshot store ref for the snapshot in Image store because that fails to list all snapshots and also it can a perfect use case when the backup flag is not turned on.
 2013-12-12 13:18:56 -08:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Min Chen 67b97539ac Separate ListTemplatePermissions and ListIsoPermissions commands to use 
two different views.
 2013-12-11 17:41:10 -08:00
Min Chen 8f21eca922 Separate Template/ISO related APIs to use two different views. 2013-12-10 12:23:39 -08:00
Min Chen d252d95c26 Separate all vm related user APIs to have two different views. 2013-12-09 17:30:57 -08:00
tuna 015ab6af8a fix rebase master 2013-12-09 23:33:14 +07:00
tuna d935d3865a tuna 2013-12-09 23:33:14 +07:00
Min Chen a416f6c3c3 Fix API build error based on new DB schema, now only 
RoleBasedEntityAccessChecker needs to be fixed.
 2013-12-06 15:09:00 -08:00
Min Chen c3f480e9b9 Updated db schema based on latest FS. Still need to fix old code in 
AclServiceImpl, RoleBasedEntityAccessChecker and QueryManagerImpl to
make all build.
 2013-12-04 18:44:30 -08:00
Bharat Kumar 68406ba29d CLOUDSTACK-5161 enable scaling of a vm using custom offering 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-29 17:53:33 +05:30
Wei Zhou abd4a826e9 Revert "CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer" 
This reverts commit 5cc47f77c5.
 2013-11-29 10:52:51 +01:00
Wei Zhou 5cc47f77c5 CLOUDSTACK-5033: set origin ip address in logs if management servers is behind a reverse proxy or load balancer 2013-11-29 10:39:04 +01:00
Likitha Shetty 6bda2739c8 CLOUDSTACK-5302. listHosts API response - value of cpuallocated is always 0% 2013-11-28 15:52:42 +05:30
Wei Zhou 221aea5730 CLOUDSTACK-5299: set hypervisor_type of volumes from image format if not set. 2013-11-28 10:47:21 +01:00
wilderrodrigues 226b193488 Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak 
Signed-off-by: Daan Hoogland <daan@onecht.net>
 2013-11-27 14:20:29 +01:00
Prachi Damle cf69731a52 Suring startup load the API permissions from commands.properties and @APICommand annotations 2013-11-25 17:01:56 -08:00
Nitin Mehta a1ca4f1d56 CLOUDSTACK-5221: 
In order to keep backward compatibility, listisos should return an empty response than an error when id of a removed iso is passed.
 2013-11-25 13:47:42 -08:00
Prachi Damle f231cec5b7 Loading api permissions from commands.properties during startup 2013-11-25 10:59:12 -08:00
Min Chen 015d06e7fc Separate all volume related APIs to two Cmd classes based on two 
response views.
 2013-11-22 18:48:20 -08:00
Min Chen 11c0c263f2 QueryChecker interface and ACL search criteria to be used for query api 
for entities with db views created.
 2013-11-22 16:36:38 -08:00
Min Chen 81a794a5d3 Change two static response views to Full and Restricted. 2013-11-21 10:32:08 -08:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang 224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Murali Reddy 899e9f0d60 CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as 
"Public IP Address" for system VMs

In system VM response object return EIP as public IP in case of basic
zone with EIP service.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-11-21 15:20:28 +05:30
Likitha Shetty 6aafb9c50d CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API. 
During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters.
 2013-11-21 13:40:06 +05:30
Min Chen 7ed030115e Updated DB schema and DAO layer classes according to new FS. 2013-11-20 17:32:09 -08:00
Prachi Damle e0d2423f06 Refactoring account_type for Domain_Admin and Normal_User types 2013-11-20 16:53:59 -08:00
Wido den Hollander 1edaa36cc6 CLOUDSTACK-1302: Allow a cache mode per disk offering 
Per disk offering the setting none, writeback or writethrough can be set

This allows for both safety and performance for writes.
 2013-11-20 17:11:10 +01:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Min Chen 91e176cb0d Fix a bug in listVm logic to use revokedIds and grantedIds. 2013-11-19 16:41:40 -08:00
Syed Ahmed 481af07fb1 Adding protocol parameter to loadbalancer response 2013-11-19 22:12:44 +05:30
Hugo Trippaers 1ece5f0c28 StoragePoolResponse.getId() returns a String with an UUID 2013-11-18 14:27:06 +01:00
Kishan Kavala a9413707c9 Fix listRouter by clusterId and upgradeRouterTemplate by clusterId 2013-11-18 13:05:34 +05:30
Edison Su 1292b76c63 Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage. 
And also add a new table: snapshotdetails
 2013-11-14 15:55:39 -08:00
Alena Prokharchyk d905c10214 listFirewallRules - added optional networkId parameter allowing to search for firewall rules by guest network id 2013-11-12 17:17:48 -08:00
Bharat Kumar 5e14e1692d CLOUDSTACK-5063 Disk offering tied to a compute offering should not shown in disk offering section 2013-11-12 15:15:35 +05:30
Alena Prokharchyk 268c27b4f2 ListPortFowardingRules: added networkId to the list of optional parameters to list by 2013-11-11 16:17:43 -08:00
Rajesh Battala 19e9849d86 Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column. 
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
 2013-11-08 20:21:18 +05:30
Min Chen dc3d279272 CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing 
from BVT suite, during LIST api call.
 2013-11-07 15:19:19 -08:00
Kishan Kavala 3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Bharat Kumar 7095ea2b5e CLOUDSTACK-4738 Dynamic compute offering. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-07 12:41:20 +05:30
Will Stevens 8f8ad3f38e Squashed commit of the Palo Alto Networks firewall integration plugin. 
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).

More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration

Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)

Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2013-11-06 10:08:22 -08:00
Harikrishna Patnala a286dec098 CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse 
Signed-off-by: Koushik Das <koushik@apache.org>
 2013-11-05 16:12:36 +05:30
Min Chen ce3638bb03 Merge branch 'master' into rbac. 2013-11-04 15:49:29 -08:00
Alena Prokharchyk 7a26894eb0 Changes to @Parameter - added RoleType[] authorized() field. The field defines who is authorized to put the parameter to the call. If the person is not authorized, the parameter will be ignored. 
Also fixed CLOUDSTACK-5024 - added storageId to the list of the request parameters (available to the Root admin only)
 2013-11-01 22:48:11 -07:00
Min Chen 2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Wei Zhou 4495d456ed CLOUDSTACK-4830: fix build error 2013-10-31 11:50:01 +01:00
Wei Zhou 5109498783 CLOUDSTACK-4830: allow create account and user by domain admin 
(cherry picked from commit 0d12e3eb9d)
 2013-10-31 11:36:54 +01:00
Sheng Yang 3205cd42b5 CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR 
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.

Test case also included.

The test case would create 2 vpcs and using VPN to connect them.
 2013-10-30 19:30:22 -07:00
ynojima a6b6fa65fa CLOUDSTACK-4932: bugfix : listNetworks API doesn't return VLAN ID (VNI) 
Signed-off-by: ynojima <mail@ynojima.net>
Signed-off-by: Toshiaki Hatano <haeena@haeena.net>
 2013-10-31 00:37:04 +09:00
Alena Prokharchyk e7685f816a CLOUDSTACK-4988: when listTemplates call is executed by regular user, but templateFilter=community is passed in, return public templates of subdomains 2013-10-29 10:58:53 -07:00
Alena Prokharchyk 591dcd1d1c ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
Alena Prokharchyk 2cac1aaa0f Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud) 2013-10-28 15:03:57 -07:00
Alena Prokharchyk 5caeab782d ResourceDetails - 
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
 2013-10-28 14:45:52 -07:00
Alena Prokharchyk 300f626d42 Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase 2013-10-25 14:21:20 -07:00
Alena Prokharchyk aa9f8e64ae Resource details: added way of generic access of resource DAO based on the resourceType passed in (was hardcoded before) 2013-10-25 11:57:17 -07:00
Alena Prokharchyk 0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00
Alena Prokharchyk 24725f8e21 ResourceDetails: 
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
 2013-10-24 15:54:49 -07:00
Alena Prokharchyk 2bb716efd8 ResourceMetaData (Resource details) fixes: 
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
 2013-10-23 17:39:16 -07:00
Alena Prokharchyk e52e7a5634 CLOUDSTACK-4874: rever the previous commits. Service offering details are already being returned in "serviceofferingdetails" field of the service offering response 2013-10-23 17:17:14 -07:00
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' 
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-10-23 12:31:53 -07:00
Chris Suich 0ed7ebd7e7 Squashed & merged commit of the following: 
commit c9ee0d12e191e803fb341f3f96e95ca434a36f6c
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Wed Oct 23 16:55:10 2013 +0200

    CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
    (cherry picked from commit a94acc5a43)

commit fe1586c71377bc6d219db2dcf088c40b65dd1fc4
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Tue Oct 22 11:20:27 2013 -0700

    CLOUDSTACK-4649:
            vm sync tracks the pv driver version for xenserver

     Anthony

commit 56a218f66eda540b4b4b04030ee71fc6863f8532
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Mon Oct 21 16:10:07 2013 -0700

    CLOUDSTACK-4649:
        xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
    this patch tracks PV driver versions in vm details and template details.

    Anthony

commit 4e85d28c678a6f96b5b70d8d33fc60f9d1ea3df6
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Date:   Mon Oct 21 21:17:33 2013 +0200

    removed unused static field

    - s_httpClientManager was not used

    Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

commit d4121fa26023db236f7396cea455ef090672ae9a
Author: Chris Suich <chris.suich@netapp.com>
Date:   Tue Oct 22 10:45:22 2013 -0400

    Updated DataMotionServiceImpl and ApiResponseHelper based on review feedback.

commit aaf026e1e4204d405bcda2ae4f1a01b1d0f7e7cb
Author: Chris Suich <chris.suich@netapp.com>
Date:   Thu Oct 17 14:27:12 2013 -0400

    Added context to strategy sorting error responses
    Added TODOs for DRYing out pickStrategy() overloading

commit a221f4aa3fb2ddc255bc35cf753f98f88f5bf44e
Author: Chris Suich <chris.suich@netapp.com>
Date:   Wed Oct 16 09:57:28 2013 -0400

    Updated inefficient strategy sorting/selection
    Removed unnecessary canRevertSnapshot from PrimaryDataStoreDriver
    Other general cleaup and fixes from reviews

commit 7d58949c6a1b7e853e891b59387a9620e8cd7a91
Author: Chris Suich <chris.suich@netapp.com>
Date:   Mon Oct 14 14:01:22 2013 -0400

    Added volume snapshot revert capability to SnapshotResponse
    Updated UI to hide/show snapshot revert action per snapshot

Signed-off-by: Edison Su <sudison@gmail.com>
 2013-10-23 12:21:43 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2013-10-23 11:14:42 -07:00
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2013-10-23 10:40:44 -07:00
Alena Prokharchyk 3ec14c4baf CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter) 
Conflicts:
	api/src/org/apache/cloudstack/api/response/UserVmResponse.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/api/query/vo/UserVmJoinVO.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
 2013-10-22 13:50:43 -07:00
Wei Zhou cd72e2afee fix a bug in listServiceOffering with vmId 2013-10-21 14:05:53 +02:00
Alena Prokharchyk aa570783e8 Added resource tag support for Zone 2013-10-17 15:26:28 -07:00
Darren Shepherd 711ad386d1 Random cleanup 2013-10-16 16:18:49 -07:00
Nitin Mehta fc6c1ec812 CLOUDSTACK-4882: 
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-16 15:02:18 -07:00
Darren Shepherd f62e28c1ec New Transaction API 
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
 2013-10-16 09:21:00 -07:00
Alena Prokharchyk 818e6f98fd CLOUDSTACK-4874: added resource tags to the Service offering object. Tags can be created by using createTag API command; you can list service offerings by tags when pass "resourceTag" parameter to the listServiceOfferings call 2013-10-15 17:08:55 -07:00
Chris Suich e514da2c48 Removed setters from *JoinVO classes 2013-10-14 15:20:17 -07:00
Laszlo Hornyak 5f497b9a75 Removed unused methods from ApiResponseSerializer 
getGetMethod and getGetMethodName were not used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-12 19:42:50 +02:00
Min Chen 00ad19601b Fix a bug in building acl condition, now we get previous default list 
behavior for admin,domain admin and user.
 2013-10-10 23:02:49 -07:00
Nitin Mehta fa0c685bcb CLOUDSTACK-4854: 
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-10 19:18:39 -07:00
Alena Prokharchyk 90cc0d8f01 VolumeResponse: added storageId to the response (returned to admin only) as this parameter is being passed in migrateVolume/updateVolume API requests, so have to return it in the response as well 2013-10-10 16:51:47 -07:00
Alena Prokharchyk c4084a7c34 Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it. 2013-10-10 11:13:47 -07:00
Min Chen 2b4703b6e6 Change ListVMsCmd to use new role and entity permission information. 2013-10-09 21:56:52 -07:00
Alena Prokharchyk a5a6f58eb8 Resource details: 
1) Fixed the way we build the response for resource details
2) Fixed the response name - should be generic "resourcedetail". The type is being carried in resourceType response parameter
3) Throw unsupported excpetion if unsupported resourceType is passed in. Before, user vm was returned
 2013-10-09 18:22:49 -07:00
Min Chen f59e47b263 Clean up ListVMsCmd implementation to not using Criteria class. 2013-10-08 15:11:56 -07:00
Min Chen b87b9e5c64 Add Scope to acl_role_permission, remove parent_role_id from acl_role 
table, and create PermissionScope and AclEntityType enum types.
 2013-10-07 16:09:26 -07:00
Nitin Mehta 6e80bb001c CLOUDSTACK-4824: 
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-07 15:48:43 -07:00
Min Chen ddd4f80911 Revert "Revert "Fix a bug in generating account response, passed wrong parameter to get"" 
This reverts commit 283ec27934.
 2013-10-07 12:00:51 -07:00
Min Chen 440f03e548 Revert "Fix a listAccount regression due to root admin role refactoring." 
This reverts commit d79cb380e1.
 2013-10-07 12:00:38 -07:00
Min Chen d79cb380e1 Fix a listAccount regression due to root admin role refactoring. 2013-10-07 11:53:38 -07:00
Chris Suich 4c2e40ac37 Added storage_provider_name to storage_pool_view 
Signed-off-by: Edison Su <sudison@gmail.com>
 2013-10-07 11:51:32 -07:00
Min Chen 283ec27934 Revert "Fix a bug in generating account response, passed wrong parameter to get" 
This reverts commit b633950a68.
 2013-10-07 11:47:01 -07:00
Nitin Mehta a6852a340d CLOUDSTACK-3101: 
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-04 18:19:07 -07:00
Nitin Mehta f8976a41ce CLOUDSTACK-3101: 
fix listVolumes to not display volumes to the normal users with forDisplay=false. But display volumes to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-04 16:16:28 -07:00
Nitin Mehta 73f6843840 CLOUDSTACK-4803: 
Return "path" parameter as a result of all Volume calls. But to the admin only
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-03 18:00:42 -07:00
Nitin Mehta 2229e3e242 CLOUDSTACK-4803: 
fix listVirtualMachines to not display vms to the normal users with forDisplay=false. But displayvms to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-03 15:10:55 -07:00
Min Chen b633950a68 Fix a bug in generating account response, passed wrong parameter to get 
account resource limit.
 2013-10-02 17:46:00 -07:00
Min Chen d84d62a1e0 Separate Admin and User command and response for ListVMsCmd. 2013-10-02 17:45:14 -07:00
Darren Shepherd 67186429e1 Spring Modularization 
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
 2013-10-02 15:41:04 -07:00
Nitin Mehta 8466fad6ca CLOUDSTACK-4785: 
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
 2013-10-02 14:53:07 -07:00
Darren Shepherd aed5e9dc2a Add Manage Context framework 
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
 2013-10-02 13:09:52 -07:00
Min Chen 5583506c0c Add entity permission grant and revoke API. 2013-09-30 17:03:34 -07:00
Min Chen de0904ba63 Modify AccountResponse to return groups that account belongs to. 2013-09-30 14:14:38 -07:00
Darren Shepherd efbfae723e Switch to setter injection for extensibility 
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
 2013-09-30 09:45:07 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Min Chen 0be374a796 Add All Apis for ACL Group. 2013-09-27 18:16:18 -07:00
Min Chen 97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
Min Chen fce2aad23d WIP For APIs related to ACL Roles. 2013-09-26 11:22:43 -07:00
Prachi Damle aba54356d5 Account_Type Refactoring for Root Admin Role 
- change the AccountService::isRootAdmin(short) to  isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
 2013-09-24 15:31:09 -07:00
Wei Zhou 98c79cc313 CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword 2013-09-24 15:01:14 +02:00
Wei Zhou e61f1bb158 fix issue: listHosts with hahost throws exception 
(cherry picked from commit a206f423a3)
 2013-09-24 11:59:35 +02:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Min Chen 22c5ea0ebe CLOUDSTACK-4671:ListZone API failed with Assertion error if assertion is 
turned on for MS.
 2013-09-13 17:21:24 -07:00
Laszlo Hornyak cb3a3da75d simplify setCpuUsed 
- variables inlined
- cpu utilization is not cast to float from double

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 21:33:02 -07:00
Laszlo Hornyak d3237e75b2 simplified casting 
double values do not need a Double object to be casted to long

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 18:27:54 -07:00
Alex Huang b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang 435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang 8e5249df62 Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
Prachi Damle f31c318158 Changes required to merge to master: 
- Replace UserContext by CallContext
 2013-09-03 20:03:11 -07:00
Prachi Damle 6a0bda0280 CLOUDSTACK-4337 Dedicated Resources: Zone dedicated to an account should only be visible and accessible to that account 
Changes:
- When listing a zone, add clause in the search to check the account_id for a dedicated zone
- When listsing a zone with a domainid, add a similar clause.
- DomainCheck:: checkAccess() for a zone should consider that zone can now be dediacted to a specific account and check access accordingly.

Conflicts:

	server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
	setup/db/db/schema-410to420.sql
 2013-09-03 20:02:59 -07:00
Prachi Damle 012afceed2 CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues 
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table

updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table

listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.

DedicateZone API:
- set domainid in the data_center table

ReleaseDedicatedZone API:
- remove zoneid from the data_center table
 2013-09-03 20:02:56 -07:00
Prachi Damle a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain 
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
 2013-09-03 20:02:34 -07:00
Daan Hoogland d9c06e538b CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods 2013-09-01 22:53:23 +02:00
Ian Duffy bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
frank 64f9f0cee6 CloudStack CLOUDSTACK-4484 
Vmware - Not able to fetch userdata from guest Vms using http://<router-address>/latest/user-data
 2013-08-26 17:54:39 -07:00
Alex Huang abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Marcus Sorensen 62072514f0 CLOUDSTACK-4661: fix vpcid field in response of creating vpn gateway 2013-08-22 15:17:12 -06:00
Alena Prokharchyk d5379b8704 CLOUDSTACK-4392: API volumeresponse - return primary storage information to ROOT and resource domain admin only. 2013-08-21 15:43:06 -07:00
Min Chen 97ff4981c5 CLOUDSTACK-3274: Remove duplicate cleanString calls in logging api for 
performance improvement.
 2013-08-16 11:10:25 -07:00
Min Chen 081cfa7b6b CLOUDSTACK-4277:listTemplate should return empty list without any zone 
configuration.
 2013-08-15 16:47:35 -07:00
Wei Zhou 3ab1abc6ba CLOUDSTACK-4296: fix a similar issue 
(cherry picked from commit e2f47871d1)
 2013-08-13 21:56:21 +02:00
Wei Zhou da7f924cc5 CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command 
(cherry picked from commit 72f013f780)
 2013-08-13 21:39:24 +02:00
Kishan Kavala 29a399b9ae CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records. 
Filed CLOUDSTACK-4299 to make these entities always available.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2013-08-13 18:53:00 +05:30
Alex Huang de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -07:00
Jessica Wang 3c16adf6dc CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response. 2013-08-12 17:50:02 -07:00
Murali Reddy 5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard 
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
 2013-08-12 18:12:13 +05:30
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build" 
This reverts commit b59e3aaefc.
 2013-08-08 15:02:40 -07:00
Min Chen 1a194ef725 CLOUDSTACK-1405:ZWPS: listStoragePool API doesn't accept scope parameter 
.
 2013-08-08 10:10:15 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build 
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-08-08 14:46:56 +05:30
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Murali Reddy 323f246765 CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of 
UI firing an incorrect API

adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response
 2013-08-06 16:01:11 +05:30
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Alex Huang a673d17171 Added missing file 2013-08-02 11:07:56 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Alena Prokharchyk 4e53ce0677 CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info 2013-08-02 09:03:57 -07:00
Likitha Shetty 871e3bb279 CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0. 
Add vpc resource count to the response. And set the right values for network resource count.
 2013-08-01 14:18:33 +05:30
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-08-01 10:47:36 +08:00
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-31 15:31:42 +05:30
Alena Prokharchyk 244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 
Fixed the build: use CallerContext instead of UserContext
 2013-07-30 13:53:31 -07:00
Alena Prokharchyk 43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command" 
This reverts commit 416331ae80.
 2013-07-30 12:05:09 -07:00
Alena Prokharchyk 416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
Prachi Damle 790a02f936 CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner 
Changes:
- API is fixed to return the service_offering details

Conflicts:

	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
 2013-07-28 22:44:00 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Sanjay Tripathi 13fc4690fc CLOUDSTACK-3488: listStoragePools throws NPE if any of the storage pools are not in the right state. 
This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
 2013-07-26 16:00:06 +05:30
Edison Su 5e427bd2f6 CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4 2013-07-25 16:36:06 -07:00
Ian Duffy eaa4143371 Merge LDAPPlugin 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-07-25 17:54:52 +05:30
Alex Huang 555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Chiradeep Vittal 1744ed7ad5 CLOUDSTACK-3626 register the correct user and account for api calls made with api keys and secret keys 2013-07-25 14:45:59 +05:30
Saksham Srivastava 135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Likitha Shetty 7e87221372 CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError. 
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
 2013-07-23 18:44:39 +05:30
Alena Prokharchyk d0422904d7 CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account 
Conflicts:
	server/src/com/cloud/api/ApiServer.java
 2013-07-22 10:28:42 -07:00
Min Chen d423a755f5 CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing 
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
 2013-07-20 18:01:49 -07:00
Min Chen 6689e83d7f CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results 
when id and zoneid are passed.
 2013-07-20 15:18:33 -07:00
Min Chen 598a647105 ListIsos only shows cross-zone ISO in one zone. 2013-07-18 10:56:45 -07:00
Prasanna Santhanam 0c5b698ac8 CLOUDSTACK-3633: AffinityGroupResponse does not include uuid 
The uuid->id of the affinity group created is not included as part of
the response. Included the uuid.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit fbf38a35d2)

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-07-18 18:31:23 +05:30
ahuang 11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Min Chen 52434dabcc CLOUDSTACK-2595: [Automation] Failed download default template for 
second zone. Actually it is a listTemplate issue.
 2013-07-15 17:38:09 -07:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Murali Reddy b3fd25d45e CLOUDSTACK-3485: NPE while getting instance ID from Asyn Job when 
publishing async job events on eventbus

handing case where instance id is null in the asyn job, while publishing
asyn job events on to event bus
 2013-07-12 13:48:00 +05:30
Sanjay Tripathi 429e6bd4bb CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required. 
User should be able to delete/archive alerts and events by selecting a time period or by
choosing the alerts and events older than a date. Added the ability to choose a time period
too.
 2013-07-11 14:12:17 +05:30
Jessica Wang ec42d7236c CLOUDSTACK-2988: API - Template Response - add isdynamicallyscalable property. 2013-07-10 13:51:54 -07:00
Ryan Dietrich 70f33efa72 CLOUDSTACK-3190: Async jobs actions now trigger event bus messages to be 
published

-AsyncJobManagerImpl to publish async job events when async jobs are
created, updated and completed
 2013-07-05 17:48:25 +05:30
Alex Huang bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -07:00
Min Chen 9a3067fb87 CLOUDSTACK-3314: templates downloaded to S3 should show up in 
listTemplates when zoneId is provided.
 2013-07-02 15:47:49 -07:00
Alena Prokharchyk 8a0470ee0f CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response 
Conflicts:
	setup/db/db/schema-410to420.sql
 2013-07-02 15:34:08 -07:00
Min Chen 05f4680735 CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone 
templates.
 2013-07-02 13:54:40 -07:00
Jessica Wang 1762be05a9 CLOUDSTACK-2084: API - when account type is ACCOUNT_TYPE_PROJECT, make listVlanIpRanges API to return accountName. 2013-07-01 14:22:06 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes 
SolidFire plug-in

SolidFire plug-in related
 2013-06-28 16:59:21 -06:00
Min Chen 3160a0c2da Add template zone related information into TemplateZoneResponse. 2013-06-27 14:34:00 -07:00
Wei Zhou 181567ba74 CLOUDSTACK-1192: Disk I/O Statistics (vm stats) support KVM and XenServer only util 2013/06/25 2013-06-27 14:25:54 +02:00
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Min Chen 64c5266ec5 CLOUDSTACK-3120: ListTemplates didn't return Baremetal templates after 
storage refactor.
 2013-06-21 16:10:39 -07:00
Min Chen 2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Min Chen 2fe732b354 CLOUDSTACK-3080: listVirtualMachines tag search refinement no longer 
working.
 2013-06-20 15:44:01 -07:00
Alena Prokharchyk 2072026340 CLOUDSTACK-3088: fixed listRouters/listInternalLbVms by name 2013-06-20 10:37:59 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm 
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-06-20 11:08:38 +05:30
Saksham Srivastava e420c3be8c CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order 2013-06-20 10:58:50 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Edison Su 11b9d5ff64 CLOUDSTACK-1405: add scope type in liststoragepoolcmd 2013-06-19 14:09:49 -07:00
Jessica Wang d5d0142ed4 CLOUDSTACK-3016: listZones API - take in networktype instead of zonetype parameter to be consistent with networktype property in ZoneResponse. 2013-06-19 10:22:14 -07:00
Jessica Wang 2f2bb6b316 CLOUDSTACK-3016: remove zonetype property from API response (userVM) 2013-06-18 14:55:56 -07:00
Jessica Wang 759eeca651 CLOUDSTACK-3016: remove zonetype property from API response (snapshot, ISO, template, network, volume) 2013-06-18 14:42:38 -07:00
Jessica Wang 0a8343e750 CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM) 2013-06-18 13:54:37 -07:00
Jessica Wang b5abc0862b CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API. 2013-06-18 10:41:37 -07:00
Wei Zhou 0dd45513e3 CLOUDSTACK-2885: show cpuNumber and cpuSpeed on VM Statistics page 2013-06-18 17:00:44 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Laszlo Hornyak 202cd15290 NPE fix 
- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-06-17 19:19:43 +01:00
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Jessica Wang 8925d39b78 CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. 2013-06-14 16:51:20 -07:00
Jessica Wang b4a692d80f CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. 2013-06-14 16:39:04 -07:00
Jessica Wang ea0de9eaf4 CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. 2013-06-14 16:33:27 -07:00
Jessica Wang cb37d4cb63 CLOUDSTACK-3016: remove zonetype parameter from listHosts API. 2013-06-14 16:14:45 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref 
state column to represent the state of a template in each zone.
 2013-06-14 15:14:09 -07:00
Jayapal b72c79b370 CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-06-13 14:37:34 +05:30
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit 
c30d9be3ce) into object_store.
 2013-06-12 11:20:32 -07:00
Nitin Mehta 83fcba9ee6 CLOUDSTACK-2946 
CS-15158: Correcting the allocated size for local storage in listStoragePools
 2013-06-12 14:58:54 +05:30
Harikrishna Patnala 215b638e8e CLOUDSTACK-2347: Zone filter for listSnapshots API 
Added new optional parameter zone id in listSnapshots API which allows to list snapshots with additional criteria.
   Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
 2013-06-12 13:35:58 +05:30
Wei Zhou 76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Prachi Damle 8c9f681f9e CLOUDSTACK-2350: Anti-Affinity - As admin user, when tryinto update the affinity group for a Vm that is deployed by a regular user , he is presented with admin's affinity groups. 
Changes:
- listAffinityGroups API takes in accountname and domainId parameter
- For admin, listall=true should return all affinity groups of all users
 2013-06-07 15:28:28 -07:00
SrikanteswaraRao Talluri 4da995238b CLOUDSTACK-2783: FIXED listHypervisorCapabilities API response to include the following fields: 1. maxdatavolumes 2. maxhostspercluster 3. storagemotionenabled 2013-06-05 13:50:41 +05:30
Min Chen e92cd6d632 Move data store specific extract volume logic from VolumeManager to data 
store driver.
 2013-06-04 13:54:14 -07:00
Min Chen ef03d5a122 Move data store specific extract template/iso logic from 
TemplateManager to data store driver.
 2013-06-04 11:50:43 -07:00
Prasanna Santhanam 0401774a09 StoragePoolForMigrationResponse -> StoragePoolResponse 
The additional response type is basically the same as
StoragePoolResponse. Only additional state reported is whether the
storage pool is suitable for migration. Since this is fetched from
hypervisor capabilities there is no need for a new response type.

Tested with the simulator and I can see the response format correctly.

mysql> select * from hypervisor_capabilities where id=18\G
*************************** 1. row ***************************
                      id: 18
                    uuid: 98b88e6e-ccf1-11e2-bd2a-af89de8bd27e
         hypervisor_type: Simulator
      hypervisor_version: NULL
        max_guests_limit: 100
  security_group_enabled: 1
  max_data_volumes_limit: 100
   max_hosts_per_cluster: 100
storage_motion_supported: 1
     vm_snapshot_enabled: 1
1 row in set (0.00 sec)

CloudMonkey output as below:
> find storagepoolsformigration id=0a644f79-53dd-4eb6-a871-64679a47cfc6
count = 1
storagepool:
name = PS0
id = 7c07ec9b-a3c6-3466-ab5a-f5669ead0b22
clusterid = 71fb5c34-4852-46e6-bb8f-c9da4e8f827c
clustername = C0
created = 2013-06-04T14:06:55+0530
disksizeallocated = 0
disksizetotal = 1099511627776
disksizeused = 0
ipaddress = 10.147.28.6
jobstatus = 0
path = /export/home/sandbox/primary0
podid = 560d9600-35dd-4a50-addd-81d5618536e9
podname = POD0
scope = CLUSTER
state = Up
suitableformigration = True
type = NetworkFilesystem
zoneid = 3108f711-0db6-4dad-a0d0-2fd7d413e5ef
zonename = Sandbox-simulator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-04 14:26:40 +05:30
Prasanna Santhanam 767ed065c5 CLOUDSTACK-2815: Include dedication in simulator context 
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-06-03 21:51:18 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling" 
This reverts commit 6dad8adf8f.
 2013-06-03 07:48:03 +02:00
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Sateesh Chodapuneedi e7d468e221 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments 
DB changes to support hypervisor specific zone wide storage pool.
Added method findZoneWideStoragePoolsByHypervisor to PrimaryStorageDaoImpl to find suitable zone wide storage pool of specific hypervisor type.
Added column 'hypervisor' to table storage_pool. This column can be NULL. Used/populated only for zone wide primary storage pools.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-06-01 00:05:27 +05:30
Murali Reddy 470995b1c4 CLOUDSTACK-2192: [EIP/Optonal PublicIP] listNetworkOfferings is not 
returning info about the capability "AssociatePublicIP"

added eip and associateEip capability details to the StaticNat service
response
 2013-05-31 19:08:39 +05:30
Alena Prokharchyk da53ef1aed ApiServer: fixed non primitive Long "snapshotLimit" comparsion 2013-05-30 15:21:31 -07:00
Alena Prokharchyk 62ad6c4519 ApiServer: replaced hardcoded value of the integration.api.port paramter with the reference to the actual paramter name 2013-05-30 15:21:31 -07:00
Alena Prokharchyk 1300fc8128 AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself 2013-05-30 11:18:32 -07:00
Alena Prokharchyk 0ea409546e RulesManager interface: changed visibility for methods that are being called only from RulesManagerImpl class, from public and defined in the interface, to private/protected 2013-05-30 11:18:31 -07:00