gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-05 00:19:31 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity
16,989 Commits 371 Branches 328 Tags 879 MiB
ffdf567b58
Commit Graph

2198 Commits

Author SHA1 Message Date
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
Rohit Yadav
28df57ec75 api_refactor: refactor serviceoffering apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 00:27:19 -08:00
Rohit Yadav
73d1099c76 api_refactor: rename sg to securitygroup 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 00:25:22 -08:00
Rohit Yadav
1e51d6c1ab api_refactor: refactor guest os (guest) apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 00:19:39 -08:00
Rohit Yadav
b673c21174 api_refactor: refactor job (async jobs) apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 00:12:17 -08:00
Rohit Yadav
7ac48798b4 api_refactor: refactor event apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-04 00:05:54 -08:00
Rohit Yadav
add1b9b055 api_refactor: refactor register apis 
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:54:19 -08:00
Rohit Yadav
316e7f226a api_refactor: refactor tag apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:48:48 -08:00
Rohit Yadav
37cd76ee81 api_refactor: refactor ssh apis 
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:44:14 -08:00
Rohit Yadav
9a0df30766 api_refactor: refactor account apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:42:13 -08:00
Rohit Yadav
46353e0916 api_refactor: refactor vmgroup apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:35:30 -08:00
Rohit Yadav
13aa4d8530 api_refactor: refactor nat apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:30:54 -08:00
Rohit Yadav
a033cf1bfc api_refactor: refactor snapshot apis 
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:19:12 -08:00
Rohit Yadav
0df9538fb7 api_refactor: refactor security group (sg) apis 
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:11:17 -08:00
Rohit Yadav
3e0b2164be api_refactor: refactor template apis 
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:05:44 -08:00
Rohit Yadav
e0b4430070 api_refactor: refactor iso apis 
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 23:01:29 -08:00
Rohit Yadav
47ae62e44a api_refactor: refactor network apis 
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 22:47:07 -08:00
Rohit Yadav
5e0501d116 api_refactor: refactor project apis 
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 22:10:32 -08:00
Rohit Yadav
ac1ea7616a api_refactor: refactor vpc apis 
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 21:44:40 -08:00
Rohit Yadav
6fc3bc3760 api_refactor: refactor vpn and vm apis 
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-03 21:27:02 -08:00
Rohit Yadav
5edfc2760a refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
Prachi Damle
a2306f4917 some more poc work 2012-11-29 16:10:09 -08:00
Prachi Damle
073863249a Some ACL POC work 
Conflicts:

	server/src/com/cloud/api/ApiDispatcher.java
 2012-11-29 16:09:47 -08:00
Chip Childers
b1c063298d Reworked the formatting and structure of the api project's unit tests. 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-21 09:56:22 -05:00
Chip Childers
e953b77492 Moving api tests into a similar package structure as other tests 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-21 09:17:47 -05:00
Yichi Lu
6d200c5021 Adding a bunch of agent/api command tests 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-20 12:41:42 -05:00
Meghna Kale
b1af510715 Adding new unit tests for a set of API commands 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-20 12:28:55 -05:00
Meghna Kale
b7c74ee78b Unit test additions (and some minor command class changes to support testing) 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-20 12:21:54 -05:00
Edison Su
6866613af4 refactor download template 2012-11-16 18:50:28 -08:00
Vijay Venkatachalam
264f777a2d Remove AutoScale entities while deleting autoscaled loadbalancer. 2012-11-16 12:56:32 +05:30
Vijay Venkatachalam
aea87da410 Autoscale:Sending the Counter params as list 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-11-16 11:07:24 +05:30
Vijay Venkatachalam
527b5c8ee2 Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep 2012-11-16 10:57:00 +05:30
Vijay Vekatachalam
4836aba56f Create Autoscale config in Netscaler with unique Identifier based on Vmgroup 2012-11-16 10:56:59 +05:30
Vijay Vekatachalam
35b0e086d4 enable Autoscale VMs to be named as Autoscale-LB-<lbname> 2012-11-16 10:56:59 +05:30
Vijay Vekatachalam
57416188a2 Enabling aUtoscale VMs to be provisioned in a loadbalancer's network 2012-11-16 10:56:59 +05:30
Deepak Garg
bf1e6ed991 CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay 2012-11-16 10:56:58 +05:30
Vijay venkatachalam
3e32a29048 Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935 2012-11-16 10:56:58 +05:30
Vijay Venkatachalam
acb963f1ee CS-15783: Creating mapping between job ids and autoscale entity ids 2012-11-16 10:56:56 +05:30
Deepak Garg
68fc64cfe9 CS-16159-Fixing the license headers 2012-11-16 10:56:56 +05:30
Pranav Saxena
6f3df699d1 Removing the Author's name from the file - Patch sent by Deepak Garg(deepakgarg.iitg@gmail.com) 2012-11-16 10:56:44 +05:30
Vijay
dda4d39b55 AutoScale changes in Apache master 2012-11-16 10:56:44 +05:30
Rohit Yadav
4c86b1545d CLOUDSTACK-424: Update userdata should propagate to VR 
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.

