etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,993 Commits 327 Branches 325 Tags 802 MiB
Commit Graph

883 Commits

Author SHA1 Message Date
anthony fea9ca582c SWIFT : add listSwift api 2011-12-21 16:55:08 -08:00
anthony 646d95a846 bug 12364: fixed export template with swift 
status 12364: resolved fixed
 2011-12-21 16:07:06 -08:00
anthony 2d2505d449 bug 12322: SWIFT, update template_zone_ref after update template to swift 
status 12322: resolved fixed
 2011-12-21 11:20:38 -08:00
Edison Su fb05f4a927 bug 12143: set volume "folder" to migration destination pool's path 
status 12143: resolved fixed
 2011-12-20 17:16:46 -08:00
Edison Su c067763075 bug 12604: if there are actually snapshots creating on the volume, then don't move the snapshot 
status 12604: resolved fixed
 2011-12-20 15:12:31 -08:00
Edison Su b4b70a9856 bug 12657: don't hold a vm lock when taking snapshot 
status 12657: resolved fixed
 2011-12-20 10:57:59 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao 
status 12337: resolved fixed
reviewed-by: Abhi
 2011-12-20 19:28:41 +05:30
anthony 93546c7cf7 SWIFT: swift id may be not 1 2011-12-19 18:33:09 -08:00
Alena Prokharchyk 42a460023e Don't allow to create snapshotPolicy for disabled account and suspended/inactive project 2011-12-19 16:30:46 -08:00
Alena Prokharchyk ceb0a918a1 createTemplate/createSnapshot for project - allow to execute for Projects in Active state only 2011-12-19 16:20:40 -08:00
anthony bb11bf9efd SWIFT : fixed create template from snapshot 2011-12-19 15:37:51 -08:00
Edison Su aac9c540af bug 12625: don't put volume into snapshotting state if we are taking snapshot on it 
status 12625: resolved fixed
 2011-12-19 15:19:19 -08:00
Alena Prokharchyk f3f752b5be bug 12624: fixed list public isos for regular user 
status 12624: resolved fixed
 2011-12-19 10:42:18 -08:00
anthony 235c5aa6eb SWIFT: api refine 2011-12-15 12:37:34 -08:00
anthony fb0f77711f SWIFT: fixed delete template/iso 2011-12-14 19:53:56 -08:00
anthony 575d453e53 SWIFT: set down_load_delay to 10000 2011-12-13 18:07:37 -08:00
anthony 1821019b7b SWIFT: fixed listtemplate/iso 2011-12-13 18:07:37 -08:00
anthony 2413eae6a5 SWIFT: fixed error handling 2011-12-13 18:07:37 -08:00
kishan bc32e0e60c bug 12245: Added config parameters custom.diskoffering.size.min, custom.diskoffering.size.max. Added check while adding volumes with custom offering. 
status 12245: resolved fixed
reviewed-by: Nitin
 2011-12-13 15:04:37 +05:30
Nitin Mehta 353bc396e3 bug 11838: Create Private Template from Snapshot - Lift the restriction of creating duplicate names keeping it consistent with register template 
Reviewed by : Kishan.
 2011-12-13 14:42:08 +05:30
Nitin Mehta b2b8ce1758 bug 10674: For recurring snapshots when there is quota hit log it and send an email alert. 
Reviewed by : Kishan.
 2011-12-13 14:34:25 +05:30
Nitin Mehta 35e2640019 bug 10674: For recurring snapshots when there is quota hit log it and send an email alert. 
Reviewed by : Kishan.
 2011-12-13 11:21:34 +05:30
Nitin Mehta 37a363b98d bug 12437: Domain admin should be able to see all the templates under him. 
Reviewed by : Alena.
 2011-12-12 14:41:24 +05:30
kishan 3d40c1032b Skip userdispersing allocator when account is not available 2011-12-08 19:50:21 +05:30
kishan ff14d09a8d bug 12435: Create accountSearch join builder only once. 
status 12435: resolved fixed
reviewed-by: Nitin
 2011-12-08 17:55:24 +05:30
Alena Prokharchyk 0e983d8d86 bug 12268: listTemplates API - don't list projects' templates in default view 
status 12268: resolved fixed
 2011-12-07 11:31:24 -08:00
Alena Prokharchyk 2c2dfdc507 bug 12237: fixed listSnapshots to work correctly with projectId 
status 12237: resolved fixed
 2011-12-06 16:43:58 -08:00
