Commit Graph

2198 Commits

Author SHA1 Message Date
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
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
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
Min Chen
57e67c57d7 Merge branch 'master' into api_limit
Conflicts:
	server/src/com/cloud/api/ApiServer.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
Kelven Yang
f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Rohit Yadav
86a77e29dc ApiDiscovery: Fix listApis to return api response, related apis etc.
- Fix method to return listApis per api name basis
- Return api response, api related cmd etc. as part of response
- Caching and processing all cmd, response classes when plugin starts, made class
  list, maps static so they are shared by multiple instances in case, takes about
  1306ms to do the processsing but only on load time
- Cache for first listApi() and return precached data thereon, takes 2.2ms
  for first call, during runtime and 0ms thereon

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 22:52:10 -08:00
Rohit Yadav
74bb043c37 APIChecker: Rename refactor and add interface checkExistence
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
Rohit Yadav
18bdc58ceb APIAccessChecker: Refactor and simply plugin implementation using better data structures
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 17:21:58 -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
Rohit Yadav
1ac48bc36c RoleType: public enum to get presently defined static role in CloudStack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:01 -08:00
Rohit Yadav
62a42723f9 APIAccessChecker: Make it check based on role type and not user
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 11:49:15 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Rohit Yadav
c6d9877d64 ApiDiscoveryService: Move refactor, interface should be in plugins and not in cloud-api
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 10:59:38 -08:00
Min Chen
0b69d9449a Merge branch 'master' into api_limit 2013-01-10 09:51:41 -08:00
Chiradeep Vittal
1776659fe7 Network-refactor: move validateRule to LB manager since it now has access to LB elements.
NetworkServiceImpl does not need a cache of system network offerings
Ensure mocks build to new APIs.

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 18:36:29 -08:00
Chiradeep Vittal
745fae93f6 Network-refactor: some clean up of the NetworkService interface
- remove unused public apis
- remove unused members
- change visibility of methods to protected if they do not implement a method in the interface

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 18:36:23 -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
d13cc7e7e4 ApiDiscoveryService: Use only as pluggable service
Remove usage and impl as adapter.
We have duplicate code that generates apiname:cmd class maps which is
unavoidable right now as:

- Plugin should not depend on ApiServer or any other component
- cloud-utils cannot depend on cloud-api for the APICommand annotation
- Use java reflect to create a static method in cloud-utils that does the job
  would be unsafe.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 17:25:29 -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
8d98daa1be Add API throttling config items and APILimitChecker Adapter interface,
add api limit checking in APIServer flow.
2013-01-09 16:11:23 -08:00
Chiradeep Vittal
88df984ff3 Network-refactor: add a method for plugins to get the source nat ip
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:02 -08:00
Chiradeep Vittal
0c3001530f Network-refactor: move readonly interface NetworkModel into api project so that plugins can stop depending on the server project
Network-refactor: accidentally injected NetworkModel twice (revert one of them)

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
Min Chen
dcbb0ecef5 Fix CLOUDSTACK-936: fix nonoss build due to CloudException IdentityProxy
removal.
2013-01-09 13:47:53 -08:00
Min Chen
9924b64830 commit 3a3cb60e85c0254ebceff55d0b210ca1ff5386a6
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed Jan 9 11:54:25 2013 +0530

    CLOUDSTACK-614: ListTemplates API is not returning "Enable SSH Key" attribute for any given template. Update the TemplateResponse by adding 'sshkeyenabled' attribute to it. This attribute is set to the value that the user passes as input for parameter 'sshkeyenabled' while registering the template.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-09 10:42:44 -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
Rohit Yadav
2c04dad529 ApiDiscovery: New plugin to help discover apis on mgmt server
- Introduces api/discovery plugin that helps discover apis on the mgmt server
- It's a pluggable service, therefore has it's own api-discovery_commands.properties
  where the discovery api, listApi can be blacklisted (by removing it), or it's
  role mask can be changed