The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.

For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data

This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.

[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/

BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-11-15 18:43:51 +05:30
Edison Su
cad75e7220 add storage motion interface 2012-11-14 17:47:24 -08:00
Alena Prokharchyk
74622a4dc3 Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects 2012-11-14 14:59:51 -08:00
Chip Childers
a61cb24e91 CLOUDSTACK-473: Improving the uploadCustomCertificate API documentation 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-12 15:41:27 -05:00
Rohit Yadav
860d1bc73d api: createStoragePool requires podId, clusterId 
The CreateStoragePool API requires that podId, clusterId be passed or it fails.
Bug found in cli, which in turn got it from Marvin, which got it from commands.xml
which got from ApiXmlDocWriter.

Patch adds required field on podId, so it trickle downs to cli.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-11-07 14:05:31 +05:30
Edison Xu
b101dc7279 KVM agent connet: 
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
 2012-11-05 10:00:16 -08:00
Alex Huang
91e68b5f2c A bunch of .project changes again 2012-11-04 19:25:03 -08:00
Alena Prokharchyk
013102c028 CS-16611: when expunge Async job, expunge corresponding sync queue items 
Conflicts:

	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueItemDao.java
 2012-11-02 10:51:29 -07:00
Alex Huang
f92ce72639 Correct dependency errors 2012-10-24 11:12:40 -07:00
Edison Su
059f605ace add more interfaces 2012-10-22 17:50:51 -07:00
Alena Prokharchyk
214bbf3ebd CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup 
Conflicts:

	api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
	server/src/com/cloud/network/element/CiscoNexusVSMElement.java
	server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
	server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/element/OvsElement.java
	server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/storage/StorageManager.java
 2012-10-17 17:26:19 -07:00
Kishan Kavala
f0f33bf4da Added Mock ApiServer, Regions API calls with api keys 2012-10-17 14:16:36 +05:30
Alena Prokharchyk
3f5733cea7 CS-16412: fixed count for following commands: 
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes

Conflicts:

	api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
	api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
	api/src/com/cloud/api/commands/ListConditionsCmd.java
	api/src/com/cloud/api/commands/ListCountersCmd.java
	api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
	api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
	api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
	api/src/com/cloud/network/as/AutoScaleService.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/as/dao/CounterDao.java
	server/src/com/cloud/network/as/dao/CounterDaoImpl.java
	server/src/com/cloud/projects/ProjectManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-10-15 18:16:59 -07:00
Alena Prokharchyk
1d458c7a2d CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin 2012-10-15 11:39:38 -07:00
Alena Prokharchyk
8f2d9a09e5 CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands 
Fixes the count in commands:

listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes

Conflicts:

	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java
 2012-10-12 13:58:59 -07:00
Hugo Trippaers
c07d6d28ee Merge branch 'nicira-l3support' 
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding

Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules

Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
 2012-10-12 14:15:17 +02:00
Kelven Yang
5fee891162 merge from master 2012-10-11 17:42:25 -07:00
Alena Prokharchyk
339aa41442 CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host. 
Conflicts:

	core/src/com/cloud/async/AsyncJobVO.java
	core/src/com/cloud/async/SyncQueueVO.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/async/SyncQueueManagerImpl.java
	server/src/com/cloud/async/dao/SyncQueueDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
	server/test/com/cloud/async/TestSyncQueueManager.java
	setup/db/create-schema.sql
 2012-10-10 13:40:00 -07:00
Alena Prokharchyk
43b406279a listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it 2012-10-09 16:23:05 -07:00
Mice Xia
a5bca0999a CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance 2012-10-08 14:05:05 +08:00
Alena Prokharchyk
be2017849a CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process. 2012-10-05 15:10:31 -07:00
Rohit Yadav
5cd7fb8408 CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException " 2012-10-05 11:42:04 -07:00
Kishan Kavala
89779cceb8 Merge branch 'master' into regions 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/user/UserVO.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/create-schema.sql
 2012-10-03 14:09:01 +05:30
Hugo Trippaers
aa6355ffe6 Updated master to 4.1.0 
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
 2012-10-01 11:00:55 -07:00
Hugo Trippaers
c9b0b0b1a9 Add Nicira configuration to the UI 2012-09-30 23:33:37 -07:00
Alena Prokharchyk
11fe086ada Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code 2012-09-28 13:11:20 -07:00
Hugo Trippaers
8ba7749869 Prepare all capabilities we will be supporting 
Remove the logical router if we are done with it.
 2012-09-27 18:24:19 -07:00
Alena Prokharchyk
bbbccc0a7b Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports 2012-09-27 10:50:04 -07:00
Alena Prokharchyk
2c2178ce10 Revert "Removed port ranges from createPortForwardingRule API" 
This reverts commit d04f0b4752.

Conflicts:

	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java

Conflicts:

	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
 2012-09-27 10:49:53 -07:00
Kishan Kavala
4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Kishan Kavala
39d394a8e8 Propogate Domain and User commands 2012-09-27 16:44:12 +05:30
Anthony Xu
780769b765 fix build 2012-09-26 17:56:29 -07:00
Anthony Xu
ba8b418542 CS-16375: do desetup network after last VM in guest network is gone 2012-09-26 17:42:42 -07:00
Kishan Kavala
6540ff8fa1 bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state 2012-09-26 13:54:49 +05:30
Jie Feng
c9aa08350a [DOC] docbook conversion - choosing a deployment architecture 2012-09-13 16:12:06 -04:00
Alex Huang
db9cc97ab3 Brought over new changes from master 2012-09-13 11:43:22 -07:00
Alex Huang
06b7d80fec latest changes 2012-09-13 11:31:54 -07:00
Manikanta Kattamuri
cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04:00
Mice Xia
55bcfaf805 CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI 2012-09-13 11:21:11 +08:00
Sheng Yang
fe8a2992a2 Elimiate mystery guestIp in IpAddressTO 
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
 2012-09-12 15:42:48 -07:00
Alex Huang
298d224f83 Added extra maven files 2012-09-11 18:14:42 -07:00
Alex Huang
622526a35e Fixed compliation 2012-09-11 17:44:46 -07:00
Alex Huang
87b3378cdc more changes 2012-09-11 17:38:32 -07:00
Koushik Das
2404d3493d CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:38:15 -07:00
Fang Wang
88f85b29c2 Replace db-id by UUID for user VM's vm-id. 2012-09-11 17:38:05 -07:00
Koushik Das
65eeeaf071 CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:22:43 +05:30
Fang Wang
663e250334 Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
Alex Huang
1d0a10c69e Merged master over to javelin to get new poms and maven build 2012-09-05 14:31:24 -07:00
Mice Xia
dd07d1598f Fix Bug CloudStack-9 can not change OS preference from OS to none 2012-09-04 20:51:03 +08:00
Edison Su
7d92c1dc27 continue addding new files 2012-09-01 17:38:50 -07:00
Alex Huang
b9ddcf8cfe Started an object model for the orchestration platform 2012-08-30 15:54:33 -07:00
Alena Prokharchyk
7272b8d56b Applying the patch from https://reviews.apache.org/r/5871/ 
Original committer: Venkata Siva Vijayendra Bhamidipati
 2012-08-30 10:33:07 -07:00
Edison Su
cc73f2a8f2 add volumeorchestra 2012-08-29 18:17:18 -07:00
Kelven Yang
2300310243 Messaging facility initials for new architecture 2012-08-28 17:58:45 -07:00
Likitha Shetty
8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
Edison Su
60758785b7 Add more storage code 2012-08-27 18:07:54 -07:00
olivier lamy
a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy
3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy
5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd
4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd
ebc0fa458a * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-24 11:18:54 -07:00
Darren Shepherd
f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00
kishan
4ea36b82e9 propogate account changes to other Regions 2012-08-24 15:59:59 +05:30
Kelven Yang
d06d6dae72 add maven eclipse project files from Darren 2012-08-23 17:55:20 -07:00
Kelven Yang
9a51ff3bfc Maven worksplace fixes/patches from Darren 2012-08-23 14:26:27 -07:00
Darren Shepherd
2f6cc4b0cb Add license 2012-08-23 14:26:26 -07:00
Darren Shepherd
ad54ed1790 * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-23 14:26:26 -07:00
Darren Shepherd
b8e95e435f Maven config, initial commit 2012-08-23 14:26:25 -07:00
Sheng Yang
95347d2a5e CS-16119: Fix wrong container name of updateVpnCustomerGateway 
Reviewed-by: Frank Zhang
 2012-08-21 17:25:15 -07:00
Alena Prokharchyk
e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-21 15:35:40 -07:00
kishan
691be5c60e bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic 
status CS-15577: resolved fixed
 2012-08-17 17:07:13 +05:30
Alena Prokharchyk
335730dc65 CS-15999: added nics to domain router api response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-16 10:50:09 -07:00
anthony
4b3af0c961 fixed typo 2012-08-15 14:06:07 -07:00
anthony
e1bfcdc1be fix a typo 2012-08-15 13:53:43 -07:00
Sheng Yang
a3faff94ff S2S VPN: CS-15998: Fix wrong vpc id in Site2SiteVpnGatewayResponse 2012-08-15 12:10:19 -07:00
Sheng Yang
bda9d0a843 S2S VPN: Fix license headers 2012-08-14 09:53:39 -07:00
Sheng Yang
991fb3d189 S2S VPN: Fix wrong response name 2012-08-14 09:53:35 -07:00
Alena Prokharchyk
7120ce0717 Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
tomoe@midokura.jp
ce12d0d70d Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
Prasanna Santhanam
4161cea5df CS-15833: PrepareForMigrationCommand extends Command 
PrepareForMigrationCommand which was extending StartCommand wrongly now
extends the base Command only.

Signed-off-by: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
 2012-08-13 16:23:16 +05:30
Nitin Mehta
a50cf618ec bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
Mice Xia
17304b3910 Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
anthony
bf1123246a VPC : typo in CreateNetworkACLCmd.java 2012-08-12 11:00:16 -07:00
Alena Prokharchyk
b61468d65c Merge branch 'master' into vpc 
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2012-08-11 18:27:18 -07:00
Edison Su
263216caa5 Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage). 
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
 2012-08-10 13:33:06 -07:00
