a1cab92ae1
bug 11537: revoke related FirewallRules when do vmExpunge and ipAddress release.
...
status 11537: resolved fixed
Reviewed-by: edison@cloud.com
Conflicts:
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-09-22 14:01:02 -07:00
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
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
df17ce5648
Bug 11457 - NullPointerException while synching VM state from Starting -> Running between management server and agent
...
reviewed-by: Alex/Kelven
Changes:
1. UserVmManagerImpl :: finalizeStart()
Added null check for the cmds.getAnswers() object. Return ‘true’ if null.
2. VirtualMachineManagerImpl :: advanceStart()
Move the line to set PodId to the vm being started above the state transition where hostId gets set, so that podId is not null in case management server goes down when vm starts on the agent. On restart, podId is not updated during fullsync. So this will prevent podId remaining null.
vm.setPodId(dest.getPod().getId());
2011-09-15 16:16:15 -07:00
b7f45cfbd6
bug 11434: don't execute destroy call when vm is already in Destroyed/Expunging state
...
status 11434: resolved fixed
2011-09-14 10:33:45 -07:00
cfbbe4c031
fix perf. issue in deploy vm. also remove dead code in dao
2011-09-12 18:20:23 -07:00
41926cb038
bug 11377: remove the restriction on VMware in API layer to let it support VM manual migration
2011-09-12 14:28:32 -07:00
d854923ac5
Bug 11200 - maximum number of guests per host
...
Manual Migration should fail if the destination host chosen by Admin already has max guest VMs running.
2011-09-08 18:33:55 -07:00
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
905df61aac
bug 11362: Make VM network adapter device type be selectable based on VM-specific details
2011-09-07 17:58:42 -07:00
05440f0905
Bug 9921 - template tags
...
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
2011-08-25 12:03:59 -07:00
ee9fbf10b6
Method signature change
2011-08-24 14:56:37 -07:00
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
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
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
7a7662b01b
fix typo
2011-08-19 16:15:52 -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
56244c7c47
release the check
2011-08-19 16:07:55 -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
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
2c1df02ba1
Removed unused imports
2011-08-18 15:02:04 -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
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
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
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
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
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
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
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
04528c821b
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:40:29 -07:00
40f42a784f
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:33:02 -07:00
8bcad6960c
add rhel6.1 support
2011-07-29 20:05:01 -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
9e90999aab
bug 10764: changing service offering drops cpu cap
...
status 10764: resolved fixed
2011-07-25 18:15:31 +05:30
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
36edf298e7
bug 10373: Intermediate checkin for Domain level guest Virtual networks
2011-07-20 13:44:26 -07:00
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
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
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
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
prachi
Chiradeep Vittal
Kelven Yang
anthony
frank
Edison Su
Murali Reddy
kishan