- By default its response has all the apis
- Changes in other parts of the code to make it work, viz. components.xml, pom.xml,
  and in ApiServer where it is used as an adapter to get apiname, cmd mappings

The ApiDiscoveryService interface is a contract that the implementing class will
provide:

1. A means to get all the apis as a list of response, plugin is free to implement
   the response class, as long as it extends on the BaseResponse:

    ListResponse<? extends BaseResponse> listApis();

2. Provides a map of apiname as the key and cmd class as the value:

    Map<String, Class<?>> getApiNameCmdClassMapping();

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Alex Huang
e54ed85926 getting it to compile 2013-01-08 14:39:05 -08:00
Alex Huang
cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -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
Chiradeep Vittal
f4da21998c WIP : extract NetworkService
WIP : move stuff between network manager and network service.
      at this point there is about 700 lines of duplicated code
WIP: Leave creation of default offerings to NetworkManager init
WIP: clean up imports

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-07 14:25:03 -08:00
Rohit Yadav
39b829bffe api: ACL annotation and checkAccess removal refactor for StopVMCmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:19:49 -08:00
Rohit Yadav
96b9164e4b Fix ACL processor and methods in ApiDispatcher and their usages
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:18:45 -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
e51bc8b161 InfrastructureEntity: New interface contract for classes not associated with any account
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:32:40 -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
b246ed7be7 api: Fix name fields for autoscale @APICommand annotation
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:56:30 -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
63481ecb34 CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:27:36 -08:00
Rohit Yadav
c5abc180ab CLOUDSTACK-212: Move api/test pkg to org.apache.cloudstack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:53:59 -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
364116074e api: Remove IdentityMapper finally
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 17:12:14 -08:00
Chiradeep Vittal
3529c47248 Rationalize the interface by injecting ipDeployers. This is step 1 and includes 2 service providers - Remote AccessVPN and S2S VPN
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 15:08:55 -08:00
Chiradeep Vittal
b0a1a47d48 Not all network service providers need to be NetworkElements. NetworkElements are only those that are interested in L2 events. Since only NetworkElements were injected, and only in NetworkManagerImpl, this has led to all kinds of contortions. As a first step, enable individual service providers to be injected.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-04 12:14:49 -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
Rohit Yadav
223bfc07c3 api: Fix Parameter annotation in DeleteServiceOfferingCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-03 22:32:46 -08:00
Rohit Yadav
65b274d09b api: Fix incorrect annotation for list template cmd
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
d928014a75 api: Add CopyIsoCmd, boilerplate cmd class for api copyIso
Two apis, copyIso and copyTemplate point to the same Cmd class, the commit adds
the child class CopyIsoCmd that extends on CopyTemplateCmd. This just serves as
the boilerplate class. Every api cmd name maps 1:1 to a cmd class.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-28 01:49:43 -08:00
Rohit Yadav
983fe9712f api: Fix name field in @APICommand for CopyTemplateCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-28 01:47:22 -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
617a0507e1 api: EntityReference for serviceOfferingResponse
ServiceOfferingResponse's entityReference was missed

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-26 19:11:19 -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
Prasanna Santhanam
b80dccee3f api: ListTemplateCmd returns TemplateInfo not UserVmResponse
Correcting the incorrecty response entity when LIstTemplatesCmd was
caled
2012-12-26 18:32:57 -08:00
Rohit Yadav
b8369b808e api: Introduce name field which would hold the OTW api command name
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:56:14 -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
a18464dbe5 Rename @Entity to @EntityReference used in Response classes
- Renames to @EntityReference as @Entity is too general and used in javax's pkg
- Remove redundant imports

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-26 15:34:35 -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
Rohit Yadav
78d70d349b Merge branch 'master' into api_refactoring
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied

Conflicts:
	api/src/org/apache/cloudstack/api/response/UserResponse.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-25 09:51:17 -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