Alena Prokharchyk
6cddd1e767 Removed trailing whitespaces and fixed line endings in some files 2012-08-09 23:30:33 -07:00
Alena Prokharchyk
97e4906d8c Merged the file with the master branch 2012-08-09 23:30:33 -07:00
Alena Prokharchyk
0d1393a2d3 Removed unsed imports 2012-08-09 23:30:11 -07:00
Alena Prokharchyk
493c8d1190 Removed @author annotation from IpAssocCommand and IpAssocAnswer 2012-08-09 23:30:11 -07:00
Alena Prokharchyk
c5e3493792 Merge branch 'master' into vpc 2012-08-08 18:38:35 -07:00
Alena Prokharchyk
a1f361904e Reverted "Initialize user context from AccountManager" committed to master branch by mistake 
This reverts commit da26302049.
 2012-08-08 15:26:45 -07:00
Alena Prokharchyk
057d6ccbb8 Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
Alena Prokharchyk
048c5e50cf Merge branch 'master' into vpc 
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
 2012-08-08 11:50:39 -07:00
Alena Prokharchyk
da26302049 Initialize user context from AccountManager 
Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-08 11:17:01 -07:00
Sheng Yang
46a12b378c CS-15243: Add service combination check at create network offering 2012-08-07 13:17:48 -07:00
Alena Prokharchyk
629556c708 Fixed UserContext initialization - got broken by unittest 2012-08-07 11:51:00 -07:00
Alena Prokharchyk
bda1e2d08d VPC: more unittests for VpcService 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:37:36 -07:00
Alena Prokharchyk
972fe01aec VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:21:53 -07:00
Sheng Yang
a8cbba9e82 S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection 
The owner would be always same as VPC owner.

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
	setup/db/db/schema-304to305.sql
 2012-08-06 15:21:54 -07:00
