2c5859dbd4
Bring javelin back to the status of being able to start System VMs after another round of master branch merge
2013-01-18 19:15:32 -08:00
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -08:00
ea3f5ecb54
Fix license for xml files in javelin
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 06:31:47 -08:00
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
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
f922c6fc03
Keep removing
2013-01-10 14:46:52 -08:00
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
bec00cce46
CLOUDSTACK-505: Converted regex expressions to pre-compiled Pattern objects
...
This was done for performance reasons.
I also refined the regex strings and added more test cases for different
string scenarios.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-17 23:01:19 -05:00
44da7b1841
CLOUDSTACK-505: Reworked approach to cleaning request / response strings
...
As noted in the bug, several of the API command in question
are async calls. I've added a simple regex-based string cleaning
function, and have the request and response strings running through
it prior to being appended to the audit log.
Unit tests added for the new cleaning function as well.
The call to skip logging the createSSHKeyPair response remains intact
for now, although it should probably be scrubbed similarly to the
password fields.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-12-17 14:11:09 -05:00
d79f1f6fdc
Replace Adapters and PluggableServices, use Spring to load them
2012-11-07 15:03:24 -08:00
453b31f3f4
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
2012-11-07 15:03:23 -08:00
0e9924fcee
Add autowiring+AOP support to injected components
2012-11-07 15:03:23 -08:00
d70154609a
Wire up injection for dynamically constructed objects
2012-10-29 16:16:07 -07:00
16ed8701da
Test of using Spring DI to implement Basic/Premium configuration
2012-10-25 18:22:32 -07:00
c272cf6b69
add TransactionContextBuilder based on Spring AOP
2012-10-25 15:01:12 -07:00
7b7f4cd1fd
CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction.
2012-10-25 13:06:50 -07:00
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
57b57703eb
fixed broken unit test
2012-08-07 17:38:05 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
84a1a311f9
S2S VPN: CS-15511: Add PFS support for VPN connection
2012-08-06 15:27:13 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
95ce55f0a1
License header updates for the utils folder
2012-08-03 14:15:09 -04:00
e9ae7336c1
CS-15649: Remove DES from s2s vpn support policy
...
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
c0fcca3990
CS-15511: Not allow pfs parameter for customer VPN gateway
2012-07-19 15:10:31 -07:00
94c62f2127
CS-15513: Fix group 5 of s2s vpn
...
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
937a9f7c45
fixing utils license header
2012-06-06 23:06:02 -04:00
91fadc4a0d
fixing line ends in utils
2012-04-09 20:05:41 -04:00
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
c42f50c4b0
Used a different way to allocate guest ip address. not in used yet.
2012-01-30 16:10:10 -08:00
ddbcd01f56
fixed up unit test
2011-11-11 14:15:13 -08:00
f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
a32c4f1ec6
Fixed unit tests
2011-11-03 14:02:53 -07:00
cef30956e9
Merge branch 'newagentmgr'
...
Conflicts:
agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/network/F5BigIpManagerImpl.java
server/src/com/cloud/network/JuniperSrxManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
8570b25506
NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file
...
Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances.
2011-10-11 17:34:57 -07:00
88b863d6e3
Bug 11522 - New agent manager
...
Initialize unit test case for resource manager
2011-10-07 15:51:24 -07:00
2a6de104e2
bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance.
2011-09-22 16:22:12 -07:00
262e6784e5
Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
...
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load
status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
5590cd93ce
bug 10716: Changed the connection's isolation level to allow for more concurrency
2011-07-18 16:32:12 -07:00
d925aa32e5
bug 10714: Implement packet fragmentation
...
Also add an simple nio unit test.
status 10714: resolved fixed
2011-07-15 19:35:56 -07:00
7a4af21f72
bug 10322: Transaction is using the new Merovingian
2011-06-29 15:34:53 -07:00
fefc798197
bug 10322: better mannered merovingians
2011-06-29 12:03:22 -07:00
687e9f6e67
bug 10322: arrival of the next generation Merovingians
2011-06-29 12:03:05 -07:00
251552f679
propagate loggin fixes
2011-06-22 16:36:24 -07:00
Kelven Yang
Alex Huang
Rohit Yadav
Noa Resare
Chip Childers
Min Chen
Chiradeep Vittal
Alena Prokharchyk
Sheng Yang
David Nalley
frank
alena
prachi
frank
Kelven Yang
Alex Huang
Sheng Yang