Commit Graph

236 Commits

Author SHA1 Message Date
Frank 5645137f9c reslove conflicts api/src/com/cloud/api/ApiConstants.java 2011-04-11 14:26:48 -07:00
Frank 105db3b15a Merge branch 'baremetal' to master
modifies:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/AddHostCmd.java
	api/src/com/cloud/api/commands/CreatePodCmd.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/dc/Pod.java
	api/src/com/cloud/network/NetworkService.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/dc/HostPodVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	setup/db/create-schema.sql
	utils/src/com/cloud/utils/SerialVersionUID.java
2011-04-11 14:21:41 -07:00
prachi c3d2bab81b Some more changes for Bug 8932 - add md5 sum to list templates call:
Also changed 'RegisterTemplate' to take in a new optional parameter 'checksum'.
The value set to it is stored as-is in the DB in vm_template table, 'checksum' column.
2011-04-11 13:17:23 -07:00
nit debe236a8d bug 8710: CONTD....Introducing a new user role in cloudstack called RESOURCE_DOMAIN_ADMIN. The role would have all the domain_admin rights and the rights to list zone,pods,clusters and so on. More info in the bug 2011-04-11 19:40:37 +05:30
Edison Su ee3d6f5cea bug 9205: resolved fixed
status 9205: fix NPE in usageEvent
2011-03-29 15:00:35 -04:00
Frank 6be5a9a3a9 Bug 8208 - bare metal provisioning
Don't ask secondary storage VM to download baremetal template.
Immediately make baremetal template ready after registerTemplateCmd
as well as listTemplateCmd
Use zone id instead of secondary storage VM id to identify baremetal
template in template_host_ref table
2011-03-24 12:15:08 -07:00
prachi 923f562aa8 Bug 6873: disable/enable mode for clusters (and pods and zones and hosts)
- Added a new flag 'allocation_state' to zone,pod,cluster and host
- The possible values for this flag are 'Enabled' or 'Disabled'
- When a new zone,pod,cluster or host is added, allocation_state is 'Disabled' by default.
- For existing zone,pod,cluster or host, the state is 'Enabled'.
- All Add/Update/List  commands for each of zone,pod,cluster or host can now take a new parameter 'allocationstate'
- If 'allocation_state' is 'Disabled', Allocators skip that zone or pod or cluster or pod.
- For a root admin, ListZones lists all zones including the 'Disabled' zones. But for any other user, the 'Disabled' zones are not included in the response.
- For any usecase that creates/deploys/adds/registers a resource and takes in zone as parameter, now we check if the Zone is 'Disabled'. If yes then the operation cannot be performed by a user other than root-admin. Add volume, snapshot, templates are examples of this usecase.
- To enable the root admin to test a particular pod/cluster/host, deployVM command takes in 'host_id' parameter that can be passed in only by root admin.
If this parameter is passed in by the admin, allocators do not search for hosts and use that host only. StoragePools are searched in the cluster of that host.
If VM cannot be deployed to that host, allocators and deployVM fails without retrying
2011-03-23 22:15:35 -07:00
anthony 28cfa24bd2 only 2.1 snapshot depends on template, if there is no 2.1 snapshot, template can be removed 2011-03-18 15:20:48 -07:00
Kelven Yang 65d4cc98be Allow template re-deployment once template is deleted from hypervisor and CloudStack still holds out-dated status 2011-03-17 17:59:51 -07:00
Frank 6c819c1491 Merge branch 'bareMetal'
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	api/src/com/cloud/offering/ServiceOffering.java
	api/src/com/cloud/vm/UserVmService.java
	client/tomcatconf/components.xml.in
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/service/ServiceOfferingVO.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-03-08 14:18:11 -08:00
Alex Huang 263244c938 more logging 2011-03-04 11:37:35 -08:00
kishan a560f59a2b bug 8298: Avoid logging usage events for templates owned by system user
status 8298: resolved fixed
2011-03-04 14:36:57 +05:30
alena 715a929e91 Separate createVm methods for 1) vm in Basic zone 2) Vm with SecurityGroup in Advanced zone 3) Vm without SecurityGroup in AdvancedZone 2011-03-03 16:13:00 -08:00
Frank a9728998ff Bug 8208 - bare metal provisioning
Successfully add start entry into LinMin PXE server
2011-02-25 18:58:07 -08:00
Frank f82dec999d Bug 8208 - bare metal provisioning
complete createVirtualMachine method
2011-02-24 14:07:10 -08:00
kishan 8eb665246e bug 7935: Included hypervisor type to vm usage records
status 7935: resolved fixed
2011-02-24 20:08:12 +05:30
alena 15f59e6f58 bug 8637: throw ResourceAllocationException when resource limit is exceeded.
status 8637: resolved fixed
2011-02-18 12:26:58 -08:00
Kelven Yang 8695e7250c Update template and storage manager to allow hypervisor based command delegation 2011-02-18 11:37:50 -08:00
nit e901ccfe07 bug 8498: Make osTypeId optional. Introdue a new OS type None to be shown for non bootable ISOs. Add check that when the ISO is bootable a valid osTypeId gets passed 2011-02-11 18:44:26 +05:30
nit 67a92e3f1d bug 8493: Check for resource limit for copy templates/ISO between zones. 2011-02-09 15:49:33 +05:30
Edison Su 4fe6219754 bug 8474: fix attaching ISO to xenserver vm
status 8474: resolved fixed
2011-02-08 10:04:56 -05:00
anthony 88ff55849d for detachISO command, iso for this VM is removed in DB even if the detachISO fails. Then after stop/start VM , the iso for this VM is gone 2011-02-07 17:50:02 -08:00
anthony ed197ae971 bug 8458: check if attachISO is successful before update DB
status 8458: resolved fixed
2011-02-07 17:34:13 -08:00
nit 5469916060 bug 7522 : Extract ISO/Template - By default these entities wouldnt be extractable, GLOBAL ADMINS - always allowed to extract, OTHERS - allowed to extract if - 1) Its own template and extractable=true 2) Its not its own template but public=true and extractable=true.
status 7522: resolved fixed
2011-02-04 17:51:42 +05:30
Edison Su 5b073cd370 bug 8087: default hypervisor type is gone: when creating cpvm/ssvm, randomly choose one hypervisor type, which got from host table. When creating domR, as we already know the hypervisor type at that time, so domR and user vm are always created as the same hypervisor type.
status 8087: resolved fixed
2011-02-01 11:32:40 -05:00
abhishek 5be450ff47 bug 7376: removing the limit on iso/template names
status 7376: resolved fixed
2011-01-25 17:37:05 -08:00
kishan 94ec7bf27a bug 7842: events refactoring. Still wrok in progress 2011-01-20 21:49:50 +05:30
nit 3d9d73e627 bug 7519 : Correcting the NPE getting thrown due to a recent rewrite of events. Also improving the logging when ssvm is not up.
status 7519 : resolved fixed
2011-01-14 19:35:34 +05:30
nit d5297519a5 bug 7519 : Some additional code. 2011-01-12 19:35:28 +05:30
Alex Huang 4eba6d10d7 Moved State into VirtualMachine like other States of objects 2011-01-04 15:01:34 -08:00
Alex Huang 544fa7ff1b remote access vpn, user ip address changes 2010-12-29 09:32:54 -08:00
anthony 0aa24c9ebf bug 7686: when detach iso, always remove is from uservm table to make sure ISO is remove after stop/start
status 7686: resolved fixed
2010-12-28 12:06:24 -08:00
kishan bb0e6a0ae3 bug 7504: Events refactoring 2010-12-24 12:58:32 +05:30
edison fe6824a66b fix upload ova template 2010-12-22 10:16:12 -08:00
kishan b12cd70216 bug 7504: Added usage events and made corresponding changes in usage server 2010-12-22 18:03:24 +05:30
kishan a7626fc991 bug 7504: Added usage events 2010-12-22 12:28:05 +05:30
Alex Huang 356526db83 Changed exception code to give the scope of the problem 2010-12-21 03:54:30 -08:00
root 471a0e73fe fixing a bug wherein the template/iso gets deleted from the host once upload, on a ms restart. it still exists in db. any further attempt to create vm from this template/iso results in failure. 2010-12-09 18:56:30 -08:00
nit 9a3a5b4fa7 bug 7314 : Extract Api - Async Framework takes care of updating the final status no need to update it inside the code.
status 7314: resolved fixed
2010-12-02 17:35:47 +05:30
nit 06c61f2fac bug 7325 : We shouldn't allow attaching xen-pv-iso to any hypervisor other than xenserver.
status 7325: resolved fixed
2010-11-30 22:20:33 +05:30
anthony d3325de5ae 1. limit xs-tools in xenserver related java file
2. don't populate xs-tools to template_host_ref
3. introduce a new template type PERHOST, which doesn't need to be populated to secondary storage
2010-11-29 18:21:08 -08:00
anthony 30fa6530f9 bug 6088: track template physical size in template_host_ref table
add migration from 21 to 22
after migration , SSVM needs to stop/start

