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
frank
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
Edison Su
7a7662b01b
fix typo
2011-08-19 16:15:52 -07:00
Edison Su
eb72d340e2
fix typo
2011-08-19 16:15:17 -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
56244c7c47
release the check
2011-08-19 16:07:55 -07:00
Edison Su
de25a63ba8
release the check
2011-08-19 16:06:13 -07:00
Edison Su
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
Edison Su
1c49481305
disable attach volume to a vm if volume state is not in allocated or ready state
2011-08-19 14:26:47 -07:00
alena
2c1df02ba1
Removed unused imports
2011-08-18 15:02:04 -07:00
alena
356728ae19
Fixed spelling mistake
2011-08-16 09:52:00 -07:00
alena
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
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
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
Kelven Yang
d10c8e2a1d
bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into
2011-08-04 18:30:50 -07:00
Kelven Yang
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
anthony
7958ab566e
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:09:22 -07:00
anthony
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
Kelven Yang
04528c821b
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:40:29 -07:00
Kelven Yang
40f42a784f
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:33:02 -07:00
Edison Su
8bcad6960c
add rhel6.1 support
2011-07-29 20:05:01 -07:00
Edison Su
22483a9c13
add RHEL 6.1 support
2011-07-29 19:14:15 -07:00
Murali Reddy
5322accbc8
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:23:11 +05:30
Murali Reddy
9e90999aab
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:15:31 +05:30
alena
d6112b1632
Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"
...
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.
Conflicts:
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/network/NetworkManagerImpl.java
2011-07-21 16:04:55 -07:00
alena
36edf298e7
bug 10373: Intermediate checkin for Domain level guest Virtual networks
2011-07-20 13:44:26 -07:00
kishan
6b4c61a348
bug 10382: Move volume delete events to destroyVolume method
...
status 10382: resolved fixed
2011-07-20 11:22:31 +05:30
kishan
ddd416a492
bug 10382: wrapped usage events in txn
2011-07-20 11:19:39 +05:30
kishan
427b73a2b9
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-20 11:13:56 +05:30
alena
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
alena
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
alena
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
alena
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
alena
1979d1d065
bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
...
status 10681: resolved fixed
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2011-07-13 18:25:13 -07:00
alena
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
alena
506ca6cff3
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
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-07-11 16:13:22 -07:00
alena
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
Kelven Yang
d0de1a5b94
bug 10620: allow ISO attachment failure to propogate up
2011-07-07 17:02:51 -07:00
Kelven Yang
25d2c893e6
bug 10620: allow ISO attachment failure to propogate up
2011-07-07 17:00:51 -07:00
Edison Su
79f5ece7dc
fix NPE in put primary storage into maintainance mode
2011-07-06 16:05:22 -07:00
kishan
561f415d5a
bug 10382: Move volume delete events to destroyVolume method
...
status 10382: resolved fixed
2011-07-06 18:08:48 +05:30
alena
deca4337c5
Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller
2011-07-05 13:37:39 -07:00
alena
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
Abhinandan Prateek
5f12ea73a8
bug 8962: Completed moving VM from one account to another.
2011-07-04 13:15:40 +05:30
Nitin
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
Kelven Yang
7512689dc8
bug 10546: move sending agent command out of transaction
2011-07-01 15:49:48 -07:00
kishan
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
kishan
fd6900a3d8
bug 10382: wrapped usage events in txn
2011-07-01 18:11:56 +05:30
kishan
36d7ee5634
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-01 16:37:53 +05:30
Nitin
62078ffef2
bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH.
...
Status 8915: resolved fixed
2011-06-30 16:31:02 +05:30
anthony
b6eafd7102
bug 10512: lock on snapshot entry instead of volume entry
...
status 10512: resolved fixed
2011-06-29 18:54:53 -07:00
anthony
253ae79876
bug 10512: lock on snapshot entry instead of volume entry
...
status 10512: resolved fixed
2011-06-29 18:53:41 -07:00
anthony
e186369c51
use correct secondary storage when creating template from snapshot
2011-06-28 19:16:34 -07:00
anthony
b058a0226d
use correct secondary storage when creating template from snapshot
2011-06-28 16:58:15 -07:00
root
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
Nitin
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
root
dbc0abfa69
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 14:29:11 +05:30
alena
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
alena
4e20cfd0ef
bug 10447: don't allow to use system networks for vm deployment in Advance zone
...
status 10447: resolved fixed
2011-06-27 12:31:00 -07:00
alena
f9d6685d18
bug 10456: get accountId info from the volume record when create template from volume
...
status 10456: resolved fixed
2011-06-27 10:37:00 -07:00
alena
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
Alex Huang
791dd9777b
logging changes
2011-06-27 10:19:53 -07:00
Alex Huang
97b562fc2a
logging changes
2011-06-27 10:18:40 -07:00
Nitin
5810b838ed
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-27 17:20:42 +05:30
alena
f42f7d8945
Always add default security group when deploy vm in basic zone
2011-06-23 20:00:49 -07:00
alena
9d76f6d719
Always add default security group when deploy vm in basic zone
2011-06-23 19:59:14 -07:00
alena
d380ce0897
bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm
...
status 4706: resolved fixed
2011-06-23 11:31:39 -07:00
Murali Reddy
8eb9ee6a8b
Bug 10377 - API listAccounts return vmtotal=-14
2011-06-23 17:31:38 +05:30
Murali Reddy
1bfe6d8d72
Bug 10377 - API listAccounts return vmtotal=-14
2011-06-23 17:28:09 +05:30
Murali Reddy
1d4bee51e7
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:06:59 +05:30
Murali Reddy
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
alena
4fcb406f2b
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
2011-06-21 16:41:43 -07:00
alena
62516b00cf
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-06-20 10:32:19 -07:00
alena
3098db2b31
bug 9871: deployVm - check network's zone when do vm deployment
...
status 9871: resolved fixed
2011-06-16 16:00:45 -07:00
Abhinandan Prateek
afdb2f0871
bug 8962: moving vm: checked for basic networks
2011-06-16 15:11:42 +05:30
Abhinandan Prateek
3429b6cde4
bug 8962: tested vm move from one account to another, successfully restarted
2011-06-15 17:55:03 +05:30
kishan
8d87cf3506
bug 6770: Alert will be sent when deploying User VM fails
...
status 6770: resolved fixed
2011-06-15 12:40:23 +05:30
Frank
c400253b54
Ignore hvm field in template
2011-06-14 14:41:34 -07:00
kishan
fe4329389f
bug 6770: Alert will be sent when deploying User VM fails
...
status 6770: resolved fixed
2011-06-14 15:02:27 +05:30
Alex Huang
d39048faca
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:33:09 -07:00
Alex Huang
1d7e70acd1
bug 10260: propagate ha and deployment planner fixes
2011-06-13 17:35:20 -07:00
Abhinandan Prateek
a4bdeffd61
bug 8962: changes for vms using virtual network
2011-06-13 14:56:00 +05:30
Frank
5f5509ac00
use isHvm of template to decide to boot a HVM vm
2011-06-10 14:35:46 -07:00
Abhinandan Prateek
8e4ec4ce09
bug 8962: moving vm from one account to other
2011-06-09 15:02:47 +05:30
Alex Huang
d9e0bcfa1e
bug 10126: Renamed getPodId() to getPodIdToDeployIn()
2011-06-03 22:17:08 -07:00
nit
dbb1ed3645
bug 9729 : Remove redundant permission check from deployvm cmd.
...
status 9729: resolved fixed
2011-06-03 18:07:54 +05:30
Frank
4a3c4815b9
Fix another vm.getPodId issue
2011-06-02 14:34:34 -07:00
Alex Huang
2ceadec326
bug 9651: tags parameter added to createnetwork
2011-06-01 17:36:14 -07:00
anthony
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
Edison Su
2f8235dbd2
fix local seconeary storage related issues(sync/download templates, etc) for mycloud
2011-05-21 12:05:02 -04:00
alena
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
kishan
6bd8cece48
bug 8830: added source template id to template usage records
...
status 8830: resolved fixed
2011-05-19 16:53:33 +05:30
alena
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
Alex Huang
ea9703997b
proxy agent
2011-05-17 07:12:58 -07:00
anthony
9c4964bc1b
fixed merge
2011-05-16 16:54:00 -07:00
Alex Huang
5ce631e9d7
Separated resource management and agent management code. It's not all done but at least we make a first step
2011-05-16 10:55:18 -07:00
nit
bc360f499d
bug 9397 : CreateTemplate - generate MD5 checksum of the template. The code will calculate the checksum after the template has been created in the secondary storage. This code would be executed by ssvm. This would be agnostic of the way the template was created (not hypervisor specific).
...
status 9397: resolved fixed
2011-05-12 18:13:29 +05:30
alena
0f0dcc1964
bug 9827: call destroyVolume() method only after ensuring that the volume is not destroyed already.
...
status 9827: resolved fixed
2011-05-11 14:12:19 -07:00
alena
6075419977
bug 9821: fixed search by keyword in listVirtualMachines command
...
status 9821: resolved fixed
2011-05-10 12:28:30 -07:00
alena
ad05706f18
bug 9791: check if user is authorized to use a private template for vm creation
...
status 9791: resolved fixed
2011-05-10 10:39:25 -07:00
nit
d91999533b
bug 9397 : CreateTemplate - generate MD5 checksum of the template. The code will calculate the checksum after the template has been created in the secondary storage. This code would be executed by ssvm. This would be agnostic of the way the template was created (not hypervisor specific).
2011-05-10 12:26:00 +05:30
alena
7cb11b09f5
bug 9796: throw an exception when try to create volume/template from the non-ready snapshot
...
status 9796: resolved fixed
2011-05-09 16:35:09 -07:00
Frank
4e2935dc37
Fix other stupid string comparsions
2011-05-06 10:21:05 -07:00
anthony
10c4c14ad5
swift integration checkin
2011-05-05 13:55:29 -07:00
prachi
9aba817256
Bug 9652: Need to provide a way to specify deployment plan during VM start
...
Changes:
- Added a new parameter to pass in deployment plan during vm start
- If a hostId is passed in to the DeployVMCmd (only allowed for a root admin to test a host), a plan is passed in to start the vm in that host's datacenter, pod and cluster and on that host
- If a plan is passed in during start, but if the VM's root volume is READY, then plan of the root volume takes precedence. In that case the plan passed in is not used.
2011-05-04 15:02:52 -07:00
Chiradeep Vittal
b42ebf4872
Build fixes after first pass at merge
2011-05-03 10:41:31 -07:00
Chiradeep Vittal
303e2a7481
Start of zonesfeature / mycloud/cloudkit
2011-05-03 10:40:17 -07:00
Murali Reddy
d95d831faa
bug 9595 : Negative resource counts exception when destroying VM account
...
pushing 2.2.4 changes
2011-05-02 12:53:51 +05:30
prachi
b2b01bfcd2
Bug 8830 - Return parent template ID from templates created off of a snapshot
...
Changes:
- Added a new column `source_template_id` to vm_template table to carry the parent/source template ID from which the tempalte was created
- Added the column in db upgrade 224 to 225
- Changed code to save the source_template_id if there is one associated to the volume/ volume from which the snapshot was taken
- API response returns the sourcetemplateid field, if set, in all template usecases.
2011-04-29 15:40:59 -07:00
Alex Huang
99bc15f64a
changed getName to getHostname
2011-04-29 08:34:10 -07:00
Murali Reddy
c12ccbd06f
Bug 9534 : implement CPU cap
...
Introducing new boolean flag in service offering to restrict the user VM's CPU utilization to what service offering it is entitled for.
2011-04-27 13:54:45 +05:30
alena
1a6d78eae4
Code cleanup. No need to declare runtime exceptions (CloudRuntimeException, InvalidParameterException, PermissionDenied exceptions)
2011-04-21 16:26:53 -07:00
prachi
88c0126878
Bug 9187: modify userdata with update vm
...
Changes:
- UpdateVMCmd is changed to take in userData as a parameter
-The userData is updated in the DB if it is non-null.
2011-04-13 19:22:18 -07:00
alena
52bf157387
bug 9398: removed resource_type from volumes table as we no longer use it. Corresponding db upgrade scripts are updated
...
status 9398: resolved fixed
Conflicts:
server/src/com/cloud/storage/StorageManagerImpl.java
2011-04-11 18:14:35 -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
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
Murali Reddy
290c799b2c
Bug 9273 : [Stress Test] 'Count' in resource_count table has negative values
...
pushing 2.2.4 changes in to master
2011-04-11 15:37:53 +05:30
Murali Reddy
8b30507841
bug 9312: deleteAccount API does not decrement User VM resource count when VM is destroyed
...
pushing 2.2.4 changes to master branch
2011-04-11 14:35:06 +05:30
prachi
191d689912
Bug 9045: No 'Starting job for VM.MIGRATE' & 'Successfully completed VM.MIGRATE' events shown for VM manual migration
...
Changes:
- Added the required 'ActionEvent' annotation to the API, so that the events get added.
2011-04-05 16:28:01 -07:00
prachi
53f8ebf6f0
Bug 9043 - VM manual migration - when destination host is out of memory for migration, VMs being migrated remained in 'migrating' state
...
Changes:
- When migration fails we try to do cleanup on the destination host agent. The AgentUnavailableException in this cleanup was not caught.
-Due to that other cleanup like reverting capacity allocated and vm state were skipped.
-Fix is to catch the AgentUnavailableException so that rest of the cleanup can happen.
- Also corrected the exceptions in various cases of migration failure.
- In case the VM is still starting, HA should schedule a retry. Introduced a special migration exception for handling this.
2011-04-04 17:30:08 -07:00
alena
097d415589
Revert "bug 8898: allow service offering upgrade for Running vm"
...
This reverts commit 7668e1878a .
2011-04-01 17:54:17 -07:00
alena
46a80a599a
bug 9192: multiple improvementes to listVms command.
...
1) No longer do multiple searches involving "domain" table; only one join with domain is being done.
2) Do join with domain table only when command is executed by domainAdmin
3) Added index for "path" field in "domain" table
4) No longer do joins with account table as account_id is already present in vm_instance table.
2011-03-29 18:42:44 -07:00
will
a959726f38
bug 9200: Fixed issue when attempting to change the service offering of a VM who's current service offering has been deleted.
2011-03-28 18:15:13 -07:00
anthony
045b6ac319
bug 9184: allow detach a volume when the VM is in Destroyed status
...
status 9184: resolved fixed
2011-03-28 14:46:54 -07:00
alena
8c61e10c08
bug 9158: introduced new parameter "storageId" to listVirtualMachines api.
...
status 9158: resolved fixed
1) Works for admins only
2) When specified, list only vms that have volumes on this storage
2011-03-25 18:26:59 -07:00
Alex Huang
9d158dc060
Removed the async create status for volume now that our customers don't use it
2011-03-24 20:04:23 -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
alena
05be5acfda
bug 9066: don't allow enabling ha for vm created from Ha disbled service offering
...
status 9066: resolved fixed
2011-03-22 10:46:10 -07:00
alena
7c1a6e4884
bug 8831: API/Management server part is done for "Dedicate Network to domain". UI part is left
2011-03-21 18:17:59 -07:00
alena
abb2e2b2ff
bug 8831: partial checkin for Domain specific Networks (includes DB changes)
2011-03-21 15:05:07 -07:00
alena
2027aa9a8a
bug 9044: don't cleanup vm resources if the vm is already expunged
...
status 9044: resolved fixed
2011-03-18 18:12:52 -07:00
alena
96e83fe97f
bug 8146: Elastic IP support in Basic zone.
...
Following was done as a part of checkin:
1) NetworkOffering/Network:
* add PF service support for default Guest network offering.
* Add one more additional network - Public.
* Allow to enable external firewall in Basic zone.
2) Don't allow to deployVm in Public Network.
3) Allow to add vlan ip ranges to Public networks in Basic zone.
4) Associate IP - allow to associate with Direct vms.
5) Allow to create PF/Static nat rules. Rules are being sent to External Firewall Rule only.
6) Add PF support to External Firewall element.
2011-03-17 17:19:36 -07:00
alena
7b5d7806d2
bug 8510: update resource count for template after the DB record is created. Decrement it if actual snapshot creation fails
2011-03-15 17:29:23 -07:00
alena
d2f92f1c76
bug 8973: Create Virtual Guest network as a part of deployVm if corresponding networkOffering has availability=Required and no networkIds are specified
...
status 8973: resolved fixed
2011-03-15 15:06:52 -07:00
alena
c32198838f
bug 8724: can create sshKeyPair in behalf of other users now
...
status 8724: resolved fixed
2011-03-14 15:37:50 -07:00
alena
7b9b897459
Fixed the issue when admin can't deploy vm in behalf of another user. We were passing caller to deployVm always.
2011-03-14 11:08:59 -07:00
prachi
ed9a11c6b6
API changes for Bug 3316 - Manual live migration of Virtual Machines
...
This is a Root admin only functionality
---------------------
Service API changes:
---------------------
- ManagementServer will expose new API:
Pair<List<HostVO>, List<Long>> listHostsForMigrationOfVM(UserVm vm, Long
startIndex, Long pageSize)
The API returns list of all hosts in the VM's cluster minus the current host and also a list of hostIds that seem to have enough CPU and RAM capacity to host this VM.
- ListHostsCmd will call this service API if virtualmachineid is present in the request.
- MigrateVmCmd is the new command added that takes in virtualmachineid and destination hostid
- UserVmService will expose a new API: UserVm migrateVirtualMachine(UserVm vm, Host destinationHost)
------------------------------------
API throws error in following cases:
------------------------------------
- User is not a root Admin. (‘Permission denied’)
- A VM uses local storage, we cannot migrate it, so ‘listHosts’ will throw error.
- We fail to migrate the VM on the chosen host.
- API will support migration for XenServer only currently. So error is thrown
if hypervisor is not XenServer (e.g KVM, vSphere etc)
- Destination host is not in same cluster as source host.
- VM is not in running state
2011-03-11 17:49:53 -08:00
alena
975344a3ff
bug 8688: Network created from the networkOffering with Availability="Required" is required during the vm deployment in Advanced nonSecurityGroupEnabled zone
...
status 8688: resolved fixed
2011-03-10 11:27:17 -08:00
Edison Su
96bb6a7b7c
fix NPE that template was deleted
2011-03-09 15:27:06 -05:00
alena
7668e1878a
bug 8898: allow service offering upgrade for Running vm
2011-03-09 10:03:26 -08:00
anthony
5b1a421e62
bug 8712: prepare from snapshot db migration
2011-03-08 17:10:27 -08:00
nit
47882e9809
bug 7433: In case of multiple zones deleting a tempate from a zone doesn't prevent a user from selecting it to deploy the VM in the same zone. It was still visible in the listTemplates. Made change to check for template_zone_ref and template_host_ref removed and destroyed columns. During deployVM disallow a vm to be deployed from a template that has been removed in the zone.
2011-03-08 15:41:10 -08: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
Frank
20a7d95c06
Bug 8208 - bare metal provisioning
...
make an individual package and move to premium
2011-03-08 10:45:50 -08:00
Kelven Yang
d0892a964d
Add JMX monitoring to cluster management
2011-03-07 18:40:33 -08:00
Edison Su
6b6577d5e9
fix build on master
2011-03-04 15:22:30 -05:00
Edison Su
bec3f3c8a2
bug 8843: add vm into security group when vm is created
...
status 8843: resolved fixed
2011-03-04 13:04:44 -05:00
kishan
75def45063
bug 8536: Added delete volume usage event for Data volumes also when Vm goes to Error state
...
status 8536: resolved fixed
2011-03-04 15:38:07 +05:30
kishan
5df8e59132
bug 8098: Added destroy vm usage event when Vm goes to Error state
...
status 8098: resolved fixed
2011-03-04 15:30:06 +05:30