042a8e7681 api: Get rid of method definition in interface, that uses IdentityMapper for getting entity
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:05:53 -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
f4a407e197 api: Remove IdentityMapper imports on vpn
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:26:16 -08:00
Rohit Yadav
02efffa93e api: Annotate VPC apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:24:58 -08:00
Rohit Yadav
1931667243 api: Annotate volume api
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:21:43 -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
a157a4c1eb api: InternalIdentity interface that provides contract to have getId
Adds new interface that would maintain contract that extending Interface
or implementing class will have the getId() method to get Internal Id

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:51:11 -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
38225a17f6 api: Annotate template related api
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:56:07 -08:00
Rohit Yadav
0719f21320 api: Annotate ssh apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:49:38 -08:00
Rohit Yadav
66c2c0cbb7 api: Annotate snapshot related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:44:45 -08:00
Rohit Yadav
a0a8a0bb5d api: Annotate resource apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:33:37 -08:00
Rohit Yadav
4d79909828 api: Remove unused, redundant imports in project
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:29:18 -08:00
Rohit Yadav
07f5e1ac2d api: Annotate offering apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:26:06 -08:00
Rohit Yadav
b37aca47b9 api: Annotate network apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:22:57 -08:00
Rohit Yadav
06246ae27c api: Annotate nat apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:08:09 -08:00
Rohit Yadav
8559b4eab8 api: Annotate loadbalancer related cmd and response classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:01:26 -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
Rohit Yadav
e5fc513257 api: Annotate guest related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:44:02 -08:00
Rohit Yadav
ced1aabf82 api: Annotate firewall related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:42:05 -08:00
Rohit Yadav
af5eacfc01 api: Annotate autoscale apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:28:19 -08:00
Rohit Yadav
575fab9711 api: Annotate account and address apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 19:52:41 -08:00
Rohit Yadav
4e2b30d31d api: Annotate vpc admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 19:09:18 -08:00
Rohit Yadav
6f3c7bf4c7 api: Annotate vm related apis in admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:58:01 -08:00
Rohit Yadav
e9457cb407 api: Annotate Vlan admin apis, fix resource, storagepool, systemvm apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:31:16 -08:00
Rohit Yadav
f3f0962df2 api: Annotate admin apis related to traffic type for usage
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:19:56 -08:00
Rohit Yadav
9a3deaf807 api: Annotate template admin api
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:11:32 -08:00
Rohit Yadav
93532ea28c api: Annotate storage pool related apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:58:12 -08:00
Rohit Yadav
a7e6172d8c api: Annotate admin.router apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:49:59 -08:00
Rohit Yadav
7e3c0ec002 api: Annotate resource apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:18:50 -08:00
Rohit Yadav
97514a0693 api: Annotate offering
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
Rohit Yadav
2140ff55ea api: Refactor and move VPN related api cmd classes to command.user.vpn
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
Prasanna Santhanam
a15da04937 api: virtual machine Cmd annotations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-21 19:28:12 -08:00
Rohit Yadav
024f0d95dd api: Use Identity interface instead of java reflect to getId
- Add new interface method to getId
- Fix method definition in AsyncJob
- Get rid of mechanism to getId using reflect, use Identity interface

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
Rohit Yadav
3209a3a858 api: Annotate pod,zone admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
Rohit Yadav
08892c51a3 api: Fix jobid and entitytype for BaseResponse and QueryAsyncJob*
- Fix jobid serialization issue that broke the UI
- Fix AsyncJob Result and Response
- Get rid of getUuid(), setUuid(), just use getId, setId for uuid...
- All uuids from over the wire are UUIDs

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 19:05:45 -08:00
Prasanna Santhanam
f548099d08 api: annotate instance group Cmds
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-21 16:12:10 -08:00
Prasanna Santhanam
71522b88dc api: annotating the volume related cmds
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-21 15:59:44 -08:00
Prasanna Santhanam
6a032e0295 api: annotate the vpc related Cmds
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-21 14:25:48 -08:00
Prasanna Santhanam
c7e1cb651f api: Annotate the Site2Site vpn commands
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 09:38:07 -08:00
Prasanna Santhanam
6fbdf76654 api: Annotate RemoteAccessVpn,ListZone commands
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-21 09:38:07 -08:00
Min Chen
b14b39a69f Remove IdentityProxy from BaseResponse, ExtractResponse. Now
IdentityProxy is only referenced in CreateCmdResponse, which involves
some async job logic change. Since it is not impacting list performance,
will leave it there for now.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-20 16:52:52 -08:00
Rohit Yadav
5548d08fb6 api: Annotate missing systemvm api, annotate SystemVmResponse
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-20 01:37:36 -08:00
Fang Wang
d9718e82f2 api: Annotate some systemvm commands
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-20 01:37:36 -08:00
Min Chen
a88ce6bb7f Remove IdentityProxy from CloudException and ExceptionResponse. 2012-12-19 23:49:44 -08:00
Rohit Yadav
eb2a7deddd api: Annotate start,stop router cmds
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-19 15:19:46 -08:00
Fang Wang
c4b600a8d1 api: Fix Validator annotation interface
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-19 11:57:13 -08:00
Min Chen
1d729578d4 Remove IdentityProxy from Response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 23:16:38 -08:00
Rohit Yadav
3e292869eb api: Annotate project API cmd and response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 18:07:37 -08:00
Rohit Yadav
32ca9e2aa4 api: Annotate ListRoutersCmd, fix @Entity for Network,User,VPC Response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:18 -08:00
Rohit Yadav
22ee4200c3 api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 17:44:17 -08:00
Min Chen
4b75132aa2 Remove IdentityProxy from Response classes.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 16:33:12 -08:00
Rohit Yadav
97d9fd01bd api: Annotate network related api cmd and response classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 15:16:58 -08:00
Rohit Yadav
a6ce3b5450 api: Annotate Network device,offering,service apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 14:56:27 -08:00
Rohit Yadav
275208e175 api: Annotate phy network apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 14:47:27 -08:00
Rohit Yadav
9624a59d8e api: Annotate host apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 14:32:30 -08:00
Rohit Yadav
855ba0439f api: Annotate cfg and hypervisorcapabilities apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 14:04:00 -08:00
Rohit Yadav
fb9db2b1b1 api: Annotate autoscale and cluster apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 13:59:11 -08:00
Rohit Yadav
6116f3a433 api: Annotate account apis remove IdentityMapper
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 13:49:23 -08:00
Rohit Yadav
e940562dca api: Annotate domain apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 13:38:27 -08:00
Min Chen
16be94e9d7 Remove IdentityProxy from OfferingResponse, FirewallResponse,
FirewallRuleResponse, HypervisorCapabilitiesResponse, IPAddressResponse.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 12:02:08 -08:00
Min Chen
1aa30f03e7 Remove IdentityProxy from AutoScale responses.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-18 11:19:36 -08:00
Min Chen
a390b273ae Merge branch 'api_refactoring' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into api_refactoring 2012-12-18 10:07:51 -08:00
Rohit Yadav
b16dde6367 api: Fix User related API Cmd classes to use entityType and CommandType.UUID
- Get rid of IdentityMapper
- Use entityType which is an array of Response.class
- Use UUID CommandType for params which will receive UUID string from over the
  wire requests

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:23:05 -08:00
Rohit Yadav
dc33a8d145 api: Fix BaseList Cmd classes to use UUID CommandType and entityType appropriately
- Get rid of IdentityMapper
- Use entityType which is an array of Response.class
- Use UUID CommandType for params which will receive UUID string from over the
  wire requests

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:20:50 -08:00
Rohit Yadav
b008f31fd5 api: Add @Entity annotation for user related response classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:19:46 -08:00
Rohit Yadav
837d21bb2d api: Implement findByXId in GenericDaoBase and EntityManagerImpl
Declare and define findByXId() in GenericDao and EntityManager.
This method would return a VO by UUID and EntityManager's interface would
take in the VO Interface.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-18 04:10:36 -08:00
Min Chen
3d344738b1 Fix ControlledEntityResponse interface to remove IdentityProxy for
projectId and domainId.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 23:24:08 -08:00
Min Chen
79f8c104eb Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse.
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 18:01:31 -08:00
Min Chen
e017dc2c00 commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44
Author: Min Chen <min.chen@citrix.com>
Date:   Mon Dec 17 17:42:30 2012 -0800

    Remove IdentityProxy from AlertResponse and AsyncJobResponse.

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 17:44:39 -08:00
Min Chen
348d3ae448 Conflicts:
api/src/org/apache/cloudstack/api/response/AccountResponse.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-17 15:41:56 -08:00
Marcus Sorensen
6ed1989133 Summary: Allow for custom storage adaptors based on pool type in KVM
Detail: Instead of using LibvirtStorageAdaptor for everything, you can create
your own storage adaptor and use it. We select storage adaptor based on storage
pool type, thus we needed to adjust LibvirtComputingResource to pass pool type
to everything in KVMStoragePoolManager. This in turn required that we pass the
info necessary to LibvirtComputingResource as well, so a few agent Commands were
modified.

