etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
511 Commits 324 Branches 325 Tags 795 MiB
Commit Graph

76 Commits

Author SHA1 Message Date
alena 012f097885 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 
Conflicts:
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2010-09-14 19:57:26 -07:00
anthony 05499fa5f6 execute only emergency command with slaveconn. othersiwe api call hands 2010-09-14 19:22:24 -07:00
alena b26ac321de bug 6177: Make VM group a first class object 
1) Added new apis: createInstanceGroup, updateInstanceGroup, deleteInstanceGroup, listInstanceGroups
2) Group can be created using:
* createInsanceGroup api
* deployVirtualMachine/updateVirtualMachine commands (we create a group with name equal to "group" parameter value if the group doesn't exist already)
3) Group can be removed by:
* deleteInstanceGroup api
* when corresponding account is removed
4) Vm can be assigned to one group only. To move vm from one group to another, use updateVirtualMachine command with "group" parameter
5) Changed listVirtualMachines command to use "groupId" parameter instead of "group".

status 6177: resolved fixed
 2010-09-14 19:08:01 -07:00
abhishek ab166071f8 bug 6163: refactoring some more code 2010-09-14 10:05:05 -07:00
abhishek 743187a951 bug 6163: implementing the search function for zone wide searches for vlans 2010-09-14 10:05:05 -07:00
abhishek 10ad2aa468 bug 6163: further addition of functionality wrt zone wide vlan search 2010-09-14 10:05:05 -07:00
abhishek ce7278164d bug 6163: adding new dao functionality 2010-09-14 10:05:05 -07:00
abhishek a03cf45e5d further improvements to the sp code, especially for the local storage case 2010-09-13 12:00:54 -07:00
edison d933f19d35 bug 5800: add cluster for KVM 
TODO: need to make sure the host cpu is from the same vender in a cluster
 2010-09-10 16:00:36 -07:00
anthony 55ebf465f6 Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss 2010-09-10 15:14:19 -07:00
abhishek 4682b25cb5 bug 5147: implemented the logic to ensure that the volume creation is blocked when all sp's are in maintenance (or any of the status != UP) 2010-09-10 14:41:04 -07:00
abhishek 93261c4eb8 bug 5147: Improvements after testing the storage maintenance across multiple sp's, with sys vms scattered across multiple sps 2010-09-10 13:44:39 -07:00
anthony f9bb54d7e2 use -1 instead of null 2010-09-10 13:03:08 -07:00
abhishek 20973d48af bug 5147: implementing the recommendations i got for the ps maintenance. For now, we are not implementing the cancel maintenance part. Instead, we are going to ask the admin if he is "sure" of enabling maintenance on a sp, before proceeding 2010-09-09 18:05:43 -07:00
root 76e5cf3321 renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
anthony d4828debba fix about prepareMigrationCommand 2010-09-09 15:43:33 -07:00
anthony bcaaef5f60 bug 6110: return precise message if VLAN is already created on another device. public and direct should use different VLAN. 2010-09-09 13:42:24 -07:00
Alex Huang 7249f168d5 more file changes 2010-09-09 13:27:20 -07:00
Alex Huang 6134f7dfd2 more file changes 2010-09-09 11:52:12 -07:00
abhishek 854611e40a bug 5897: returning the os_type_id 
status 5897: resolved fixed
 2010-08-30 16:25:58 -07:00
anthony 5d8cadb7b0 correctly use session in plugin 2010-08-29 23:59:33 -07:00
anthony 93b56fec8c Use Session to login out 2010-08-29 21:28:31 -07:00
anthony cad615e8e4 support multiple patch files 2010-08-29 19:21:03 -07:00
anthony e270011aed add wrapper for vdi.copy 2010-08-29 18:01:25 -07:00
anthony 4b3777e656 clean up disableVlanNetwork 2010-08-29 15:43:18 -07:00
anthony 55f3a65ec0 change plugin timeout to 1800s 2010-08-28 21:17:32 -07:00
Kelven Yang 753fe25074 Link with create/start command for vmware VMs 2010-08-27 16:32:06 -07:00
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 145e2e0aaa.
 2010-08-26 16:06:28 -07:00
Anthony Xu 145e2e0aaa Revert "use iso to patch systemvm" 
This reverts commit 3565f8d21b.
 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
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
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