Kelven Yang
6dfbcee63d
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -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
Kelven Yang
64c947a9f8
Re-fix startup of management server
2013-01-14 10:52:37 -08:00
Kelven Yang
61ff07e355
Fix POM that breaks the build
2013-01-14 10:16:07 -08: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
Hugo Trippaers
11fd1216ed
Summary: Polish and shine
...
Document the used options in agent.properties
Default the bridge driver to something sensible based on the
configuration of the bridge type.
2013-01-14 18:43:15 +01:00
Hugo Trippaers
32c5fed1fb
Summary: copy/paste error
2013-01-14 17:17:06 +01:00
Hugo Trippaers
7befb2e2a0
Merge branch 'cloud-agent-with-openvswitch' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into cloud-agent-with-openvswitch
2013-01-14 17:14:30 +01:00
Hugo Trippaers
8738fee789
Summary: small fix causing trouble when shutting down virtual machines
2013-01-14 17:09:49 +01:00
Hugo Trippaers
4764f98866
Summary: Fix logic error
...
Should if "if the username is not cloud AND developer is not true, then
report an error"
2013-01-14 16:16:19 +01:00
Pranav Saxena
c06218d32f
CLOUDSTACK-971:Error Dialog is empty
2013-01-14 16:49:42 +05:30
Hugo Trippaers
c6916ff4e0
Summary: Add vlan configuration to the network inteface definition
...
Add xml piece for defining vlans
Set vlan tag in the libvirt definition for the network inteface
2013-01-14 08:38:22 +01:00
Hugo Trippaers
c9c40d066e
Summary: Add initial support for OpenVswitch to the KVM hypervisor
...
Create OvsVifDriver to deal with openvswitch specifics for plugging
intefaces
Create a parameter to set the bridge type to use in
LibvirtComputingResource.
Create several functions to get bridge information from openvswitch
Add a check to detect the libvirt version and throw an exception when
the version is to low ( < 0.9.11 )
Fix classpath loading in Script.findScript to deal with missing path
separators at the end.
Add notification to the BridgeVifDriver that lswitch broadcast type is
not supported.
2013-01-14 08:38:21 +01:00
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
9faf00bdc8
Fix license on xml.in, jsp and ucls files on javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:34:34 -08:00
Rohit Yadav
ea3f5ecb54
Fix license for xml files in javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:31:47 -08:00
Rohit Yadav
ba20e7f85a
Fix license headers for java files in javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:27:09 -08:00
Rohit Yadav
38eaa04b98
Pull changes from master into javelin
...
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts
Conflicts:
docs/en-US/external-firewalls-and-load-balancers.xml
plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:02:54 -08:00
Rohit Yadav
fdc9103fbe
create-schema: Fix deploydb, drop existing (new) tables
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:43:35 -08:00
Rohit Yadav
452e9c3efd
maven: Remove duplicate cloud-core dependency in server
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:41:27 -08:00
Rohit Yadav
ad063ed610
StaticRoleBasedAPIAccessChecker: Throw exception on failed check
...
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 19:24:11 -08:00
Rohit Yadav
0dca44efe8
ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
40779975d3
ExtractVolumeCmd: Fix regression, use Zone Id for getting zone
...
Fixes regression introduced in b14b39a69f
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
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
Kelven Yang
6fb1a1e6f1
Fix issues after another round of merge
2013-01-11 16:54:32 -08:00
Min Chen
57e67c57d7
Merge branch 'master' into api_limit
...
Conflicts:
server/src/com/cloud/api/ApiServer.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
Kelven Yang
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
Kelven Yang
53da542001
Another round of fixes after merge
2013-01-11 15:21:04 -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
Hugo Trippaers
9adf277182
Summary: Add vlan configuration to the network inteface definition
...
Add xml piece for defining vlans
Set vlan tag in the libvirt definition for the network inteface
2013-01-11 17:16:07 +01: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
Prasanna Santhanam
eb40d2337e
apidoc: fixing the api doc failure
...
remove api-discovery_commands.properties since the plugin returns the
listApis call as a map directly. not needed for api doc generation.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-11 17:04:30 +05:30
Radhika PC
106730ccdd
SRX and f5 inline mode documentation: Reviewed-By: Jessica Tomechak
2013-01-11 15:54:00 +05:30
Pranav Saxena
bb59c1e385
Revert "<message>"
...
This reverts commit 5dd14f322c .
2013-01-11 15:51:28 +05:30
Author Name
5dd14f322c
<message>
2013-01-11 15:47:23 +05:30
Sebastien Goasguen
b2ca9fe7b0
Added Marvin building docs to dev guide
2013-01-11 10:57:00 +01:00
Sebastien Goasguen
5f19c45e04
Added Marvin building docs in developer guide
2013-01-11 10:55:37 +01:00