Commit Graph

15113 Commits

Author SHA1 Message Date
Min Chen
3698d64ba2 Use 429 Error code for API_LIMIT_EXCEED error due to latest Http status
code in
http://en.wikipedia.org/wiki/List_of_HTTP_status_codes#4xx_Client_Error
2013-01-15 16:08:47 -08:00
Min Chen
4355d06a86 Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-15 15:53:19 -08:00
Min Chen
7f1486e2dc We need to catch PermissionDeniedException in checking if command is
available to an user.
2013-01-15 11:43:59 -08:00
anthony
a6b9027630 default Security rule doesn't apply to system VMs since nic.getIsolationUri is not set
use to.setSecurityGroupEnabled to indicate if securitygroup is enabled on this NIC

CLOUDSTACK-983: default Security rule doesn't apply to system VMs
2013-01-15 11:15:42 -08:00
anthony
101f64410a Do not allow add multiple VLANs or subnets into shared network
CS allows to add multiple VLANs and subnets to a shared network, but it doesn't really work, for example , vm on second VLAN or subnet cannot get IP through DHCP
This patch will not allow to add mulitple VLANS or subnets into shared network

CLOUDSTACK-982:Do not allow add multiple VLANs or subnets into shared network
2013-01-15 09:17:12 -08:00
Pranav Saxena
8d0091d7e2 CLOUDSTACK-978:TypeError: instance.displayname is undefined while adding VM's to the LB rule 2013-01-15 21:12:10 +05:30
Prasanna Santhanam
bfd02c5db3 traffic_type not traffictype
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:36:30 +05:30
Prasanna Santhanam
04b14ab03f Marvin: physical network label not carried through in the API
The label associated with the hypervisor nic to isolate traffic types by
Guest/Mgmt/Public/Storage was not passed in the marvin.traffictype
object and sent through to mgmt server resulting in traffic types not
being applied.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-15 19:29:27 +05:30
Wido den Hollander
95222cdb6d Templates: Add Ubuntu 12.04 to the templates
Although I still think the templates aren't well maintained, I just
added 12.04 since this is an LTS and people probably want it in the
list of templates.

This system should be more generic I think though.
2013-01-15 13:25:48 +01:00
Wido den Hollander
510450b11b Remove duplicate systemUse clausule when fetching service offerings.
A couple of lines back there is:

        if (isSystem != null) {
            sc.addAnd("systemUse", SearchCriteria.Op.EQ, isSystem);
        }

So it was set redundantly, this can be removed.
2013-01-15 12:14:57 +01:00
Marcus Sorensen
0412cb8d92 Summary: Edit devcloud cfg files for advanced networking, add comments 2013-01-15 02:16:25 +00:00
Rohit Yadav
7374056493 Revert "apidoc: Remove api discovery from toc"
This reverts commit 66514c00ef.
2013-01-14 20:55:13 -08:00
Rohit Yadav
d8b04507d8 maven: exclude rat license checking for devcloud advanced cfg
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:36:27 -08:00
Rohit Yadav
c5984278ca apidoc: Fix apidoc
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
bca2c928e8 PluggableService: Fix interface definition
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
3ec985f46f StaticRoleBased: commands.properties is actually cfg for this plugin
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
c318561d6c ApiDiscovery: Get rid of redundant code, use apichecker to generate role based maps
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
8f27c711e5 ApiServer: Process through chain of api access checker, on failure it will throw exception
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
0a31945ee5 PluggableService: Fix interface to return list of cmd classes
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
Rohit Yadav
b9c020fa7c APIChecker: Fix interface definition to take in User
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:25 -08:00
Rohit Yadav
0a1e4b8cf9 tomcatconf: Move apiname:mask rules in commands.properties.in, delete others
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:25 -08:00
anthony
3aba867e16 only basic network is pod based.
it has nothing to do with shared SG enabled netwokr
2013-01-14 18:29:09 -08:00
Min Chen
ec3dd71adf Configure ApiRateLimit adapter. 2013-01-14 17:19:35 -08:00
Min Chen
4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -08:00
Marcus Sorensen
e97090a920 Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700
2013-01-14 17:15:22 -07:00
Rohit Yadav
896e505da6 APIChecker: Make interface generic, pass user and not just role
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 15:08:45 -08:00
Marcus Sorensen
9139949d96 Summary: Adding devcloud-advanced.cfg marvin config for advanced network testing
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358193432 -0700
2013-01-14 12:57:12 -07:00
Marcus Sorensen
0293d3d665 Summary: Allow passing 'storagetype' to DiskOffering.create in marvin base.py
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358185899 -0700
2013-01-14 10:51:39 -07:00
Pranav Saxena
c06218d32f CLOUDSTACK-971:Error Dialog is empty 2013-01-14 16:49:42 +05:30
Noa Resare
127867cc99 Improved handling of unknown OS, Distribution
Introduce UnknownSystemExcpetion to indicate that the system is
is unknonwn. Catch said exception in cloud-setup-management,
print an error and exit.

