Commit Graph

143 Commits

Author SHA1 Message Date
Kelven Yang bbb307c82d Explode vmware template file in place 2010-08-26 11:22:12 -07:00
Kelven Yang a3a503fecb Use ImageFormat.getFileExtension instead of toString() to retrieve template file extension name 2010-08-26 10:07:13 -07:00
Kelven Yang 0e2df1fe42 Use dummy template package to speed up debug 2010-08-26 09:43:37 -07:00
Kelven Yang 73fb80e424 Swich back to vmdk extention temporarily 2010-08-25 18:46:14 -07:00
Kelven Yang 23a38bc2be Debug & Test template copy from secondary storage to primary stroage on vmware 2010-08-25 18:17:20 -07:00
Kelven Yang 63ebb00434 Add VMDK processor for template processing at secondary storage 2010-08-25 11:59:18 -07:00
Kelven Yang 0682d70ce6 add correct check sum to default vmware template records
Let StoragePoolMonitor be aware of vmware hypervisor
2010-08-25 11:07:27 -07:00
Kelven Yang e3af2edc1d add vmware DB initial sql scripts for templates and guest OSes 2010-08-25 09:48:31 -07:00
Kelven Yang 0a401f7b91 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-25 09:40:57 -07:00
nit 6ae72df46a bug 5905: Adding deviceId tag to the ListVolumes command when the volume is attached. status 5905: closed fixed 2010-08-25 11:44:54 +05:30
Kelven Yang 45cb68e7e2 add templates.vmware.sql
modify build to deploy vmware database records
2010-08-24 22:58:05 -07:00
Kelven Yang 49900a8985 1) Add VMDK format
2) Make console proxy servlet explictly return content-type header for console proxy page (this is a bug fix change)
2010-08-24 18:58:38 -07:00
jessica 895fb85162 check in for Alex. 2010-08-24 15:48:40 -07:00
Alex Huang 415bc8ae20 bug 5764: checkin before I switch to work on 2.1.x 2010-08-24 14:40:29 -07:00
Anthony Xu 5fb852f0ca fix build, add XenServerResource.java 2010-08-24 10:21:41 -07:00
Alex Huang fb389e8cd6 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-24 00:01:09 -07:00
Alex Huang 20b26082db bug 5764: changing from networkoffering to network profile 2010-08-24 00:00:43 -07:00
Anthony Xu 55e425361d Merge branch 'lmaster' 2010-08-23 18:13:33 -07:00
Anthony Xu 0366dd093c use slaveconnection instead of masterconnection for all host plugin calls.
tested by creating domr and user vm and migrating them

1. if you add host for kvm , you need specify kvm://ip_address, otherwiset there is no to differ kvm and xenserver hosts, edison cloud you please test this, may need some minor fixes.

2. if you want to session inside your plugin call, you can not use the one which is passed in, due to it is a slavesession, you need to call get_xapi_session() to get a new local session and use it. I have modified some of these, I may ignore some. Please let me know if you see XENAPI_PLUGIN_EXCEPTION.
2010-08-23 18:01:39 -07:00
abhishek 67e1eee981 Adding to migration script 2010-08-23 16:27:40 -07:00
abhishek 7f771cbe24 bug 5883: Final checkin for volume lineage
status 5853: RESOLVED FIXED
2010-08-23 16:17:18 -07:00
abhishek 87f8c3449f Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 16:04:16 -07:00
abhishek 7454f0f24a Incremental checkin for volume lineage 2010-08-23 16:02:45 -07:00
Alex Huang e91617bc6f Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 15:10:15 -07:00
Alex Huang bb06bc3d57 fixed merge conflict 2010-08-23 15:10:08 -07:00
Manuel Amador (Rudd-O) a9a22c7c81 fedora 12 is the test for dependency of cloud-qemu 2010-08-23 15:02:24 -07:00
Kelven Yang 7a46156d09 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-23 14:17:18 -07:00
Kelven Yang 8eb1e27b3c Update eclipse project classpath file to work with renamed vmware jar files 2010-08-23 14:16:43 -07:00
abhishek 27b038efcb Correcting hypervisor type enum 2010-08-23 14:07:35 -07:00
Alex Huang e0165dd2ef my changes 2010-08-23 13:59:23 -07:00
root d2ffa6b68d bug 5781: also reduce the scope of the global lock when updating storage capacity. 2010-08-23 13:41:22 -07:00
Kris McQueen adce18b2c0 [merge from 2.1.x] Bug 5781: Only grab capacity global lock when accessing capacity tables. Once the queries are done, release the lock so that others can query for the data or update the data as needed. 2010-08-23 13:41:03 -07:00
Kelven Yang f98e272d48 Remove an incorrect usage of @inject, it caused management server from being loaded 2010-08-23 12:25:47 -07:00
Kelven Yang 08ae56d360 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
Conflicts:
	api/src/com/cloud/hypervisor/Hypervisor.java
	build/build-cloud.xml
2010-08-23 12:12:45 -07:00
kishan 89cd3131bf add zone id for create template event 2010-08-23 17:19:31 +05:30
Kelven Yang 7bcff5acf3 Vmware incremental check-in 2010-08-20 18:50:33 -07:00
jessica c17cda2a37 resolve failed merge markers 2010-08-20 18:15:24 -07:00
Jessica Wang 65b9f29941 Issue #: 5975
(1) API-side: make listDomains, ListDomainChildren return all items

(2) UI-side: make domains page show all domains by specifying pageSize=-1
2010-08-20 17:39:40 -07:00
jessica 440662c938 Issue #: 5986
Volume page - grid - make action links stay left-aligned
2010-08-20 17:31:59 -07:00
Edison Su bf3db195ed fix typo 2010-08-20 18:51:17 -04:00
Alex Huang 4cda798057 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-20 14:51:48 -07:00
Manuel Amador (Rudd-O) 40a78f166e build-cloud.xml build-cloud FAILS until now. It had references to files in directories that were moved. 2010-08-20 14:02:41 -07:00
Alex Huang 0f7a7f0879 merge 2010-08-20 13:38:24 -07:00
Alex Huang 4356eb7c26 Start2Command implementation for xenserver 2010-08-20 13:35:08 -07:00
Manuel Amador (Rudd-O) b9e600ed53 Remove the unnecessary excludes from build-ui 2010-08-20 13:21:19 -07:00
Manuel Amador (Rudd-O) 6b08c8afc3 Add thirdparty jars because otherwise the premium parts that do VMWare do not compile 2010-08-20 13:07:16 -07:00
Manuel Amador (Rudd-O) ea58879032 Remove build.number 2010-08-20 13:06:40 -07:00
Manuel Amador (Rudd-O) eae268d5d9 Undo unnecessary reformatting that is complicating the merges 2010-08-20 12:24:59 -07:00
Jessica Wang f0b82f8565 move source of resource properties from UI folder to client folder
move source of resource properties from UI folder to client folder

move source of resource properties from UI folder to client folder
2010-08-20 12:08:47 -07:00
Alex Huang 24ccf442b0 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-19 11:28:05 -07:00