Note this patch in and of itself shouldn't change any existing behavior, just
allow for new storage adaptors to be selected based on storage pool type.

Reviewed-by: Edison Su
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1355769696 -0700
2012-12-17 11:41:36 -07:00
Likitha Shetty
cba97b1742 api_refactoring: add parameter annotation for user 'security-group'
- Add the entityType to the parameter annotation
- Annotate SecurityGroupRules response

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 09:57:04 -08:00
kishan
0be6e2e02b bug CS-14982: Make traffic sentinel metering zones configurable. Global config default will be used when no zones are listed while adding Traffic Sentinel Host
status CS-14982: resolved fixed
reviewed-by: Nitin

Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-12-17 15:18:31 +05:30
Rohit Yadav
f8a483fc5a api: Include cloudstack-version in both xml and json api response
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 21:37:03 -08:00
Rohit Yadav
429b430721 api: Fix DeployVMCmd to use only entityType and not resourceType
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:12:01 -08:00
Rohit Yadav
6db279583e api: Remove resourceType, use only entityType
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:09:33 -08:00
Rohit Yadav
cc4030be41 api: Add UUID type to CommandType in BaseCmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 18:08:49 -08:00
Fang Wang
efa034e821 API-refactoring -- Add pod annotation, needed for the deployVM flow test.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:52:21 -08:00
Fang Wang
a2a3ef63c2 API refactoring -- add annotation for cluster group cmds and response.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:50:39 -08:00
Fang Wang
7ea690c74d API refactoring -- add annotation for Account group and account response.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 13:49:38 -08:00
Fang Wang
27482045ce API refactoring -- More parameter for counter group. 2012-12-14 11:52:08 -08:00
Fang Wang
44ef998cfc api: Add Validator interface that will be used for the @Validator annotation
The @Validator (defined as @validate in wiki/FS) will do the following things:
- DBEntityValidator (verifies if the entity exists in the db or not)
- RangeValidator (min, max; limits)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 11:42:49 -08:00
Min Chen
c167ad45e3 Move view based VO and Dao classes to cloud-server module to hide the
details from API client, also extract query related methods into
QueryService interface.
2012-12-14 10:47:58 -08:00
Edison Su
b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Rohit Yadav
88b7af18e6 api: Revert "Move all the DB view DAOs from cloud-server to cloud-api for future api-server package."
Reverting commit as we don't want the daos to move to cloud-api.
We'll eventually breakout cloud-server and create cloud-api-server for the standalone
api server.

