Commit Graph

3379 Commits

Author SHA1 Message Date
Min Chen
14b5f0da19 Rename ImageDataFactoryxxx to TemplateDataFactory to have consistent
naming conventions for Template data factory class.
2013-04-17 11:45:25 -07:00
Min Chen
fe3b01ece1 Update DataObjectInStore interface and unify implementation of
ImageDataFactory, VolumeDataFactory and SnapshotDataFactory
implementations.
2013-04-17 11:40:57 -07:00
Min Chen
1b3994e180 Fix copyTemplateCmd. 2013-04-16 16:38:14 -07:00
Min Chen
0da2da852b Fix the flow of deleteTemplateCmd. 2013-04-16 12:03:12 -07:00
Mice Xia
ce3337cdd6 CLOUDSTACK-1983 StackOverflowError while deleting snapshot 2013-04-16 13:18:44 +08:00
Mice Xia
cbe021b8d2 CLOUDSTACK-2040 VM with snapshot not getting destroyed during account delation 2013-04-16 13:18:44 +08:00
Min Chen
593337565e Add S3 code to handle DownloadCommand for registerTemplate. 2013-04-15 14:44:39 -07:00
Pascal Borreli
20614598bf Fixed typos
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
Min Chen
2dd8e2cb97 add getStoreTO into each DataStoreDriver, and add implementation for 3
data store plugins.
2013-04-12 18:22:23 -07:00
Min Chen
2ff01a79ca Rename TemplateTO/VolumeTO in cloud-engine-storage to
TemplateObjectTO/VolumeObjectTO to avoid name conflicting with the one
in cloud-api.
2013-04-12 17:10:19 -07:00
Edison Su
b81fa6d9ea add copy template to cache store 2013-04-12 16:03:30 -07:00
Pascal Borreli
95cbb790f3 Fixed Primary typo 2013-04-12 16:20:11 +01:00
Chip Childers
3b35063adf Revert "Fixed Primary typo"
This reverts commit 4e5a8a0f8a.
2013-04-12 15:18:02 +01:00
Pascal Borreli
4e5a8a0f8a Fixed Primary typo
Conflicts:

	client/WEB-INF/classes/resources/messages_de_DE.properties
2013-04-12 14:14:44 +01:00
Min Chen
bb64672715 Refactor DownloadMonitorImpl code, move some functionalities to
TemplateServiceImpl and VolumeServiceImpl.
2013-04-11 18:09:42 -07:00
Prachi Damle
c7c899f62d Fixes after functional tests
Conflicts:

	client/tomcatconf/commands.properties.in