kishan 1dfc3f8e34 bug 10280: Throw exception when snapshot allocation fails 
status 10280 : resolved fixed
reviewed-by: Abhi
 2011-12-01 23:37:36 +05:30
Alena Prokharchyk 5423f744b3 Fixed multiple bugs in registerTemplate/registerIso: 
1) throw exception when try to register template/iso when there are no zones in the system
2) don't add the template to template_zone_ref when the zone is removed
3) Don't try to download the template when template failed to persist in the DB
 2011-11-28 16:50:54 -08:00
Alena Prokharchyk 34b24895eb bug 12176: fixed NPE in resource limit calculation for snapshots 
status 12176: resolved fixed
 2011-11-24 10:33:11 -08:00
prachi f56c3d7bc5 Bug 11126 - Give ability to define tags post storage addition 
Changes:
- Enabled updating storage tags
- All existing tags are wiped out and new ones provided are stored.
- Note that, if tags are updated on the storage, no changes are done to the deployment of already running VMs that were deployed prior to tag addition.
- Also added some validation to host tags update API.
 2011-11-23 14:21:34 -08:00
frank 5d6653224b directly search ssvm in host table when sending SecStorageFirewallCfgCommand 2011-11-18 13:59:17 -08:00
prachi 313e6ca284 Bug 8791 user dispersing allocator 
Changes:
- Added a two new deployment planners  'UserDispersingPlanner' and 'UserConcentratedPodPlanner' to the DeploymentPlanners
- Planner can be chosen by setting the global config variable 'vm.allocation.algorithm' to either of the following values:
('random', 'firstfit', 'userdispersing', 'userconcentratedpod')
- By default, the value is 'random'. When the value is 'random', FirstFitPlanner is invoked as before that shuffles the resource lists.
- Now Admin can choose whether the deployment heuristic should be applied starting at cluster or pod level. This can be done by using the
global config variable 'apply.allocation.algorithm.to.pods' which is false by default. Thus by default as earlier, planner starts at clusters directly.

'UserConcentratedPodPlanner' changes:
- Earlier to 3.0, FirstFitPlanner used to reorder the clusters in case this heuristic was chosen.
- Now this is done by a separate planner and is applied only when 'vm.allocation.algorithm' is set to this planner
- It reorders the capacity based clusters/pods such that those pods having more number of Running Vms for the given account are tried first.
- Note that this userconcentration is applied only to pods and clusters. Not to hosts or storagepools within a cluster.

'UserDispersingPlanner' changes:
- 'UserDispersingPlanner' reorders the capacity ordered pods and clusters based on number of 'Running' VMs for the given account in ascending order. Aim is to choose thodes pods/clusters first which have less number of Running VMs for the given account
- Admin can provide weights to capacity and user dispersion so that both parameters get considered in reordering the pods/clusters. This can be done by setting
the global config parameter 'vm.user.dispersion.weight'. Default value is 1. Thus if this planner is chosen, by default, ordering will be done only by number of Running Vms, unless the weight is changed.
- HostAlllocators and StoragePoolAllocators also reorder the hosts and pools by ascending order of number of Running VMS/ Ready Volumes respectively for the given account. Thus try to choose that host or pool within a cluster with less number of VMs for the account.
 2011-11-17 18:29:39 -08:00
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk 87f5150e38 Basic zone is fixed and works with new NaaS now 2011-11-14 10:46:05 -08:00
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account - 
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
 2011-11-10 18:34:56 -08:00
frank 66645ec478 Bug 11933 - Unable to add Primary Storage (OCFS2) to a OVM Cluster 
Don't allow character beyond [A-Z0-9] in OCFS2 cluster name
it is not allowed by OCFS2 configure script

reviewed-by: edison
 2011-11-10 17:07:06 -08:00
Edison Su 6d5c27c1e3 bug 11981: upgrade snapshot version number from 2.1 to 2.2 if it's a root volume 
status 11981: resolved fixed
Reviewed-by: Anthony
 2011-11-10 16:22:37 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Edison Su 44218ef07c bug 11919: if volume is dettached, instance id is null 
status 11919: resolved fixed
Reviewed-by: frank
 2011-11-09 10:43:32 -08:00
Alena Prokharchyk 9ae3dffee4 bug 11924: don't return ISO entries where removed != null 
status 11924: resolved fixed
reviewed by: Will Chan

Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2011-11-09 09:42:31 -08:00
Nitin e2e7da3ff4 bug 11428: Under VMware with current version, for snapshot related related operations, 
1) if snapshot is originally created from root volume, allow only CreateTemplateCommand from snapshot 2) if snapshot is originally created from data volume, allow only CreateVolumeCommand from snapshot Reviewed by - Kishan
status 11428: resolved fixed
 2011-11-09 16:33:09 +05:30