This reverts commit 7597a38f7a.
2012-12-13 09:42:28 -08:00
Min Chen
7597a38f7a Move all the DB view DAOs from cloud-server to cloud-api for future api-server package.
BUG-ID: CLOUDSTACK-527

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-13 09:28:42 -08:00
Min Chen
472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -08:00
Min Chen
3661f7f992 Fix several bugs of new refactored list apis. 2012-12-11 17:37:16 -08:00
Min Chen
9c93fee0dc Refactor ListProjectAccountCmd and ProjectAccountResponse. 2012-12-11 15:49:15 -08:00
Rohit Yadav
6ce68b93cc api: Fix APIAccessChecker and StaticRoleBasedAPIAccessChecker
- Add getCmd api interface in APIAccessChecker adapter to get cmd properties
- Add mechanism in StaticRoleBasedAPIAccessChecker to get config properties
- Add public interface to get the cmd properties for the adapter impl

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 14:10:36 -08:00
Rohit Yadav
f4892fbb84 api: remove those evil extra newlines
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-11 13:38:32 -08:00
Min Chen
8735716ba0 Refactor ListProjectsCmd and ProjectResponse. 2012-12-11 12:51:08 -08:00
Murali Reddy
432ea9c7d4 CLOUDSTACK-265: provide option to turn-off automatic public IP association for each VM when using EIP service.
- introduces Capability in the network offering, which
    decides when EIP service is enabled, by defualt public IP
    should be assigned to the VM or not

  - default network offering with EIP/ELB service will still work with old EIP
    semantics, i.e) assign a public IP to each VM on start
