Alex Huang
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
Prachi Damle
a4f4c98670
OrchestrationService: some changes for DeployVM
2013-01-08 11:53:54 -08:00
Kelven Yang
992fa473be
convert existing singleton objects into Spring loadable bean components
2013-01-08 11:07:22 -08:00
Kelven Yang
b96bb8feb9
Hook log4j to Spring bootstrapped Javelin server
2013-01-07 18:21:58 -08:00
Rohit Yadav
0a25884215
Merge branch 'master' into api_refactoring
2013-01-07 17:28:57 -08:00
Min Chen
0894822651
DB view dao cleanup, and introduce global configuration parameter for
...
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -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
Hugo Trippaers
91673b10b8
Summary: Get started with packaging cloud-agent
...
Modify the spec file to package the agent files and the scripts
Some changes to the poms to put the java dependencies in the right place.
Move the agent script to the dedicated os dir in packaging.
2013-01-07 22:18:01 +01:00
Hugo Trippaers
d616dcdd40
Summary: small fix for the classpath loader
...
Add the file separator if the path does not end with one
2013-01-07 22:17:55 +01:00
Rohit Yadav
a948a89378
Sync updates: Merge branch 'master' into api_refactoring
...
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -08:00
Min Chen
13de3ca253
Enable default sorting for listVirtualMachines and listRouters to keep
...
back compatible.
2013-01-07 10:26:33 -08:00
Pranav Saxena
d5ac10d7b2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-07 22:31:51 +05:30
Sanjay Tripathi
fd8607d41e
CLOUDSTACK-819:Changing GET request to POST while creating account/user to hide the passwords in the access logs
2013-01-07 22:29:28 +05:30
Murali Reddy
bf6ed9312d
Missed portion of the fix for CLOUDSTACK-595 submitted by commit
...
3ffbc4320abc9fd03ad3abd1f8077cc8d8f9ed4c which caused build break.
Fixing the build break and added missing code.
2013-01-07 16:36:47 +05:30
Koushik Das
3ffbc4320a
CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
...
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
Kishan Kavala
5502f4b20c
Corrected response object in Traffic Monitor APIs Implementation annontation as TrafficMonitorResponse
2013-01-07 12:32:24 +05:30
Rohit Yadav
3c1ccdf604
Sync updates, merge branch 'master' into api_refactoring
2013-01-06 17:52:51 -08:00
Rohit Yadav
c13f0199f4
cli: Cosmetic fix for prompt of cloudmonkey
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:30:00 -08:00
Rohit Yadav
39b829bffe
api: ACL annotation and checkAccess removal refactor for StopVMCmd
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:19:49 -08:00
Rohit Yadav
96b9164e4b
Fix ACL processor and methods in ApiDispatcher and their usages
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 17:18:45 -08:00
Rohit Yadav
19cf665094
ApiServer: Fix debug output for role based user access checking
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 16:51:14 -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
e51bc8b161
InfrastructureEntity: New interface contract for classes not associated with any account
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:32:40 -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
6f6ed85839
ApiXmlDocWriter: Fix apidocs generation based on new commands.properties syntax
...
Makes it backward compatible to old syntax as well
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 15:01:09 -08:00
Rohit Yadav
b246ed7be7
api: Fix name fields for autoscale @APICommand annotation
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:56:30 -08:00
Rohit Yadav
e17e68f0af
server: Fix base template*cmd class imports and names
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 14:47:00 -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
0df94a8be1
Remove old syntax for commands.properties, apiname=rolemask is enough
...
While the syntax is being fixed, the static role based acl plugin is backward
compatible while processing the commands.properties files in either syntax...
As per new syntax, you do:
apiname=rolemask
apiname and cmd class info is couple in the cmd class itself which apiserver
creates a mapping of when it starts.
Fix old syntax for role based acl:
for i in `find . | grep commands.properties.in`;
do
echo $i;
sed 's/[ ]*=[a-zA-Z 0-9\.]*;/=/g' $i > $i-temp;
rm $i;
mv $i-temp $i;
done
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 13:56:56 -08:00
Gavin Lee
7235ba35ad
Remove Duplicated Network Devices Commands
2013-01-07 00:34:53 +08:00
Rohit Yadav
b720675bfe
Merge branch 'master' into api_refactoring
...
Getting ready for merge request for master, sync changes
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-06 01:11:16 -08:00
Sheng Yang
aa9701a10c
CLOUDSTACK-799: Redundant router: Speed up RvR status update
...
The basic idea behind this is, deploy a fix sized threadpool for updating RvR
status, then using producer/consumer model. There is a global configuration
router.check.poolsize(10 by default) to control the pool size.
Using pool size 100 for 1000 RvR is tested with simulator and works well.
Also we can adjust the global configuration option router.check.interval to e.g.
60s from default 30s to mitigate the issue.
2013-01-05 21:02:37 -08:00
Rohit Yadav
21d6cd304b
server: Reformat DomainChecker
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 17:00:13 -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
b00ed17f4b
server: Cosmetic fix for methodname in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:40:59 -08:00
Rohit Yadav
63481ecb34
CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 16:27:36 -08:00
Rohit Yadav
c5abc180ab
CLOUDSTACK-212: Move api/test pkg to org.apache.cloudstack
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 15:53:59 -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
f1c15f0c2e
cli: Remove unused method, fix welcome msg, prompt
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-05 02:11:45 -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
3d9dc36463
The other xml license fix
2013-01-04 20:03:16 -08:00
Sheng Yang
51502e9f06
Fix license issue of new added xml files
2013-01-04 19:52:21 -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
dea8227001
server: Exclude ListPerf test in as it requires real MS and DB
...
Excluded test as per test author's comment:
"Currently we commented out this test suite since it requires a real MS and Db running"
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 18:25:13 -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
Rohit Yadav
0659c21f2d
Get latest changes, Merge branch 'master' into api_refactoring
2013-01-04 17:22:57 -08:00
Edison Su
2d6133c61e
change the top level async call using future
2013-01-04 17:17:57 -08:00