Commit Graph

179 Commits

Author SHA1 Message Date
Edison Su
0e6290ba87 fix build 2013-02-26 18:50:48 -08:00
Edison Su
8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Mice Xia
46e91bd794 fix issue: failed to start vm from iso caused by ClassCastException and NPE 2013-02-26 17:01:26 +08:00
Sheng Yang
1b408509d6 CLOUDSTACK-1332: Add IPv6 DNS for Zone 2013-02-25 16:08:10 -08:00
Edison Su
3bb713c5ce fix adding nfs primary storage and build and load 2013-02-21 16:24:39 -08:00
frank
15ead099a1 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

able to start vm

Conflicts:

	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
	server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
Chip Childers
6cc1123a3e Correcting license headers that broke the build
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-21 16:29:05 -05:00
Edison Su
ae902590d3 fix snapshot 2013-02-21 11:22:50 -08:00
Edison Su
fb4036ece4 add test folder for snpahost project 2013-02-21 11:22:49 -08:00
Edison Su
0f532c4b3a rebase to master 2013-02-21 11:22:49 -08:00
Edison Su
ff047e75d3 refactor snapshot, move existing snapshot code into its own snapshotstrategy 2013-02-21 11:22:49 -08:00
Edison Su
020be66f9d add copy volume and create volume from snapshot 2013-02-21 11:22:49 -08:00
Edison Su
621a779446 use correct disk offering id 2013-02-21 11:22:49 -08:00
Edison Su
ec09e34f86 fix downloading template 2013-02-21 11:22:48 -08:00
Edison Su
a22403edcd squash changes into one giant patch 2013-02-21 11:22:48 -08:00
Rohit Yadav
80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Hugo Trippaers
9755d9b4a2 Keep naming more or less consistent 2013-02-02 12:43:15 +01:00
Kelven Yang
7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kelven Yang
176523254e Improve component lifecycle management with system run-level concept 2013-01-30 15:21:02 -08:00
Kelven Yang
1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Edison Su
6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -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
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
Prachi Damle
e5bf16b00f Fixing error with merge 2013-01-22 16:44:28 -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
3cc9f3ff06 Adding defaults to new columns 2013-01-22 12:54:12 -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
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
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
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
Rohit Yadav
593b60ca51 rat: Fix license on newly added files
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 21:37:24 -08:00
Kelven Yang
249dcde364 Add FactoryBean for VirtualMachineEntity to help implement dyanmic injection 2013-01-17 21:06:45 -08:00
Kelven Yang
e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Edison Su
ddc53771bf implement toURI 2013-01-17 18:49:50 -08:00
Edison Su
c4a11b9979 rename datastream to dataobject 2013-01-17 18:49:50 -08:00
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Kelven Yang
df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Edison Su
c93918a896 rename dataobject to datastream 2013-01-15 15:46:21 -08:00
Edison Su
8af85b04d0 refactor api, based on suggestion from community 2013-01-14 18:52:39 -08:00
Kelven Yang
61ff07e355 Fix POM that breaks the build 2013-01-14 10:16:07 -08:00
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
Kelven Yang
53da542001 Another round of fixes after merge 2013-01-11 15:21:04 -08:00
Alex Huang
f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Alex Huang
56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang
395de6f2b3 merge from latest pull 2013-01-10 11:07:11 -08:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Edison Su
a03d83bba9 refactor the motion service api 2013-01-10 10:27:05 -08:00
Alex Huang
0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Alex Huang
14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Kelven Yang
b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Kelven Yang
32e67f60d4 Work with Spring proxy-ed object 2013-01-08 14:24:19 -08:00
Prachi Damle
a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Kelven Yang
b96bb8feb9 Hook log4j to Spring bootstrapped Javelin server 2013-01-07 18:21:58 -08:00
Edison Su
2d6133c61e change the top level async call using future 2013-01-04 17:17:57 -08:00
Edison Su
9410cd1f3c add deletevolume and createdata disk 2013-01-03 18:56:18 -08:00
Kelven Yang
107fccdf69 Add AsyncCallFuture 2013-01-03 17:24:26 -08:00
Prachi Damle
8a9cf04008 Fixing the file that was merged incorrectly 2013-01-03 11:44:40 -08:00
Prachi Damle
1bdec94627 Deleting the file that got added during rebase 2013-01-03 11:44:40 -08:00
Prachi Damle
7e61e200a6 Register Host and unit test 2013-01-03 11:44:39 -08:00
Prachi Damle
3ff3a47e36 Provisioning Service: register Pod, Cluster, Deregister Zone/Pod/Cluster and unit tests 2013-01-03 11:44:37 -08:00
Prachi Damle
1eb64e6181 ProvisioningService:: registerZone changes and unit-test 2013-01-03 11:44:36 -08:00
Edison Su
d7bc09f950 fix build 2013-01-03 11:35:41 -08:00
Edison Su
e40042b554 refactor volumeservice api 2013-01-02 18:42:48 -08:00
Edison Su
ce2120d09d fix build 2013-01-02 17:43:55 -08:00
Edison Su
5d1e97e407 add create volume 2013-01-02 17:32:54 -08:00
Kelven Yang
6504fc6b09 Enforce strong typing for getting result from AsyncMethod 2013-01-02 15:48:45 -08:00
Edison Su
13aef24ba2 add uml class diagram generated by objectaid 2012-12-28 16:51:25 -08:00
Alex Huang
56be555733 missing change 2012-12-28 16:49:12 -08:00
Alex Huang
c622bee1ed made changes to work with the new injection stuff 2012-12-28 16:44:26 -08:00
Alex Huang
e936c32a04 Fixed problems with inject checkin 2012-12-28 16:24:54 -08:00
Alex Huang
54cce5fa18 Getting things to compile 2012-12-28 16:07:56 -08:00
Kelven Yang
259e6d5f74 Fix a few Spring bootstrap issues 2012-12-27 17:46:52 -08:00
Edison Su
9de3a1fae4 add create volume from base image command 2012-12-27 16:31:59 -08:00
Edison Su
d99161399e so many traps in rpc call: you can't use aop in a thread, you need to intercept finalize call etc 2012-12-24 02:37:32 -08:00
Edison Su
4b2d9f4415 refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case 2012-12-22 22:10:39 -08:00
Kelven Yang
877e16029c Fix a few Spring issues to Bootstrap javaline server 2012-12-21 16:49:27 -08:00
Edison Su
ac88c16be6 finaly, finish download template to primary storage 2012-12-20 19:06:02 -08:00
Edison Su
c216990e1c trying to add code to download url into devcloud 2012-12-19 18:43:04 -08:00
Edison Su
8aaf5ba3a0 fix unit test 2012-12-19 16:01:58 -08:00
Edison Su
ad3b226ab2 fix test build 2012-12-19 12:08:58 -08:00
Edison Su
8214f18897 fix build, due to refactor rpc 2012-12-19 12:02:11 -08:00
Edison Su
0581ea763a add xenserver backend code: download template from http directly 2012-12-18 18:34:13 -08:00
Edison Su
aefb657c41 Finally, get async api call works for storage subsystem 2012-12-17 18:12:46 -08:00
Edison Su
716a5673d0 1st try to add async api in the storage component, it's ugly like hell 2012-12-14 18:25:40 -08:00
Edison Su
510d3759a7 fix build 2012-12-13 15:17:23 -08:00
Edison Su
cdf5511664 finish configurator, the default primary storage provider can cover all the hypervisors and protocols 2012-12-08 03:16:03 -08:00
Edison Su
7652a44be7 add datastore configurator, for each hypervisor and each protocol, needs to have its own configurator 2012-12-07 18:23:08 -08:00
Edison Su
ae59bf6c3b add lifecycle on primarydatastore 2012-12-07 18:23:08 -08:00