Edison Su
6f5655cb03
generalize storage orchestration: DataObjectManager will handle all the object life cycle management
2013-01-24 18:30:08 -08:00
Kelven Yang
f8e5740c31
A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes
2013-01-24 18:04:48 -08:00
Rohit Yadav
b63b7ddf60
UserContext: Threadsafe singleton, inject using ComponentContext, spring di failsafe
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 17:00:12 -08:00
Min Chen
b6f780fa33
Fix StoragePool unit testcase.
2013-01-24 16:11:35 -08:00
Min Chen
f85ac65645
Fix Snapshot unit testcase.
2013-01-24 16:05:03 -08:00
Rohit Yadav
e5b23e387d
AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:41:04 -08:00
Rohit Yadav
753b884044
spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:40:40 -08:00
Alex Huang
1567a112fa
unit test works again
2013-01-24 14:36:44 -08:00
Kelven Yang
a26e075f0e
Remove final modifer to ListS3Cmd class as it conflicts with Spring injection
2013-01-23 18:24:03 -08:00
Prachi Damle
d182e64897
GenericDao maintains a map of VO interface -> DaoImpl. Since cloud-engine is not yet a separate service, we need to introduce dummy interfaces to load both CloudStack API daoImpls and engine daoImpls
2013-01-23 17:59:15 -08:00
Prachi Damle
057097d0e0
Planner should set the pool information in the destination for volumes that are not yet ready.
2013-01-23 17:31:00 -08:00
Alex Huang
6088cbfe47
nonoss compiled up til netscaler
2013-01-23 17:18:55 -08:00
Alex Huang
8e2a96923c
delete some old sql files
2013-01-23 17:18:54 -08:00
Prachi Damle
e67381b76d
Fix NPE with volume reservation
2013-01-23 16:41:29 -08:00
Rohit Yadav
baae73cc05
rat: Fix licenses on engine/orchestration/src.o.a.cloudstack.engine.cloud.api.db
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 16:26:55 -08:00
Kelven Yang
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
Rohit Yadav
0f5c5c2078
maven: tools/devcloud should be in developer profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 17:06:52 -08:00
Prachi Damle
e5bf16b00f
Fixing error with merge
2013-01-22 16:44:28 -08:00
Rohit Yadav
7b11b71d81
maven: create dependency, deploydb on developer first and then on devcloud
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb2770012 )
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:57 -08:00
Rohit Yadav
1a695b84b4
tools: Fix devcloud artifact name, avoid confusion
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:51 -08:00
Edison Su
e4e2cf6be7
skip test in cloud engine
2013-01-22 13:25:48 -08:00
Edison Su
c921118c58
add image create test case
2013-01-22 13:25:48 -08:00
Prachi Damle
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
Prachi Damle
2adce8e712
Fixes to VO stuff
2013-01-22 12:54:22 -08:00
Prachi Damle
1cb0ce44df
Removing BareMetalService referrences. We will load UserVMService by default.
2013-01-22 12:54:20 -08:00
Prachi Damle
434c21a149
Fixing Merge error
2013-01-22 12:54:18 -08:00
Prachi Damle
02185d4240
VO should not contain any DAO. Transient should be loaded by the caller using the Dao.
2013-01-22 12:54:16 -08:00
Prachi Damle
3cc9f3ff06
Adding defaults to new columns
2013-01-22 12:54:12 -08:00
Prachi Damle
ef4d04f289
Removing the alter table statement - data_center already has a removed column
2013-01-22 12:54:09 -08:00
Prachi Damle
e6cd47ddc0
More changes for deployVM flow.
2013-01-22 12:54:07 -08:00
Prachi Damle
94e8090bf3
Deploy, Start, Stop, Destroy VM orchestration service changes
2013-01-22 12:54:04 -08:00
Alex Huang
ee39ec82d3
Making unit tests work
2013-01-22 11:18:51 -08:00
Edison Su
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
Edison Su
3251cd665b
add test case for create storage pool
2013-01-21 16:59:51 -08:00
Edison Su
b4988e86ab
add backedn code
2013-01-21 16:59:50 -08:00
Alex Huang
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
Alex Huang
f27692aa7a
Removed a useless class?
2013-01-21 10:25:58 -08:00
Kelven Yang
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
Kelven Yang
d056cd5cab
Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code
2013-01-18 19:15:32 -08:00
Rohit Yadav
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
Rohit Yadav
e70143c1dc
maven: Fix developer/pom.xml to use DatabaseCreator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:11:42 -08:00
Rohit Yadav
03a3837d92
DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:09:04 -08:00
Rohit Yadav
7fbe935c36
Transaction: Fix static, add method to reinit static datasource off a db props file
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:08:11 -08:00
Rohit Yadav
e688fbfc24
ScriptRunner: Alternate constructor to get verbosity flag
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:07:37 -08:00
Rohit Yadav
6214b1d4bd
db.properties: adding other key value info for dbcreator to work in a generic way
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 17:19:55 -08:00
Alex Huang
4a9cf4b4a8
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-18 15:59:24 -08:00
Alex Huang
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
Edison Su
224621197c
add misssing files
2013-01-18 15:39:37 -08:00
Edison Su
1283712d93
replace spring injection in nfssecondarystorage
2013-01-18 15:10:08 -08:00
Alex Huang
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00