Commit Graph

1956 Commits

Author SHA1 Message Date
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