Sheng Yang
70d704c786 S2S VPN: Allow name to be modified in updateCustomerGateway 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:20:33 -07:00
Sheng Yang
1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk
5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk
237d91d4c9 Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
Alena Prokharchyk
3496a73878 VPC: CS-15812 - fixed listVPCs by projectId 2012-08-03 14:23:56 -07:00
Alena Prokharchyk
e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Nitin Mehta
3c68f1f8e8 bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state 
Reviewed-by: Kishan
 2012-08-03 17:18:13 +05:30
anthony
9b43753399 VPC : handle Revoke rules for staticroute 2012-08-02 18:59:49 -07:00
Alena Prokharchyk
bda8fc1e0c Fixed api doc 2012-08-02 18:49:42 -07:00
Alena Prokharchyk
0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Alena Prokharchyk
befd6dd0c6 listVirtualMachines: implemented search by templateId/isoId 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/ListVMsCmd.java
 2012-08-02 18:15:13 -07:00
Alena Prokharchyk
d6df2fdc64 VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend 
Conflicts:

	api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
	api/src/com/cloud/api/response/AsyncJobResponse.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-02 18:12:19 -07:00
Alena Prokharchyk
ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Alena Prokharchyk
21e8fb372b VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-01 19:02:43 -07:00
Alena Prokharchyk
b92d2336ad VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details: 
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
 2012-08-01 18:57:33 -07:00