2012-12-11 23:06:13 +05:30
Min Chen
c83323fea7 api: Refactoring ListUsersCmd and UserResponse.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 17:45:40 -08:00
Rohit Yadav
c8923c9625 api: Fix license header for acl/Role.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 16:18:35 -08:00
Rohit Yadav
293665fafb api: Add license headers for APIAccessChecker and StaticRoleBasedAPIAccessChecker
- Fix license headers
- Fix tabs, trailing whitespaces

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 15:29:33 -08:00
Min Chen
bba96254f5 Refactoring ListVMGroupsCmd and InstanceGroupResponse. 2012-12-10 13:59:20 -08:00
Rohit Yadav
98033905e4 api: Add missing license header to BaseViewVO
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-10 11:34:10 -08:00
Min Chen
9a3632d807 Create Base view VO object to remove some code duplication. 2012-12-10 11:30:28 -08:00
Rohit Yadav
e398b1e47a api: Refactor command and response classes to org.apache.cloudstack.api.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 19:23:24 -08:00
Fang Wang
ad50d226cd api: Refactoring, add the parameter annotation for user VM.
- Fix some errors in the previous deployVMCmd.

	modified:   api/src/org/apache/cloudstack/api/user/vm/command/DeployVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/DestroyVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/GetVMPasswordCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/ListVMsCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/RebootVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/ResetVMPasswordCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/RestoreVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/StartVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/StopVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/UpdateVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vm/command/UpgradeVMCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:33:07 -08:00
Rohit Yadav
af28c06998 api: move and group all under command, org.apache.cloudstack.command.*
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 18:30:54 -08:00
Fang Wang
fa7527b77e API_refactoring Add parameter annotation to the admin virtual machine group.
modified:   api/src/org/apache/cloudstack/api/admin/vm/command/AssignVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/admin/vm/command/MigrateVMCmd.java
	modified:   api/src/org/apache/cloudstack/api/admin/vm/command/RecoverVMCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 17:08:33 -08:00
Min Chen
30941c2d31 api: Refactoring ListEventsCmd and EventResponse, and create Event db view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 16:54:45 -08:00
Joe Brockmeier
1ed2f4bf04 CLOUDSTACK-507 removing private key from expected response section in API docs 2012-12-07 17:11:19 -06:00
Min Chen
acf7afd7f5 api: Refactor ResourceTagResponse and ListTagsCmd, add db view for ResourceTag.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:57:52 -08:00
Min Chen
2bbd023eb6 api: Add SecurityGroup DB view creation into db create_schema and fix a bug in ListSecurityGroupsCmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-07 09:45:16 -08:00
Fang Wang
a6c02e1483 api_refactoring: VMgroup parameter annotation.
modified:   api/src/org/apache/cloudstack/api/user/vmgroup/command/CreateVMGroupCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vmgroup/command/DeleteVMGroupCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vmgroup/command/ListVMGroupsCmd.java
	modified:   api/src/org/apache/cloudstack/api/user/vmgroup/command/UpdateVMGroupCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:09:43 -08:00
