kishan
0e326e853c
bug 5900: Added events for disk offering
2010-08-27 18:02:23 +05:30
Anthony Xu
8a928a7a30
Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss
2010-08-26 16:06:57 -07:00
Anthony Xu
d72e0538da
Revert "Revert "use iso to patch systemvm""
...
This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26.
2010-08-26 16:06:28 -07:00
Anthony Xu
145e2e0aaa
Revert "use iso to patch systemvm"
...
This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe.
2010-08-26 16:03:34 -07:00
root
3565f8d21b
use iso to patch systemvm
...
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
scripts/vm/hypervisor/xenserver/xenserver56/patch
2010-08-26 15:56:02 -07:00
Kelven Yang
b69816814c
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-26 13:56:23 -07:00
Kelven Yang
bbb307c82d
Explode vmware template file in place
2010-08-26 11:22:12 -07:00
abhishek
d1b4034633
Mvoing console proxy manager to server
2010-08-26 10:30:52 -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
kishan
fb99f95d7c
bug 5730: update dns of systemVms during zone update
2010-08-26 21:02:37 +05:30
kishan
acb23b6158
bug 5904,5474: added listCapabilities API
2010-08-26 14:53:03 +05:30
Kris McQueen
defae59126
Finish refactoring createTemplate to new API framework. The executor and result object from old framework still need to be deleted, but this commit moves all the business logic to the manager with validation in the createPrivateTemplateRecord and creating a snapshot if necessary in createPrivateTemplate. Additionally, added a find method on the template dao to check if the template name is in use for the account (this is part of the validation).
2010-08-25 18:26:38 -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
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
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
Kelven Yang
8eb1e27b3c
Update eclipse project classpath file to work with renamed vmware jar files
2010-08-23 14:16:43 -07:00
Alex Huang
e0165dd2ef
my changes
2010-08-23 13:59:23 -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
Kelven Yang
7bcff5acf3
Vmware incremental check-in
2010-08-20 18:50:33 -07:00
Alex Huang
4356eb7c26
Start2Command implementation for xenserver
2010-08-20 13:35:08 -07:00
Alex Huang
417a3c8c18
bug 5764: More changes
2010-08-19 11:27:30 -07:00
Alex Huang
afc0adf28a
security checker
2010-08-19 09:23:03 -07:00
Alex Huang
52e6f3a85b
Added '/' to gitignore
2010-08-19 09:04:10 -07:00
Kelven Yang
ff02e07a33
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-18 21:44:37 -07:00
edison
3106c2ae3f
Issue #: 5954
...
Status 5954: resolved fixed
exclude link local gateway
2010-08-18 17:44:39 -07:00
Kelven Yang
792fdf91b8
1) Add host_master table for tracking VMWare vShpere servers
...
2) Add SynchronizationEvent for in-process event synchronization
3) Move VMware files out of FOSS code base
2010-08-18 17:30:11 -07:00
Alex Huang
b250b985ec
changes
2010-08-18 12:19:22 -07:00
alena
e2950eb5a1
Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
...
Conflicts:
server/src/com/cloud/api/BaseCmd.java
server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
2010-08-18 11:36:05 -07:00
alena
3d85fdf687
API refactor
2010-08-18 11:24:29 -07:00
abhishek
57edd7d2f8
Refactoring the StorageManager interface into server code
2010-08-17 16:43:01 -07:00
abhishek
7e502768ed
Incremental checkin
2010-08-17 16:07:48 -07:00
Kelven Yang
53097c67f5
1) Fix build problem caused by alex's Refactoring
...
2) Let console proxy servlet support API key to allow session-less access
2010-08-17 15:15:06 -07:00
Alex Huang
a89aad4d15
removed override
2010-08-17 10:16:16 -07:00
Alex Huang
c5f822ca7a
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2010-08-16 11:30:22 -07:00
Alex Huang
c21bc7072c
more changes
2010-08-16 11:30:04 -07:00
Alex Huang
867b43dcf9
more changes for the rewrite.
2010-08-16 11:28:11 -07:00
Kelven Yang
e78f05599c
Test verification with vim2.5
2010-08-16 11:12:11 -07:00
abhishek
b4d6baf044
Fixing the multiplying factor issue
2010-08-16 10:05:46 -07:00
edison
900b9e2f2f
Merge branch 'addhost'
2010-08-13 23:26:16 -07:00
edison
53df26daaa
"Add host" for kvm:
...
The sequence:
1. add host in UI
2. scp setup_agent.sh to agent host, and execute it. This script receives hostip,zoneid, podid and guid, then runs "cloud-setup-agent" and "cloud-setup-console-proxy". Here, we assume that network/hostname and cloud-agent are already configed and installed.
3. Write a dummy kvm resource into the database, then wait for agent connects to server, by polling the database for every 1 minutes. If it finds the agent is in UP state in database, then return, or wait for at least 10 minutes.
2010-08-13 23:19:36 -07:00
Anthony Xu
642d0dfe8a
Issue #: 5917
...
if we found the SR, we'll never create it again.
2010-08-13 15:17:33 -07:00