status 6088: resolved fixed
2010-11-24 20:05:52 -08:00
nit d0530265d7 bug 7046 : Global admins should be allowed to extract all the times.
status 7046: resolved fixed
2010-11-24 19:33:15 +05:30
nit 8ea124ae79 bug 7046 : extracting templates should allow for exclusion of some templates. An attribute "extractable" would be set on templates by the template owner at upload time. It would specify if we allow the template to be extracted from the system. Default would be true ie "allow extraction". If set to false, it would not be possible to extract the template or any derivatives of the template. For example, volumes, snapshots or templates from that template.
status 7046: resolved fixed
2010-11-24 18:37:54 +05:30
will 7205a7507d bug 7277: Fixed the logic to prevent System templates from being downloaded. 2010-11-22 17:13:30 -08:00
Alex Huang 1e44925564 api refactoring 2010-11-21 12:00:21 -08:00
alena e1b74ea99e RegisterTemplateCommand - ignore case in "hypervisor" parameter value - used to complain when "xen" was specified instead of "Xen" 2010-11-19 16:27:05 -08:00
alena c5d78a726e Modified exception handing in API. Following exceptions are supported now (location - BaseCmd.java):
* MALFORMED_PARAMETER_ERROR - when type of the request parameter is invalid (String instead of Long for id for example)
* PARAM_ERROR - when invalid parameter value is specified in api request. For example, id of non existing vm for StartVmCmd
* ACCOUNT_RESOURCE_LIMIT_ERROR - when user tries to exceed his resource limits by executing the api command.
* INSUFFICIENT_CAPACITY_ERROR - when resource fails to create/start due to insufficient capacity.
* RESOURCE_UNAVAILABLE_ERROR - when user tries to create a vm when storage is not available.
* RESOURCE_IN_USE_ERROR - when user tries to delete/modify resource while it's in use. For example, when we try to delete a network group when it contains ingress rules.
* NETWORK_RULE_CONFLICT_ERROR - when LB/PF rule to add conflicts with existing rule
* ACCOUNT_ERROR - when user is not authorized to execute operation on the resource.
* INTERNAL_ERROR
2010-11-16 11:56:34 -08:00
nit 0597c0cf4b bug 4177: RegisterIsoCmd and RegisterTemplateCmd API - Added account and domainId params so that one could register them on behalf of other accounts.
status 4177: resolved fixed
2010-11-10 17:47:59 +05:30
nit 70358ac153 bug 6367: registerISO, registerTemplate and createTemplate - can create non-ascii character names.
status 6367: resolved fixed
2010-11-08 20:55:02 +05:30
edison 433c28fb16 bug 7041: fix npe in delete template from storage pool, if the template already marked as removed
status 7041: resolved fixed
2010-11-05 16:02:18 -07:00
will 111b0a1df1 bug 6943: Correct error message is returned for the parameter, "name" in the API as well as fixing JS to validate this as well. 2010-11-05 13:51:46 -07:00
nit 7dc7a4838a bug 4286: Fixing the extract functionality for Upload after new API framework. Also added a check to avoid system created templates and ISO's from getting extracted as per Mike.
status 4286: resolved fixed
2010-11-04 19:09:38 +05:30
Alex Huang 5fe5450abc even more refactoring 2010-11-02 15:25:07 -07:00
Alex Huang 560d7a275e Removed InternalErrorException. Renamed the lock methods on the DAO objects to be more understandable. 2010-11-02 12:25:08 -07:00
nit 497c60d63d Extending extract functionlity for volumes to allow download. The
extraction can have two modes FTP_UPLOAD and HTTP_DOWNLOAD. In the former one
the user would provide the ftp url where the entity needs to be uploaded and in
the later the user would be provided a HTTP URL where from he/she can download
the entity. This url would be exposed for a specific time limit and would not
function after the time limit
2010-10-26 18:49:43 +05:30
nit 554e360d21 Fixing a typo in the HostResponse of the word custer.
Fixing the names of the ISO and templates.
2010-10-25 14:54:49 +05:30
Alex Huang d5d8f27cad Added more changes to the api 2010-10-21 15:11:49 -07:00
nit 6723549fc7 bug 6399: extending extract functionlity for templates and ISO's to allow download. The extraction can have two modes FTP_UPLOAD and HTTP_DOWNLOAD. In the former one the user would provide the ftp url where the entity needs to be uploaded and in the later the user would be provided a HTTP URL where from he/she can download the entity. This url would be exposed for a specific time limit and would not function after the time limit. 2010-10-20 11:40:03 +05:30
Kris McQueen 8e086d7a21 resolving merge conflicts between 2.1.refactor and master 2010-10-12 16:28:16 -07:00
Kris McQueen 2740ba6c40 final merge of master->2.1.refactor preparing for merge back into master 2010-10-12 14:46:24 -07:00
Kris McQueen ea84f3bde2 registerTemplate and registerIso expect the template to be returned, not the template id...fixed 2010-10-07 15:10:02 -07:00
Alex Huang 00f8de2687 console proxy vm is now started 2010-10-04 17:59:06 -07:00
edison ad1ef80459 Now we have multiple routing template and buitin templates now, refactor template download code, that can handle it.
Basically, change the meaning of type field in template table: SYSTEM means sytem vm template, BUILIIN means buildin templates.
2010-09-29 18:41:55 -07:00
edison 9e0f57bc0e change code for new UI 2010-09-29 18:40:52 -07:00
Kris McQueen 848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework. 2010-09-28 15:47:14 -07:00
nit b857a9b4c8 bug 4177: registerTemplate/registerIso commands would start accepting account/domainId params.
status 4177: resolved fixed
2010-09-27 17:24:23 +05:30
alena 0f2f356874 bug 6277: listVirtualMachines with group=-1 would return all vms that don't belong to any group. As a part of the fix, changed Dao layer to be able to make different types of Joins - Inner, Right, Left, etc.
status 6277: resolved fixed
2010-09-23 10:43:17 -07:00
Kris McQueen c32d6e7524 Template id is not a required parameter when listing templates. The proper serialized name for the async job id is jobid, not id. Sadly, ctxAccoutId != ctxAccountId, ugh, no wonder the UserContext wasn't getting set up correctly. Clean up some miscellaneous unnecessary casts. 2010-09-21 17:00:50 -07:00
nit 636dc041c7 bug 4286: Making extractIsoCmd and extractTemplateCmd async 2010-09-17 17:04:07 +05:30
alena 091b28a6b3 Modified addSecondaryStorage/addHost/updateHost/associateIpAddress/attachIso/copyIso/copyTemplate/deletePortForwardingService/startRouter/stopRouter/rebootRouter commands to new API framework. 2010-09-16 18:54:15 -07:00
root 76e5cf3321 renamed dao methods to correctly reflect what they do 2010-09-09 18:01:50 -07:00
Alex Huang 7249f168d5 more file changes 2010-09-09 13:27:20 -07:00
alena b0aa28032c Refactored DeleteIPForwardingRule/UpdateIPForwardingRule commands to new api framework. 2010-09-08 19:03:42 -07:00
alena 41000e61d3 Refactored copyIso/copyTemplate/attachIso/startRouter/stopRouter/rebootRouter commands 2010-09-07 18:53:04 -07:00
alena f2a680ae66 1) Refactored DeleteIsoCmd api.
2) Removed DeleteTemplateExecutor and DeleteTemplateParam files because deleteTemplate/deleteIso are not async commands
3) Cleaned up unused imports.
2010-09-02 18:52:43 -07:00
abhishek 8b8e0929f1 Refactored the delete template command 2010-08-26 16:15:42 -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
abhishek cf68dfb430 Refactored detach iso command 2010-08-25 15:33:06 -07:00
abhishek 728b4641f6 Further refactoring of the templates and iso code. 2010-08-19 18:07:07 -07:00
abhishek d5b041a790 Refactoring register commands for template and iso 2010-08-19 17:59:56 -07:00
abhishek d468a0bd7f Incremental checkin 2010-08-19 16:40:41 -07:00
abhishek 21f7c0dec8 Refactored RegisterTemplateCmd 2010-08-19 16:33:26 -07:00
abhishek fcdeb5a97d Incremental checkin 2010-08-19 14:40:08 -07:00
alena 3d85fdf687 API refactor 2010-08-18 11:24:29 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00