Min Chen
8a313d7f84 api: SecurityGroupResponse and SecurityGroupRuleResponse refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 16:04:48 -08:00
Min Chen
eba353099e api_refactoring: Fix build issue with api_refactoring branch.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 15:00:48 -08:00
Fang Wang
3d04bfcadc api_refactoring: Add parameter annotation for admin zone group.
Add the entityType to the parameter annotation.

modified:   api/src/org/apache/cloudstack/api/admin/zone/command/CreateZoneCmd.java
modified:   api/src/org/apache/cloudstack/api/admin/zone/command/DeleteZoneCmd.java
modified:   api/src/org/apache/cloudstack/api/admin/zone/command/MarkDefaultZoneForAccountCmd.java
modified:   api/src/org/apache/cloudstack/api/admin/zone/command/UpdateZoneCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 14:30:37 -08:00
Rohit Yadav
da6e81aa21 api_refactoring: Fix build issues and incorrect imports
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 13:48:20 -08:00
Rohit Yadav
5d998a616b api_refactor: move forgotten apis, uncomment and fix mappings
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:32:10 -08:00
Rohit Yadav
089db9c631 api_refactor: capacity, hypvsr, alert and cert apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:25:56 -08:00
Rohit Yadav
780eb95830 api_refactor: swift, ldap and vlan apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:13:46 -08:00
Rohit Yadav
28305904e8 api_refactor: move cluster apis to admin package
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:04:24 -08:00
Rohit Yadav
6c2ed5cb66 api_refactor: move pod apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 11:02:57 -08:00
Rohit Yadav
e763fd7d36 api_refactor: move userkeys api to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:59:26 -08:00
Rohit Yadav
1f1ac79a6c api_refactor: move disk and service offering to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:53:42 -08:00
Rohit Yadav
ecc8249365 api_refactor: move cfg admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:50:26 -08:00
Rohit Yadav
ab4fac54e5 api_refactor: move admin level domain apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:44:40 -08:00
Rohit Yadav
c3853677c5 api_refactor: move zone apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:41:10 -08:00
Rohit Yadav
7f61d29c37 api_refactor: move zone and hypervisor user level apis to appropriate pkg names
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:36:26 -08:00
Rohit Yadav
cc386b791b api_refactor: move storagepool api to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:32:58 -08:00
Rohit Yadav
163fe7b8c3 api_refactor: move systevm apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:28:37 -08:00
Rohit Yadav
1b1d91dc4f api_refactor: move admin level account apis to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:25:20 -08:00
Rohit Yadav
2a7fa674c7 api_refactor: Move host apis to admin pkg
- Moved host related apis to admin pkg
- Change namespace to org.a.cs.api, fix mappings in commands-prop.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-06 10:21:10 -08:00
Hugo Trippaers
a0d6ca617f Make variable naming consistent with the superclass.
The field was called brandnew in portforwaringto and alreadyadded in
firewallruleto. This leads to confusion as the effect is completely
opposite.

Small fix for wrong parameter order
2012-12-06 14:45:38 +01:00
Murali Reddy
28bbf6c527 Summary: partical check-in for L4-L7 network services in the shared network in the advanced zone
Details:

- changed associateIPAddr API to accept shared network Id and account Id. Ip will be owned by tuple (account Id, network Id)
- chaged createNetwork API to accpet CIDR when network offering has external networking device providers