frank 92edf56ccc Bug 7883 - Add support to allow admins to sort templates, isos, offerings... 
status 7883: resolved fixed
 2011-11-03 10:54:00 -07:00
anthony b4f8c85f20 Swift: add Swift Manager 2011-11-02 18:45:55 -07:00
Edison Su 6841e265d3 bug 10330: finally merge Rommer's CLVM patch 
status 10330: resolved fixed
 2011-11-02 18:03:58 -07:00
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering. 
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
 2011-11-02 15:44:53 -07:00
frank 09fc1be631 revert wrong fix of 24bcb4ddf210fbd4ca6032bb5aa6bd02f7480a73 that built-in templates can not be found 
The root cause is we didn't return SSVM in connecting status when doing template sync
 2011-10-31 15:26:44 -07:00
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
anthony 2f1e5504fb Revert "handle empty snapshot correctly" 
This reverts commit 99f985783e960d1ef8712c8ff724862f688b461e.
 2011-10-31 14:30:09 -07:00
anthony 42a3f0041a handle empty snapshot correctly 2011-10-31 11:42:58 -07:00
anthony 9a668416f8 Swift: List ISO fix 2011-10-31 11:10:28 -07:00
Nitin 2b370ab535 bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction. 2011-10-29 16:51:37 +05:30
anthony 2b039530c0 Swift : list Template 2011-10-28 16:07:31 -07:00
frank d1084bb383 fix unable to find built-in template 2011-10-27 19:19:19 -07:00
frank 9e88c40ab0 clean out various interface from agent manager to decent managers 2011-10-27 16:06:51 -07:00
anthony 4116d0d4e4 Swift : bug fix 2011-10-27 16:04:18 -07:00
frank 21de281276 Fix broken compilation by new anget manager merge 2011-10-27 11:24:10 -07:00
frank cef30956e9 Merge branch 'newagentmgr' 
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
 2011-10-27 11:09:56 -07:00
Nitin 70aae9666b bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows. 2011-10-27 11:23:26 +05:30
Nitin 30793ff08b bug 10893: Adding config vlaue conventions. 2011-10-27 11:22:36 +05:30
Nitin 6423631522 bug 10893: Adding a new capacity type - Local Primary storage. 2011-10-27 11:22:18 +05:30
Nitin 1177d5e779 bug 10848: ListCapacity - Adding the real time usage stuff as well. 2011-10-27 11:19:21 +05:30
Edison Su 3f7ce01f28 bug 10803: using updatehost api to change secondary storage url, the url need to be nfs://host/path format 
status 10803: resolved fixed
 2011-10-26 16:27:28 -07:00
Edison Su 121850bcb5 bug 11598: secstorage.vm.mtu.size, by default it's 1500. After change this configuration, need to restart mgt server, and restart secondary storage to take effect. 
status 11598: resolved fixed
 2011-10-26 14:48:56 -07:00
anthony b91dce4f8a Swift: add listtemplate for swift 
add swift configuration
 2011-10-25 20:21:27 -07:00
Edison Su 193474a595 Storage migration: if it's basic network and migrate to different pod, need to reallocate network 2011-10-25 19:20:18 -07:00
frank 1460f3950e Bug 9949 - revert VM to template 
1. able to restore VM from its original template
2. Only allow to restore when VM is running or stopped
3. after restoring, VM state will not change, e.g. running is still running

status 9949: resolved fixed
 2011-10-25 13:52:39 -07:00
anthony 510d1dbef7 Swift : upload template to Swift and sync between Swift and secondary storage 2011-10-24 18:48:16 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
anthony 0df249172d Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM 2011-10-21 19:53:48 -07:00
alena 871f1bb6d4 bug 11690: don't allow to remove the cluster when it's referenced by existing storage pools 
status 11690: resolved fixed
 2011-10-21 18:08:18 -07:00
anthony 19df7ed8af Swift; create template from snapshot 2011-10-21 17:32:48 -07:00
anthony 6c5c24dd6b swift: create volume from template works 2011-10-21 12:53:58 -07:00
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
alena ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
anthony c97010a160 BackupSnapshot to Swift 2011-10-18 18:11:09 -07:00
Kelven Yang 693432cb7a bug 11716: save VMware local datastore info to local storage to support multiple local datastores per host situation 2011-10-14 17:13:58 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
frank 5ee1a2456d Bug 11647 - OVM - no support for migrate instance 
return error if taking snapshot API call happens on Ovm
 2011-10-13 16:20:49 -07:00