CLOUDSTACK-966: Improve error reporting when running on unknown OS / version

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-13 15:08:04 +05:30
Prasanna Santhanam
5442df2b5e devcloud-kvm: marvin deployment config generator for devcloud-kvm
The devcloud-kvm.py script will take the kvm.properties file to generate
an advanced zone configuration with two physical networks with traffic
labels for 'guest' and 'public' traffic going on 'eth0' and 'eth1'
respectively.

To generate config:
$ python devcloud-kvm.py -i kvm.properties -o devcloud-kvm-advanced.cfg

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-13 14:22:56 +05:30
Prasanna Santhanam
8d3cbc82d8 marvin: fixes for handling multiple phy. networks
zones do not qualify for vlans but phy networks should carry the
underlying vlan information. moving the vlan down to physical_network
in configGenerator.py.

also the sandbox example has been corrected to reflect this change
and includes an illustration of using traffic types with labels.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Reported-By: Marcus Sorenson <mlsorenson@apache.org>
2013-01-13 13:42:02 +05:30
Rohit Yadav
ad063ed610 StaticRoleBasedAPIAccessChecker: Throw exception on failed check
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 19:24:11 -08:00
Rohit Yadav
0dca44efe8 ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
40779975d3 ExtractVolumeCmd: Fix regression, use Zone Id for getting zone
Fixes regression introduced in b14b39a69f

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
4c80684b1f StaticRoleBasedAPIAccessChecker: Fix acl cfg processing error messages
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
83e7214b02 ConsoleProxyManagerImpl: Get rid of IdentityDao
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
8eba0ee0bb ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
a35db97355 NetworkService: Add method to interface to get network by uuid
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
35544f26e5 DeployVmCmd: Remove usage of IdentityDao, use Network to get by id or uuid
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
8cdb40a416 NetworkManagerImpl: Add method to getNetwork by uuid
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00
Rohit Yadav
24687973a8 ApiServer: Get rid of IdentityDao, reuse domain manager to get domain id
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -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
Rohit Yadav
7960dd429b utils: Fix getByUuid to accept string arg, it's not gonna be anything else
Due to generic programming, most classes declare Daos with ID as Long, so they
get the getUuid(Long) definition, it has to be getUuid(String), uuid is not
gonna be anything else. Fix GenericDaoBase and GenericDao.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00
Min Chen
57e67c57d7 Merge branch 'master' into api_limit
Conflicts:
	server/src/com/cloud/api/ApiServer.java

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
Noa Resare
1033200b0b CLOUDSTACK-933: CglibThrowableRendererTest writing stack traces...
Improve CglibThrowableRenderer test case

Log to a separate Logger instead of the default one to avoid spurious
stack traces in test run output.

Actually verify that registering CglibThrowableRenderer with the
alternative log hierarchy actually removes call trace lines that
contains the string <generated>
2013-01-11 17:09:44 -05:00
Marcus Sorensen
d8ebd5e4f9 Summary: Change url of tiny linux in devcloud-kvm.sql
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357930366 -0700
2013-01-11 11:52:46 -07:00
Rohit Yadav
66514c00ef apidoc: Remove api discovery from toc
Based on eb40d2337e

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 09:46:18 -08:00
Chip Childers
2b3084bba0 Per my veto vote on the dev list, reverting "SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak"
This reverts commit 106730ccdd.
2013-01-11 10:19:38 -05:00
Radhika PC
499c474ed0 Autoscale Documentation : Reviewed-By: Jessica Tomechak 2013-01-11 17:53:09 +05:30