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

1847 Commits

Author SHA1 Message Date
Rohit Yadav 38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -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 31dd412626 DomainService: Fix getDomain by uuid string 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Kelven Yang f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Alex Huang d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Rohit Yadav 1425736c19 AccountManager: Add method to translate account type to role type 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:01 -08:00
Alex Huang f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Min Chen 7f8262d45e Remove IdentityProxy and IdentityTypeAdapter class. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-09 17:40:58 -08:00
Rohit Yadav 3dc7626ebc api: Comment out @APICommand annotation for api cmd classes that are unknown 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-09 17:20:46 -08:00
Min Chen dcbb0ecef5 Fix CLOUDSTACK-936: fix nonoss build due to CloudException IdentityProxy 
removal.
 2013-01-09 13:47:53 -08:00
Rohit Yadav 7c5c3c5dfc api: Re-add deleted addProxyObject method on CloudException 
- This was removed part of the response work
- Re-adding as this kind of method definition is available in several other
  exception classes and is used in a lot of cmd classes and in service layer
- TODO: We need to find a way to replace old code and refactor method with the
  new definition that gets only uuid.
- FIXME: Some tables don't have uuid for ex. ClusterVSMMapVO, in this case
  we should keep the method until we find a way to fix this issue

Partially reverting a88ce6bb7f

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-09 05:43:41 -08:00
Alex Huang b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang 0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Kelven Yang ff26a42eb2 Get rid of static references to component framework 2013-01-08 19:01:27 -08:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Min Chen 74c15a22a0 Create DB view for ListStoragePools API performance optimization. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-08 12:33:18 -08:00
Prachi Damle a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Kelven Yang 559933f062 First page of Javelin management server bootstraped by Spring is able to show now 2013-01-07 15:54:18 -08:00
Rohit Yadav a9ab42d962 api: Extend to infra. interface entities that are not associated with any account 
Includes, datacenter, pod, sotragenetworkiprange,vlan,diskoffering,networkoffering,
serviceoffering.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 15:36:59 -08:00
Rohit Yadav ed0637b8c2 api: Refactor move acl to org.apache.cloudstack 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-06 15:30:58 -08:00
Rohit Yadav 8b085d3308 api: Move base template*cmd class to org.apache.cloudstack.api, fix names and annotations 2013-01-06 14:46:02 -08:00
Rohit Yadav 6a112bd64c api: Rename Validator to Validate, cosmetic fixes 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 16:52:53 -08:00
Rohit Yadav 73a0c3e07f api: Refactor move storagepool apis to storage pkg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 15:32:58 -08:00
Rohit Yadav f07a98a740 api: Refactor and move s3 to api.command.admin.storage 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-05 15:30:38 -08:00
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 22:21:20 -08:00
Sheng Yang 42c8c73ab6 CLOUDSTACK-306: Introducing IpDeployingRequester and implement inline mode 
For LB device in inline mode, the ip deployer(the owner of public ip) is the
firewall in front of it, not itself. So check if it's inline or not, if it's
inline, return the firewall as ip deployer
 2013-01-04 19:18:03 -08:00
Sheng Yang 177e157cbf CLOUDSTACK-306: Move inline mode parameter from device to network offering 
One F5 device can be used as inline and side-by-side at the same time(for
different networks). So we can define inline or not on network base.
 2013-01-04 19:17:58 -08:00
Sheng Yang 717f9dcd4d CLOUDSTACK-306: Implement SRX firewall 
Use SRX firewall filter as SRX firewall. The old security policy mechanism
cannot be used as IP based. This would enable SRX's ability to control traffic
for F5 behind it.
 2013-01-04 19:17:50 -08:00
Rohit Yadav 95e605ed25 api: Fix failing unit test, regression due to recent merge 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-04 18:16:29 -08:00
Rohit Yadav 6fa8c708ee api: Fix service and disk offering annotations 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-03 22:32:46 -08:00
Edison Su 9410cd1f3c add deletevolume and createdata disk 2013-01-03 18:56:18 -08:00
Min Chen daeb4abcca Create DB views for AsyncJobResponse to speed up listAsyncJobsCmd. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-03 15:35:26 -08:00
Rohit Yadav 072c6f1988 acl: Remove getApiCommands() method on APIAccessChecker interface 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-02 18:43:59 -08:00
Min Chen ebfb90e217 Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-02 17:38:58 -08:00
Rohit Yadav d8d87adc22 Merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/api/commands/ListS3sCmd.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-02 13:57:55 -08:00
John Burwell e4583ced2e S3-backed Secondary Storage 2013-01-02 10:28:47 -08:00
Rohit Yadav 76ea0e7c45 api: Annotate and fill name field of @APICommand from commands.properties.in 
- Reads and fills name field of all cmd class and api name mapping from
  commands.properties.in
- Automation using following python script ensures correctness of the change

import os
file_prefix = "api/src/"
search_pattern = "@APICommand("
pattern_len = len(search_pattern)
prop_file = "client/tomcatconf/commands.properties.in"
f = open(prop_file, 'r')
data = f.read()
f.close()
apis = filter(lambda x: x.strip()!='' and (not x.startswith('#')), data.split('\n'))
for api in apis:
    api_name = api.split('=')[0]
    cmd_name = file_prefix + api.split('=')[1].split(';')[0].replace('.', '/').strip() + ".java"
    if not os.path.exists(cmd_name):
        print cmd_name, api_name
    f = open(cmd_name, 'r')
    d = f.read()
    f.close()
    idx = d.find(search_pattern) + pattern_len
    new_str = d[:idx] + "name = \"%s\", " % api_name + d[idx:]
    f = open(cmd_name, 'w')
    f.write(new_str)
    f.close()

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-28 01:09:28 -08:00
Prasanna Santhanam 840da55520 api: Entities will extend InternalIdentity and Identity 
Entities correlated to the Identity and carry a uuid and those
correlated to InternalIdentity carry an id. Those entities that carry
both will correlated to Identity and InternalIdentity.

This refactors entities wherever possible to ensure the VO only
implements the first class entity.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2012-12-26 19:11:15 -08:00
Rohit Yadav 7a7fe583e0 Rename Implementation annotation to APICommand 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-26 15:55:34 -08:00
Rohit Yadav 057ac12d23 Enforce InternalIdentity interface on all VO classes that impls long getId() 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-26 15:09:44 -08:00
Min Chen 21c1623a03 Create DB view for Volume to speed up ListVolumesCmd. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-25 17:08:50 -08:00
Isaac Chiang 5aefd77f77 Fix for CloudStack-648 
Signed-off-by: Gavin Lee <gavin.lxh@gmail.com>
 2012-12-26 00:00:58 +08:00
Rohit Yadav fd784bd2d3 api: Annotate CreatePrivateNetworkCmd 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 17:28:53 -08:00
Rohit Yadav edb42d2cbb api: Annotate templates apis 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 17:17:59 -08:00
Rohit Yadav a5dddb4a83 api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 16:52:35 -08:00
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Rohit Yadav 0e1083ad83 api: Annotate iso related cmd and response classes 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 02:41:11 -08:00
Min Chen 503db14127 Add back Identity interface to most VO class to avoid cast error in 
ApiDispatcher.setupParameter call.
 2012-12-22 22:35:09 -08:00
Min Chen e7fa1a86fb Create DB views to improve ListHostsCmd performance. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-22 21:47:05 -08:00