Bug ID:CLOUDSTACK-312 enable L4-L7 network services in the shared
network in the advanced zone
2012-12-06 11:55:19 +05:30
Min Chen
b0ce8fd4ff api: Optimize and improve api, db call perfomance
This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 20:06:20 -08:00
Rohit Yadav
c59de6cbde api_refactor: router apis for admin pkg
- Fix missing api mapping in commands.prop
- Refactor package namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:23:31 -08:00
Rohit Yadav
55f2bd810a api_refactor: move template api preparetemplate to admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 15:15:26 -08:00
Rohit Yadav
ceddaf122c api_refactor: refactor user apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:55:58 -08:00
Rohit Yadav
ba8e61bfb5 api_refactoring: for network api refactoring move interfaces so it works
Move ExternalNetworkDeviceManager to cloud-api, as server depends on cloud-api
The api refactoring of one of the api required this interface

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:53:16 -08:00
Rohit Yadav
e07106db0b api_refactor: usage apis to admin.usage pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:31:31 -08:00
Rohit Yadav
0bbe82e8e1 api_refactor: move usage apis in parts to admin.usage
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:29:31 -08:00
Rohit Yadav
52c35bc30d api_refactor: make interfaces public as some of the stuff move to cloud-api
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:27:13 -08:00
Rohit Yadav
55364478e5 api_refactor: move vpn related apis to user.vpn
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:24:26 -08:00
Rohit Yadav
8d8285a8d4 api_refactor: vpc admin apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:13:09 -08:00
Rohit Yadav
c24118e7e8 api_refactor: move network api for admin pkg from cloud-server to cloud-api
- Remove a lot of junk
- Fix commands.prop.
- Move apis from cloud-server to cloud-api
- Rename with org.apache.cloudstack namespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 14:06:13 -08:00
Rohit Yadav
678181ac35 api_refactor: move network api for admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 13:59:54 -08:00
Fang Wang
ee0a4a41d0 api_refactor: entity annotation and fix parameter
- Add Entity annotation
- Annotate few responses
- Fix Parameter annotation to have entityType

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-05 11:50:23 -08:00
Rohit Yadav
99875a165f api_refactor: admin apis for vpc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:44:27 -08:00
Rohit Yadav
dd5a36fcd2 api_refactor: refactor for autoscale apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:42:07 -08:00
Rohit Yadav
2121fbd469 api_refactor: refactor network apis for admin pkg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:38:40 -08:00
Rohit Yadav
feb342ad23 api_refactor: refactor autoscale apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:30:37 -08:00
Rohit Yadav
456b852c0c api_refactor: refactor loadbalancer apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -08:00
Rohit Yadav
8773fc2a55 api_refactor: refactor volume apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:20:48 -08:00
Rohit Yadav
25b5aadb4e api_refactor: refactor firewall apis
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:17:06 -08:00
Rohit Yadav
5cd1f4b6c2 api_refactor: ip address apis refactoring
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:14:06 -08:00
Rohit Yadav
46ed598894 api_refactor: resource (limit) apis, move capability and cloud identifier
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:11:16 -08:00
Rohit Yadav
7f9c490b5a api_refactor: move listzones and listcapabilities to dc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:06:34 -08:00
Rohit Yadav
a34fc1f1a7 api_refactor: move listcapabilites to dc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:44:17 -08:00
Rohit Yadav
d3261e5bb3 api_refactor: move listhyperisor to datacenter
will use this for all organizational units

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:41:22 -08:00
Rohit Yadav
658cf56120 api_refactor: move diskoffering to offering
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
Rohit Yadav
6fe1b5f9b0 api_refactor: move diskoffering to offering
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:37:14 -08:00
Rohit Yadav
1b8dc65f3a api_refactor: refactor user (vpn) apis
- Fix refactored apis, mappings in commands*.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:27:47 -08:00
Rohit Yadav
91d199b8d8 api_refactor: refactor list hypervisor api
- Fix refactored apis, mappings in commands*.in

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:34:26 -08:00
Rohit Yadav
cabbc7bd7d api_refactor: refactor disk api (only user)
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:31:03 -08:00
Rohit Yadav
ea79162615 api_refactor: refactor configuration api for normal user
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:29:17 -08:00