b607e4aa1c
Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y
2011-08-19 17:29:57 -07:00
eb72d340e2
fix typo
2011-08-19 16:15:17 -07:00
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
de25a63ba8
release the check
2011-08-19 16:06:13 -07:00
5696543359
disable attach volume to a vm if volume state is not in allocated or ready state
2011-08-19 14:27:13 -07:00
356728ae19
Fixed spelling mistake
2011-08-16 09:52:00 -07:00
278f2a401f
bug 10561: intermediate checkin for enable/disableStaticNat.
...
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
2011-08-11 10:19:22 -07:00
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
19567df49b
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:27:45 -07:00
41759c153d
bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed.
...
status 10964: resolved fixed
2011-08-04 16:08:50 -07:00
40f42a784f
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:33:02 -07:00
22483a9c13
add RHEL 6.1 support
2011-07-29 19:14:15 -07:00
5322accbc8
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:23:11 +05:30
6b4c61a348
bug 10382: Move volume delete events to destroyVolume method
...
status 10382: resolved fixed
2011-07-20 11:22:31 +05:30
ddd416a492
bug 10382: wrapped usage events in txn
2011-07-20 11:19:39 +05:30
427b73a2b9
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-20 11:13:56 +05:30
8c9fe2ec71
bug 9871: deployVm - check network's zone when do vm deployment
...
status 9871: resolved fixed
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-19 11:10:53 -07:00
c663217b00
bug 9642: listVms by regular user using domainId parameter will work only when domainId specified is the domainId the caller belongs to.
...
status 9642: resolved fixed
2011-07-19 11:10:52 -07:00
5300dd52a9
bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm
...
status 4706: resolved fixed
Merge from master to 2.2.8 branch
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-15 14:23:28 -07:00
0d2787e2db
bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well.
...
status 4706: resolved fixed
Merge from master to 2.2.8 branch
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-15 14:20:52 -07:00
25206e6257
bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
...
status 10681: resolved fixed
2011-07-13 17:16:07 -07:00
cc9a629cea
bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start.
...
status 10686: resolved fixed
Also updated 227 to 228 db upgrade to insert missing usage_event records
2011-07-11 16:11:05 -07:00
25d2c893e6
bug 10620: allow ISO attachment failure to propogate up
2011-07-07 17:00:51 -07:00
79f5ece7dc
fix NPE in put primary storage into maintainance mode
2011-07-06 16:05:22 -07:00
ba95181dc4
Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller
2011-07-05 13:35:29 -07:00
62aab14e05
bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH.
...
Status 8915: resolved fixed
2011-07-04 12:01:04 +05:30
9a6c567269
bug 10503: Skip usage events when StopAnswer details is Vm does not exist
...
status 10503: resolved fixed
2011-07-01 18:27:27 +05:30
253ae79876
bug 10512: lock on snapshot entry instead of volume entry
...
status 10512: resolved fixed
2011-06-29 18:53:41 -07:00
b058a0226d
use correct secondary storage when creating template from snapshot
2011-06-28 16:58:15 -07:00
d46d1da86c
bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
...
status 10455: resolved fixed
2011-06-28 19:55:09 +05:30
35d4c304a9
bug 10455: CreatePrivateTemplate - If the volume's template id is null and it is ROOT (meaning that the vm was created out of a blank template) then take the source template id from the user vm table.
...
Status 10455: resolved fixed
2011-06-28 19:54:54 +05:30
e716245218
bug 10447: don't allow to use system networks for vm deployment in Advance zone
...
status 10447: resolved fixed
2011-06-27 12:32:32 -07:00
52fab0e35e
bug 10456: get accountId info from the volume record when create template from volume
...
status 10456: resolved fixed
2011-06-27 10:20:40 -07:00
97b562fc2a
logging changes
2011-06-27 10:18:40 -07:00
9d76f6d719
Always add default security group when deploy vm in basic zone
2011-06-23 19:59:14 -07:00
1bfe6d8d72
Bug 10377 - API listAccounts return vmtotal=-14
2011-06-23 17:28:09 +05:30
34a36b7009
Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource
...
status 10012: resolved fixed
2011-06-22 13:00:59 +05:30
8d87cf3506
bug 6770: Alert will be sent when deploying User VM fails
...
status 6770: resolved fixed
2011-06-15 12:40:23 +05:30
c400253b54
Ignore hvm field in template
2011-06-14 14:41:34 -07:00
1d7e70acd1
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:35:20 -07:00
5f5509ac00
use isHvm of template to decide to boot a HVM vm
2011-06-10 14:35:46 -07:00
d9e0bcfa1e
bug 10126: Renamed getPodId() to getPodIdToDeployIn()
2011-06-03 22:17:08 -07:00
dbb1ed3645
bug 9729 : Remove redundant permission check from deployvm cmd.
...
status 9729: resolved fixed
2011-06-03 18:07:54 +05:30
4a3c4815b9
Fix another vm.getPodId issue
2011-06-02 14:34:34 -07:00
2ceadec326
bug 9651: tags parameter added to createnetwork
2011-06-01 17:36:14 -07:00
d02e4fb37f
bug 10100 : if there are more than one hypervisor type in one zone, create_template_from_snapshot may be sent to host with diferent hypervisor type
...
status 10100 : resolved fixed
2011-06-01 15:30:22 -07:00
2f8235dbd2
fix local seconeary storage related issues(sync/download templates, etc) for mycloud
2011-05-21 12:05:02 -04:00
30e8ed3ab6
Don't allow to specify security groups when deployVm in Vmware setup.
...
Also fixed a couple of other problems:
* verify security group ids before vm creation
* don't create "default" security group (if missing) as a part of deployVm process when vm is deployed from vmWare template
2011-05-20 18:52:58 -07:00
6bd8cece48
bug 8830: added source template id to template usage records
...
status 8830: resolved fixed
2011-05-19 16:53:33 +05:30
c2afcdec52
bug 9873: always add default security group to the SG list when deploy vm in 1) Basic zone 2) Advance zone using SG enabled network
...
status 9873: resolved fixed
Following fixes were made as a part of the checkin:
* When deploy user vm and SG doesn't exist in the DB, create it automatically.
* SecurityGroup enabled use vm start: if map to default group is not present in security_group_vm_map table, create one.
* Added "name" (securityGroupName) parameter back to deleteSecurityGroup/authorizeSecurityGroupIngress/deployVm. Mutually exclusive with security group id parameter.
Conflicts:
api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java
api/src/com/cloud/api/commands/DeployVMCmd.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-05-17 15:08:13 -07:00
frank
Edison Su
alena
anthony
Kelven Yang
Murali Reddy
kishan
Nitin
root
Alex Huang