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

277 Commits

Author SHA1 Message Date
abhishek a016aa27cd bug 6203: incremental fix 2010-09-17 16:59:40 -07:00
Alex Huang 8b417ff04c Changed Public network 2010-09-17 13:37:53 -07:00
Alex Huang bebe79ebc9 more work from alex 2010-09-17 13:37:53 -07:00
kishan 91d4715b4b Bug 5947: decrement resource count when deployVM fails for direct attached case 2010-09-17 18:19:10 +05:30
nit 48cd102ab9 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-17 17:04:35 +05:30
nit 636dc041c7 bug 4286: Making extractIsoCmd and extractTemplateCmd async 2010-09-17 17:04:07 +05:30
nit fceb9378ca bug 4286: Making extractIsoCmd and extractTemplateCmd async 2010-09-17 16:59:09 +05:30
abhishek f1cab0525c bug 6021: blocking the deletion of private disk offering from the back end api 2010-09-16 16:47:35 -07:00
abhishek 3abe056736 bug 6141: fixed the error of not providing the right error for an incorrect diskoffering 
status 6141: resolved fixed
 2010-09-16 15:01:13 -07:00
abhishek 6731dc66f1 bug 3120: incremental checkin 2010-09-16 12:02:54 -07:00
Alex Huang 131e487c32 allocation complete. Moving on to actual create and deploy 2010-09-16 12:01:56 -07:00
anthony 7ca2adeb67 first host doesn't need to switch master 2010-09-15 21:24:52 -07:00
anthony ec8a2a9579 always add master host first 2010-09-15 19:56:06 -07:00
Alex Huang e283bc7f05 no idea how these files were not committed 2010-09-15 18:00:55 -07:00
Alex Huang 84179cd561 add missing files 2010-09-15 18:00:54 -07:00
Alex Huang 327924a9ad More changes for refactoring 2010-09-15 18:00:54 -07:00
abhishek b2efa6872b a few more code cleanup tasks 2010-09-15 15:38:24 -07:00
abhishek 40db8f60e0 bug 6188: fixing the bug 
status 6188: resolved fixed
 2010-09-15 15:19:18 -07:00
abhishek 5720ac0e44 bug 6188: incremental checkin 2010-09-15 14:45:32 -07:00
alena 7d2a927973 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-15 14:29:10 -07:00
alena 8525992d41 Preparation for 2.1 to 2.2 DB migration: create instance group object if "vm_instance.group" field is not empty for user vm 2010-09-15 14:06:55 -07:00
ahmad c02cde6775 applied fix suggested by Manuel for fixing rsa key generation on centOS 5.3 2010-09-15 13:48:44 -07:00
abhishek 652620363d bug 3120: reverting changes as still soliciting feedback on design 2010-09-15 11:52:31 -07:00
abhishek a05dc480a7 bug 3120: incremental checkin 2010-09-15 11:18:04 -07:00
abhishek ef8781b7b5 bug 3120: introducing this optional parameter in the command 2010-09-15 10:28:41 -07:00
abhishek cacb4dba1d bug 3120: incremental checkin for this bug, with the introduction of an optional ONE_TO_ONE_NAT parameter 2010-09-15 10:28:41 -07:00
nit f5ac46255c bug 4286: Schema changes to include the upload table, Introducing extractIso command and extractVolume command 2010-09-15 17:51:42 +05:30
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 efa8d2af07 bug 6188: fix for the issue 
status 6188: resolved fixed
 2010-09-14 15:33:48 -07:00
abhishek a178a9a675 import cleanup 2010-09-14 11:38:41 -07:00
abhishek dea01d0752 adding the status value whilst creating a storage pool using database config 2010-09-14 11:37:32 -07:00
abhishek 91813371b4 further comments added 2010-09-14 10:53:27 -07:00
abhishek edc85dd12d bug 6163: waiting on Alex to give me the go ahead for this bug, commenting out some of the code till then 2010-09-14 10:52:04 -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
nit 8f955c2889 Fixing the ConcurrentModificationException 2010-09-14 20:18:51 +05:30
abhishek a03cf45e5d further improvements to the sp code, especially for the local storage case 2010-09-13 12:00:54 -07:00
abhishek 1af28db9cd bug 6159: now we can add at most 2 records per public port (one for tcp, one for udp) eg: 1:2:tcp and 1:3:udp; any other combination for this port will result in an error being propagated back to the UI 
status 6159: resolved fixed
 2010-09-13 10:19:02 -07:00
