etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,515 Commits 323 Branches 325 Tags 839 MiB
Commit Graph

2011 Commits

Author SHA1 Message Date
Rohit Yadav a35db97355 NetworkService: Add method to interface to get network by uuid 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:20 -08:00
Rohit Yadav 31dd412626 DomainService: Fix getDomain by uuid string 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-11 18:44:19 -08:00
Kelven Yang f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00
Alex Huang d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Rohit Yadav 1425736c19 AccountManager: Add method to translate account type to role type 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-10 15:55:01 -08:00
Alex Huang f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
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 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
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
Rohit Yadav 7c5c3c5dfc api: Re-add deleted addProxyObject method on CloudException 
- This was removed part of the response work
- Re-adding as this kind of method definition is available in several other
  exception classes and is used in a lot of cmd classes and in service layer
- TODO: We need to find a way to replace old code and refactor method with the
  new definition that gets only uuid.
- FIXME: Some tables don't have uuid for ex. ClusterVSMMapVO, in this case
  we should keep the method until we find a way to fix this issue

Partially reverting a88ce6bb7f

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

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

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

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

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

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

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

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

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Rohit Yadav 0e1083ad83 api: Annotate iso related cmd and response classes 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 02:41:11 -08:00
Min Chen 503db14127 Add back Identity interface to most VO class to avoid cast error in 
ApiDispatcher.setupParameter call.
 2012-12-22 22:35:09 -08:00
Min Chen e7fa1a86fb Create DB views to improve ListHostsCmd performance. 
Signed-off-by: Min Chen <min.chen@citrix.com>
 2012-12-22 21:47:05 -08:00
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
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
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
Min Chen a88ce6bb7f Remove IdentityProxy from CloudException and ExceptionResponse. 2012-12-19 23:49:44 -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 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
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 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
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
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
Min Chen 472f4f91b9 Refactor ListProjectInvitationsCmd and ProjectInvitationResponse. 2012-12-12 09:04:43 -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
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 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
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
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 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
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 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 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 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 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
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
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
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 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