1188 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -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
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -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
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
Kelven Yang
107fccdf69 Add AsyncCallFuture 2013-01-03 17:24:26 -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
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
Alex Huang
35914d6f6a links are working 2012-12-07 15:21:20 -08:00
Alex Huang
bd17d35adb Some initial checkins 2012-11-19 16:53:21 -08:00
Alex Huang
cf6b336739 fixed pom problem in network component 2012-11-05 09:22:50 -08:00
Alex Huang
a6df8a5b44 Added engine 2012-11-05 09:14:14 -08:00