abhishek 542230fc26 null check for the npe 2010-09-13 09:35:28 -07:00
abhishek f82e73b861 bug 6159: incremental checkin 2010-09-13 09:31:36 -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
abhishek ec01e0b423 bug 5147: this checkin ensures that we cover some more corner cases, in particular, to not allow an execution when we have pools in inconsistent states (maintenance, prepareformaintenance or errorinmaintenance) 2010-09-10 14:52:05 -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
abhishek 8d38e230a5 bug 5147: we ensure that if the sp under maintenance is the only one in the cluster, we just stop the vms with no migration (base case) 2010-09-09 18:34:44 -07:00
abhishek 0a4532a003 bug 5147: some more improvements 2010-09-09 18:05:43 -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
Alex Huang dc4c4549d0 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-09-09 17:49:27 -07:00
Alex Huang 994afb0e29 switched from networkprofile to network configuration 2010-09-09 17:49:19 -07:00
root 077690cf15 switched from networkprofile to network configuration 2010-09-09 17:48:24 -07:00
anthony 7f991f7e25 In hostAllocator, input clusterId instead of storagepool 2010-09-09 17:08:08 -07:00
anthony bce314b131 fixed a bug about snapshot 2010-09-09 15:11:34 -07:00
Alex Huang 5d185ad82f removed network profile creation 2010-09-09 14:45:16 -07:00
Alex Huang 599f05d0da missing files 2010-09-09 13:37:57 -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
edison 11fb89ac87 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2010-08-31 19:46:18 -07:00
edison ea2828ee03 fix adding host bugs 2010-08-31 19:46:03 -07:00
anthony c65175aa40 bug 6048: Check createvolume's return 
status 6048: resolved fixed
 2010-08-31 13:05:42 -07:00
abhishek 854611e40a bug 5897: returning the os_type_id 
status 5897: resolved fixed
 2010-08-30 16:25:58 -07:00
abhishek 1c87879e21 bug 4898: removing the upgrade.url param 
status 4898: resolved fixed
 2010-08-30 14:49:22 -07:00
abhishek 992458e9d0 bug 5843: Merging in the fix 
status 5843: resolved fixed
 2010-08-30 13:45:22 -07:00
abhishek 64210bd16d bug 6010: Fixing the list volumes issue, now we filter volumes based on the template type and not based on the names 
status 6010: resolved fixed
 2010-08-30 11:18:43 -07:00
abhishek 7a0ad69b89 Incremental checkin 2010-08-30 10:40:45 -07:00
Kelven Yang 7eb61b705a Allow NetworkManagerImpl and SecondaryStorageImpl to tolerate missing of system vm template at startup 2010-08-27 16:32:03 -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
kishan 43169f3f96 bug 5895: added config param to turn on/off md5 hash 2010-08-26 23:39:32 +05:30
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
will f8c93cd5fa Bug #:5975 
Merge from 2.1.x

- Fixed issue where listAccounts only return one less than the actual number of accounts in the system.  That is because the SQL query asks for X accounts, but the API filters out the SYSTEM account.  The fix is to add the filter of the system account in the actual query itself rather than have the code do it.

Conflicts:

	server/src/com/cloud/api/commands/ListAccountsCmd.java
 2010-08-25 18:21:32 -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
edison 3ab4651cf0 Issue #: 5978 5977 5971 5972 
Status 5978: resolved fixed
Status 5977: resolved fixed
Status 5971: resolved fixed
Status 5972: resolved fixed
 2010-08-25 15:27:34 -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 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
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 7f771cbe24 bug 5883: Final checkin for volume lineage 
status 5853: RESOLVED FIXED
 2010-08-23 16:17:18 -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
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 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
Alex Huang 417a3c8c18 bug 5764: More changes 2010-08-19 11:27:30 -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
Anthony Xu 41f7c745bd bug 5934: if it is standalone, give cluser name as Standalone-ip/name 
status 5934: resolved fixed

Conflicts:

	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
 2010-08-18 17:33:25 -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
kishan d202ce4c7a Issue #: 5775 
Release vnet and private IP allocation when domR fails to start
 2010-08-18 19:43:16 +05:30
kishan fb8e3ffec5 Merge branch 'master' of ssh://kishan@git.cloud.com/var/lib/git/cloudstack-oss 2010-08-18 14:09:13 +05:30
kishan ef41ebc9ec Check for null vnet when allocation fails 2010-08-18 13:54:53 +05:30
nitin 5331e13bac 5844 - adding more tags to updateTemplate API 2010-08-18 12:44:27 +05:30
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
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
abhishek 5326d0ec89 bug 5922: Checking if bug db updates works 
status 5922: resolved fixed
 2010-08-13 14:07:55 -07:00
abhishek 7d14dd7576 Issue :# 5922 
Status 5922: Resolved Fixed
Fix for 5922
 2010-08-13 13:55:33 -07:00
abhishek d8cc85c42f Fixing the listAlerts api call to return the correct format for the sent on field 2010-08-12 15:52:34 -07:00
edison dc005b9b9c add setup_agent.sh, the first script running during add host 
Make cloud-setup-agent/console-proxy in unattended mode
 2010-08-11 19:31:07 -07:00
Kris McQueen c49cdb21d8 Remove comment from testing Git and Eclipse 2010-08-11 13:55:05 -07:00
Kris McQueen 2a2d618da9 Add a comment for testing Git and Eclipse 2010-08-11 13:54:07 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00