frank 0f5384d086 Bug 11522 - New agent manager 
move findxxx interface from HostDao to Managers
 2011-10-06 11:56:17 -07:00
frank 24b82a7a89 Bug 11522 - New agent manager 
call SearchCriteriaService interface instead of SearchCriteria2 instance
 2011-10-06 10:32:07 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
frank 89e04458b6 Bug 11522 - New agent manager 
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
 2011-10-04 14:35:26 -07:00
Edison Su ae83246acb bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager 
status 11600: resolved fixed
 2011-10-03 16:43:47 -07:00
frank 683113cc38 Bug 11522 - New agent manager 
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
 2011-10-03 11:21:34 -07:00
frank a1193149a0 Bug 11522 - New agent manager 
renamce updateResourceState to resourceStateTransitTo
 2011-09-29 11:58:41 -07:00
frank b188a513ba Bug 11522 - New agent manager 
Secondary storage worked
 2011-09-27 16:43:26 -07:00
frank e5fca855c1 Bug 11522 - New agent manager 
register/unregister resource state adapter in configure/stop of implementations
 2011-09-27 11:51:03 -07:00
frank caa8aaf6fe Bug 11522 - New agent manager 
clean up events, status of agent
 2011-09-26 15:01:16 -07:00
frank e0e5491c42 Bug 11522 - New agent manager 
implements ResourceStateAdapter in a couple of components
 2011-09-23 11:28:02 -07:00
Kelven Yang 2a6de104e2 bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance. 2011-09-22 16:22:12 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account 
2) Added "Project" limit type for the Domain object
 2011-09-21 17:09:49 -07:00
Edison Su b1b11a6928 bug 11047: change the put storage pool into maintenance mode: 1. only look at the available storoge pool in its own dc to decide to start vms created on it. 2. if start vm failed, don't throw exception, as these vms are marked stopped already, admin can start these vm by himself. 
status 11047: resolved fixed
Reviewed-by: frank
 2011-09-21 16:20:33 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature: 
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
 2011-09-20 18:35:28 -07:00
anthony 6ecc981e25 bug 9777: introduce Error status for snapshot, if snapshot creation fails, it will be in Error status 
status 9777: resolved fixed
 2011-09-14 18:14:02 -07:00
anthony 313b624373 bug 9777: only allow to delete snapshot in BackedUp status 
status 9777: resolved fixed
 2011-09-14 14:16:19 -07:00
anthony d6cbd2b6bc bug 11275: 
remove heartbeat entry for this Primary Storage, when put this Primary Storage into maintenance mode
create heartbeat entry for this Primary Storage, when cancal maintenance for this Primary Storage

status 11275: resolved fixed
 2011-09-13 22:15:21 -07:00
frank 71385f7cc0 check hypervisorType and StoragePoolType in OCFS2 manager when delete host 
don't take lock in processResourceEvent()
 2011-09-13 17:35:58 -07:00
alena f6a79c603f bug 11036: resource count update is refactored 
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
 2011-09-13 10:47:36 -07:00
Chiradeep Vittal cfbbe4c031 fix perf. issue in deploy vm. also remove dead code in dao 2011-09-12 18:20:23 -07:00
kishan b30827a0ec bug 9778: Log snapshot create event only if the snapshot is in not removed state after backingUp to secondary. Log snapshot delete event for backed up snapshots only 
status 9778: resolved fixed
 2011-09-12 20:22:30 +05:30
kishan 5928a9b370 bug 9778: Log snapshot create event only if the snapshot is in not removed state after backingUp to secondary. Log snapshot delete event for backed up snapshots only 
status 9778: resolved fixed
 2011-09-12 20:01:19 +05:30
prachi 4ad9ac5e71 Bug 11200 - maximum number of guests per host 
Changes:

To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:

- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there.
 2011-09-08 18:08:31 -07:00
anthony 4423da06a2 1. added timeout in Command Class, then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute 
2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null),
 2011-09-07 19:17:54 -07:00
Kelven Yang f70958809b bug 11360: make user_vm_details generic to all VMs instead of user-only VMs, VM details info will be carried down to hypervisor resource 2011-09-07 15:42:40 -07:00
alena 8b5f2c758e Do account permission checks for snapshots the way it's done for all other ControlledEntities 2011-08-31 18:15:08 -07:00
frank 0c0fe8c1b3 Bug 8966 - Oracle VM (OVM) support 
configure hostname of host for OCFS2
small fixes
 2011-08-31 17:25:04 -07:00