2013-04-11 13:23:04 -07:00
Prachi Damle
cf7d40c6cd Not using entity factory 2013-04-11 13:22:54 -07:00
Min Chen
582a1f0539 Fix ImageStoreDaoImpl to return only image stores, not image cache
stores.
2013-04-11 11:54:30 -07:00
Edison Su
1c448cd6e3 add cache storage 2013-04-11 11:01:29 -07:00
Edison Su
e5bf38ed05 add cache storage 2013-04-11 10:52:53 -07:00
Min Chen
02686583cf First draft of register template using image store. 2013-04-10 18:02:53 -07:00
Prachi Damle
ee0a91d111 Fixed the issue - VM deployment for local service offering for Root and with data disk(shared), was deploying data disk to local disk too. Currently there is no way to let the planner know multiple pool information, hence letting the planner search for a pool always during VM deployment. 2013-04-10 10:47:50 -07:00
Min Chen
3897590bb1 Add check in addImageStoreCmd to guarantee our assumption of homogeneous
image stores.
2013-04-09 16:36:02 -07:00
Min Chen
b2d5535bba Remove State from image_store db table, and removed enableImageStore
api.
2013-04-09 15:38:33 -07:00
Min Chen
2a177de2bc Remove unused DataStoreProviderDao since provider does not has its own
db table.
2013-04-09 14:59:07 -07:00
Min Chen
9be9902ed5 Fix applicationContext.xml to properly load all new refactored image
store related classes, also add enableImageStore api.
2013-04-09 14:49:09 -07:00
Min Chen
74880fa26f add DeleteImageStoreCmd Api. 2013-04-08 16:18:06 -07:00
Min Chen
a872d6d306 Renamed internal classes to use "imageStorexxx" instead of previous
"imageDataStorexxx". Add new addImageStoreCmd to use 3 image store
provider plugins.
2013-04-05 17:33:35 -07:00
Min Chen
7699485b4f Create DB view for Image Data Store. 2013-04-05 11:18:33 -07:00
Min Chen
86a3840412 Fix AddSecondaryStorageCmd to use CloudStack default secondary storage
store plugin.
2013-04-05 11:18:33 -07:00
Min Chen
5b31a45ebc Some further naming refactoring. 2013-04-05 11:18:32 -07:00
Min Chen
a5416797ab Move previous AncientImageDataStore provider and DefaultImageDataStore
provider code into plugins.
2013-04-05 11:18:32 -07:00
Min Chen
b0cbe260f9 New VO and DAO for snapshot, template and volume association table with
image_data_store.
2013-04-05 11:18:32 -07:00
Edison Su
f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00
Brian Spindler
469c4dd139 Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Harikrishna Patnala
6110e00c54 CLOUDSTACK-1830: ZWPS: NPE while create volume from snapshot 2013-04-02 10:40:42 -07:00
Min Chen
c52d04cd63 Correct a naming typo. 2013-03-28 10:23:55 -07:00
Hugo Trippaers
c8fd16c03d Summary: Workaround for CLOUDSTACK-1831 and CLOUDSTACK-1672
Exclude the transient dependency on jaxb-impl 2.1.13 in cxf-bundle-jars.
VmWare code depends on the 2.0 version
2013-03-28 15:00:04 +01:00
Edison Su
3ed6200ef8 move default primary storage plugin into its own pom 2013-03-20 17:21:40 -07:00
Edison Su
c60ef79321 CLOUDSTACK-1608: don't support attach volume between different storage scopes 2013-03-19 14:36:37 -07:00
Deepti Dohare
d5cb32f159 Multiple Secondary Storage Issue 2013-03-14 21:08:27 -04:00
Deepti Dohare
27b753a434 CLOUDSTACK-1575 Failed to transit volume with uploadVolume
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-03-13 10:40:08 +05:30
Edison Su
409ec9c6b6 CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo 2013-03-07 18:25:57 -08:00
Kelven Yang
cc91d826df Fix conflicts in storage subsystem with Spring 2013-03-05 19:03:31 -05:00
Kelven Yang
333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Edison Su
69678c82ac suddenly, maven can't build this java file 2013-03-04 17:23:27 -08:00
Rohit Yadav
54bfd7e04a orchestration: Fix VirtualMachineEntityFactory to process spring injections
The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:28:15 +05:30
Edison Su
cc81413931 CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more 2013-02-26 23:16:17 -08:00
Harikrishna Patnala
254275dc26 CLOUDSTACK-1293: resetpasswordforVm shows "passsd reset to undefined" 2013-02-27 12:35:04 +05:30
David Nalley
dc6b4b54fa adding license headers 2013-02-27 01:42:19 -05:00
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
Alex Huang
bdb5be6ee6 testing done 2012-12-07 15:21:21 -08:00
Alex Huang
35914d6f6a links are working 2012-12-07 15:21:20 -08:00
Alex Huang
862dff7d37 Removed the Time Service now that we know how to use cxf 2012-12-07 15:21:19 -08:00
Edison Su
1b91641397 We can directly load xenserver resource in unit test now, that means directly sending commands to hypervisor host in unit test is possible, storage integration test is in a final stage 2012-12-05 17:52:24 -08:00
Edison Su
0836bb8ec9 add state machine for templateonprimarystorage, thus we don't need hold lock 2012-12-04 19:02:14 -08:00
Edison Su
2c689adce7 add more implementation in volume project 2012-12-03 18:34:49 -08:00
Edison Su
54f9a5de65 add backup/snapshot project 2012-12-03 13:39:44 -08:00
Edison Su
ac5622cc2a add sample driver code: solidfire and s3 2012-11-28 19:50:41 -08:00
Edison Su
225ad3c289 seperate code into different modules: storage, storage/volume, storage/image, storage/snapshot, storage/backup, storage/integration-test 2012-11-27 19:16:28 -08:00
Edison Su
487a0ac43d remove unused code 2012-11-26 18:45:49 -08:00
Edison Su
e436d4327f create volume from template unit test is passed 2012-11-26 11:42:34 -08:00
Edison Su
550f4fbcdc create template/primary data store is done 2012-11-20 18:57:19 -08:00
Edison Su
573d13dd7c starting unit test 2012-11-20 18:57:19 -08:00
Alex Huang
bcff47d4b0 Changes to deploy cxf 2012-11-19 16:53:22 -08:00
Alex Huang
bd17d35adb Some initial checkins 2012-11-19 16:53:21 -08:00
Edison Su
6866613af4 refactor download template 2012-11-16 18:50:28 -08:00
Alex Huang
71f2af5c00 Added dependencies 2012-11-16 08:47:58 -08:00
Alex Huang
dd198ffd4f Added a war for cloud-engine 2012-11-16 08:47:58 -08:00
Edison Su
23a35db952 add image motion interface 2012-11-15 17:52:42 -08:00
Edison Su
3b668d2907 fix build 2012-11-15 13:29:11 -08:00
Edison Su
cad75e7220 add storage motion interface 2012-11-14 17:47:24 -08:00
Edison Su
a06eb4557e refactor apis 2012-11-13 16:34:44 -08:00
Edison Su
2251d5bb40 move interfaces around 2012-11-07 16:03:34 -08:00
Kelven Yang
cea8f3bf37 Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation 2012-11-07 15:03:22 -08:00
Edison Su
17c82b7270 add image skeleton 2012-11-05 19:36:56 -08:00
Edison Su
6dd2318b44 fix build 2012-11-05 11:19:16 -08:00
Alex Huang
37197d6360 Moved from platform to engine 2012-11-05 09:23:15 -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