etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,328 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

1993 Commits

Author SHA1 Message Date
Marcus Sorensen e8fcdcbfe5 Merge branch 'master' into add_remove_nics 2013-01-30 13:55:29 -07:00
frank 1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00
Rohit Yadav 99a04a416c DeployVMCmd: Remove @ACL on ipToNetwork map to avoid NPE 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-28 16:10:12 -08:00
Rohit Yadav 66430c9745 DeployVMCmd: Remove entityType for ipToNetworkList, MAP is string->string 
Remove entityType as it can confuse people, right now we process map to string
data type maps<string,string> This map should be handled in cmd class level by
an api writer to getObject by uuid or by long int id as in getIpToNetworkMap()
of DeployVMCmd

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-28 15:43:37 -08:00
Min Chen 4ad38f8afb CLOUDSTACK-274: fix duplicate error code. 2013-01-28 10:49:06 -08:00
Mice Xia e13d93279e make API changeServiceForVirtualMachine work by changing @entityType of parameter serviceOfferingId to ServiceOfferingResponse 2013-01-28 15:39:54 +08:00
Marcus Sorensen ea7fbd6b4f Merge branch 'master' into add_remove_nics 2013-01-25 22:23:42 -07:00
Marcus Sorensen 072521c358 Summary: Make calls async, add sanity checks on vm state and zone location 
Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359154458 -0700
 2013-01-25 15:54:18 -07:00
Marcus Sorensen bdbbbc36e7 Summary: Allow adding of more than one nic on the same network 
Detail: Cloudstack allows you to launch a VM with two or more nics on the
same network, so this allows you to add more than one nic on the same network
after deployment

Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359063744 -0700
 2013-01-24 14:42:24 -07:00
Rohit Yadav 531c2f030c api: Fix annotations on iso related cmd 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 10:33:04 -08:00
Rohit Yadav ec0c6b00b4 api: Fix correct annotation value in template cmds for template id 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 16:00:39 -08:00
Rohit Yadav 9e91584d07 CLOUDSTACK-225: Fix redundant field values in class and apidocs 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 15:50:56 -08:00
Rohit Yadav b335684ec5 EntityManager: Implement method to search by uuid including removed entities 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav 8273af7cbf CopyTemplateCmd: Fix correct annotation for id param in copytemplate 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:40 -08:00
Rohit Yadav dba413a3d4 CreateNetworkOfferingCmd: Fix correct annotation for serviceofferingId param 
Thanks to Hugo for pointing this out: http://markmail.org/thread/gbu4pkanncbe4xqt

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 10:57:08 -08:00
Min Chen c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
Min Chen 26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 
listZonesByCmd.
 2013-01-22 16:39:45 -08:00
Min Chen 6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count 
for ListServiceOfferingsCmd.
 2013-01-21 15:25:49 -08:00
Min Chen 6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for 
listDiskOfferingsCmd.
 2013-01-21 10:50:10 -08:00
Marcus Sorensen 42e4961da2 Merge branch 'master' into add_remove_nics 
pulling in network-refactor merge to master

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2013-01-18 15:24:08 -07:00
Min Chen 2955d58976 Fix "Count" for listSnapshotPoliciesCmd. 2013-01-18 13:55:11 -08:00
Min Chen 5a865462e9 Merge branch 'api_limit' 2013-01-18 09:43:54 -08:00
Chiradeep Vittal ce4b49d30b network-refactor merge: fix nonoss build 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-18 09:38:49 -08:00
Kishan Kavala 51c1ca7cbe CLOUDSTACK-1010: Fix count issue for listHosts command 2013-01-18 16:13:25 +05:30
Min Chen 2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Marcus Sorensen c093d650c7 Summary: Initial code commit, applying https://reviews.apache.org/r/9011/ 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358452852 -0700
 2013-01-17 13:00:52 -07:00
Chiradeep Vittal 56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Min Chen c1a540c6bb Merge branch 'master' into api_limit 
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:48:22 -08:00
Min Chen 3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Min Chen bdcfa1919b Clean up ApiServer, ApiServlet and ApiDispatcher in handling various 
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
 2013-01-16 21:52:48 -08:00
Chiradeep Vittal cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00
Marcus Sorensen 975021dda1 Summary: adding resizeVolume api call 
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.

BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
 2013-01-16 17:43:35 -07:00
Min Chen e83fe471c7 Merge branch 'master' into api_limit 2013-01-16 10:49:25 -08:00
Murali Reddy 4b67340d8c Revert "Summary: partical check-in for L4-L7 network services in the 
shared"

This reverts commits 0de5a145e4,
28bbf6c527

Reverting due to IP clearance issues for the commits done as part of CLOUDSTACK-312
 2013-01-16 16:43:37 +05:30
Murali Reddy c7840cf91f reverting the earlier commit 432ea9c7d4 
done for bug CLOUDSTACK-265 due to IP clearence issues.
 2013-01-16 15:10:27 +05:30
Min Chen 97cb16944f Merge branch 'master' into api_limit 2013-01-15 18:18:34 -08:00
Min Chen 939acb0f4c Remove unused CloudExecutionException. 2013-01-15 18:17:35 -08:00
Min Chen 8608925216 Consolidate RuntimeCloudException and CloudRuntimeException into one 
class CloudRuntimeException, and removed RuntimeCloudException to avoid
confusion.
 2013-01-15 18:07:08 -08:00
Rohit Yadav f6a8b45de5 ApiDiscovery: Use UserContext getCallerUser, do a lazy eval to get account service 
Impl. and use UserContext to get User.
CloudStack's @Inject is horrible, it may sometimes fail to inject account service
during startup. Do a lazy injection using ComponentLocator when needed.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-15 16:11:51 -08:00
Min Chen 3698d64ba2 Use 429 Error code for API_LIMIT_EXCEED error due to latest Http status 
code in
http://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error
 2013-01-15 16:08:47 -08:00
Min Chen 4355d06a86 Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-15 15:53:19 -08:00
Rohit Yadav b9c020fa7c APIChecker: Fix interface definition to take in User 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 19:01:25 -08:00
Min Chen 4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -08:00
Rohit Yadav 896e505da6 APIChecker: Make interface generic, pass user and not just role 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 15:08:45 -08:00
Rohit Yadav ad063ed610 StaticRoleBasedAPIAccessChecker: Throw exception on failed check 
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 19:24:11 -08:00
Rohit Yadav 0dca44efe8 ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 40779975d3 ExtractVolumeCmd: Fix regression, use Zone Id for getting zone 
Fixes regression introduced in b14b39a69f

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav a35db97355 NetworkService: Add method to interface to get network by uuid 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 35544f26e5 DeployVmCmd: Remove usage of IdentityDao, use Network to get by id or uuid 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 31dd412626 DomainService: Fix getDomain by uuid string 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00