alena 482528ce8c Fixed the bug in extractTemplate - do ignoreCase comparison when verify the download mode. 2011-08-26 10:11:30 -07:00
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions. 
status 11236: resolved fixed
 2011-08-24 14:48:35 -07:00
Edison Su 9a6fc7de45 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot 
status 11217: resolved fixed
 2011-08-24 11:05:45 -07:00
Edison Su 9a65935809 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot 
status 11217: resolved fixed
 2011-08-24 10:48:10 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
anthony 7084c270d3 reversed funtion parameter 2011-08-19 18:48:49 -07:00
anthony 2e2e550cc4 reversed funtion parameter 2011-08-19 18:41:59 -07:00
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -07:00
frank 016700737c Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- reconfigure OCFS2 nodes when delete host
 2011-08-19 17:06:48 -07:00
frank 7350d12fff Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use cluster name as OCFS2 cluster name
 2011-08-19 17:06:35 -07:00
frank 18f87c2108 Merge branch 'cvm' into 2.2.y 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	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/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-19 16:08:35 -07:00
Edison Su eada883b5e bug 11183: put volume state into "Creating" state if it's created from snapshot. 
status 11183: resolved fixed
 2011-08-19 13:46:51 -07:00
Edison Su 8bbed3caea bug 11183: put volume state into "Creating" state if it's created from snapshot. 
status 11183: resolved fixed
 2011-08-19 13:45:35 -07:00
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
Edison Su df6bee4061 add template for simulator 2011-08-18 11:37:50 -07:00
Edison Su 1bc7631bf2 finally, test framework works now 2011-08-18 10:51:31 -07:00
Edison Su 449a12870b finally, test framework works now 2011-08-16 10:30:52 -07:00
Edison Su 48342ff6e2 remove unnecessary transcation 2011-08-16 10:30:52 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
Murali Reddy 0969ba8063 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:45:02 +05:30
Murali Reddy cc60989a68 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:43:18 +05:30
Nitin 5ef0c96e70 bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 14:30:34 +05:30
Nitin f1d13729af bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 12:21:02 +05:30
Nitin 93204ae862 bug 4957: copyTemplate: should compare template_host_ref.size to configuration.max.template.iso.size values before sending command to the backend . 
status 4957: resolved fixed
 2011-08-10 18:18:35 +05:30
alena 6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature 
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2011-08-09 15:51:56 -07:00
frank 433fe1c9da Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- reconfigure OCFS2 nodes when delete host
 2011-08-09 14:06:51 -07:00
Kelven Yang eb28549e6c Seperate template cleanup control to enable template preloading 2011-08-09 13:42:50 -07:00
Kelven Yang fe9ccf33b5 Seperate template cleanup control to enable template preloading 2011-08-09 13:38:27 -07:00
alena 06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature 
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
 2011-08-08 20:59:40 -07:00
anthony 455f9f642c bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:31:14 -07:00
anthony 1a070f4c1b bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:28:34 -07:00
frank 7e1fc2ca1a Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use cluster name as OCFS2 cluster name
 2011-08-08 18:22:43 -07:00
frank e8c2fa4e8e Remove baremetal specific parameters from AddHostCmd 2011-08-08 15:01:26 -07:00
frank 6aaf3d5ae0 Merge branch 'cvm' 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	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/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-08 14:14:09 -07:00
frank c89425325b Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- add files
 2011-08-08 13:32:27 -07:00
frank c881bae64e Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use ComponentLocater to load OCFS2 manager
 2011-08-08 13:30:15 -07:00
frank c6fba0fd42 Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- prepare OCFS2 nodes
 2011-08-05 17:46:29 -07:00
anthony 5fbd0a7a5f bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume 
status 9255: resolved fixed
 2011-08-04 15:32:45 -07:00
anthony 3272241440 bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume 
status 9255: resolved fixed
 2011-08-04 15:28:38 -07:00
Nitin a3cb6d9a09 bug 9345: Remove pool_id from template_host_ref. Its not needed anymore. Also removed the unwarranted code. 
status 9345: resolved fixed
 2011-08-04 12:51:35 +05:30
alena 9ad41d9fc8 bug 10916: don't return removed entries when do listDiskOfferings by regular user 
status 10916: resolved fixed
 2011-08-02 09:46:35 -07:00