Alena Prokharchyk
5cbe3d9722 ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute 
Conflicts:

	api/src/com/cloud/api/commands/ListVPCsCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
 2012-08-01 18:54:08 -07:00
Alena Prokharchyk
7cceaae912 VPC: moved vpc related code from NetworkManager to VpcManager 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-08-01 18:45:06 -07:00
Alena Prokharchyk
ebe53a91d7 VPC: reduced visability for some vpc related methods 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-01 18:33:12 -07:00
Alena Prokharchyk
e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Koushik Das
3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
 2012-08-01 19:39:30 +05:30
Chip Childers
640087b534 api license header fixes 2012-07-31 20:31:57 -04:00
Alena Prokharchyk
7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Sheng Yang
67941f818d S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:52:23 -07:00
Pranav Saxena
36fc2bd9b5 CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs 2012-07-31 02:57:46 +05:30
Sheng Yang
9e59342608 S2S VPN: Remove obelete guest_ip from updateCustomerGateway 2012-07-30 11:11:11 -07:00
Hugo Trippaers
236f63fd34 When cleaning up or setting ip associations the NiciraNvpElement should be ignored. 
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
 2012-07-30 15:17:35 +02:00
kishan
9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
Sheng Yang
8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
Sheng Yang
786d5995df S2S VPN: Add list function for normal users 2012-07-27 16:27:36 -07:00
Sheng Yang
736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Sheng Yang
72a4b2f410 S2S VPN: Add name field for customer gateway 
Easier for user to identify the correct gateway
 2012-07-27 16:27:36 -07:00
anthony
2fc1dc0df6 VPC : vpc integration code for XenServer hypervisor 2012-07-27 15:54:30 -07:00
Alena Prokharchyk
a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan
468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Alena Prokharchyk
3f4b7602f4 CS-15628: ip address id is required by createFirewallRule command 2012-07-26 13:36:35 -07:00
Wido den Hollander
406fd95d87 Add RBD support for primary storage 
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.

To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)

The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.

Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.

NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.

Other then these points you can run instances with RBD backed disks.
 2012-07-26 22:22:26 +02:00
Alena Prokharchyk
119e4e7443 VPC: CS-15681 - execute VPC related methods only when router is a vpc router 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-24 16:12:13 -07:00
Alena Prokharchyk
46cd99f01e VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
Sheng Yang
7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway 
Conflicts:

	api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-07-23 14:44:05 -07:00
Sheng Yang
671475242c S2S VPN: Add domain and account for VPN 
Admin can add VPN connection for others

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql
 2012-07-23 14:40:26 -07:00
Sheng Yang
230ce1dfee S2S VPN: Add state for vpn connection response 2012-07-23 14:38:06 -07:00
Sheng Yang
4b0515f8e5 CS-15471: Fix wrong type of updating customer gateway lifetime 
Also fixes one typo.
 2012-07-23 14:36:10 -07:00
Jessica Wang
830901d7cc cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-23 14:21:10 -07:00
Jessica Wang
196885e378 cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-23 14:20:43 -07:00
Jessica Wang
8fad593ac5 cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-07-23 12:14:59 -07:00
Jessica Wang
aac0a808c1 cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response. 2012-07-23 12:10:29 -07:00
Jessica Wang
497c324efc cloudstack 3.0 API - CreateVpnCustomerGateway API: correct parameter type on server-side. 2012-07-23 11:35:48 -07:00
Alena Prokharchyk
7cf7002571 Merge branch 'master' into vpc 2012-07-23 10:57:55 -07:00
Alena Prokharchyk
7bef9a961d Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag 2012-07-23 10:51:20 -07:00
bfederle
c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
Jessica Wang
8712812ca7 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-07-20 16:49:17 -07:00
David Nalley
50da77c63f cleaning up one remaining license header issue in api 2012-07-20 13:51:56 -04:00
Alena Prokharchyk
281b23c2cd Fixed license headers 2012-07-18 14:52:13 -07:00
kishan
f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
Alena Prokharchyk
6ad2388c72 VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
Alena Prokharchyk
a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Alena Prokharchyk
ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network 
Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-13 13:32:14 -07:00
Alena Prokharchyk
1781f706f9 VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc 2012-07-13 13:27:10 -07:00
Hugo Trippaers
79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Alena Prokharchyk
79d277c30d VPC: fixed listPrivateGateways by id 2012-07-11 13:22:50 -07:00
Alena Prokharchyk
7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00