f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
02adbd4bd3
bug 10617: merging code from branch bug10617
2011-11-10 15:23:48 +05:30
a2499c9e69
bug 11910: during full sync ignoring VMs which have been into starting state shortly
...
reviewed-by: kishan
2011-11-10 12:00:10 +05:30
9b8f96c06d
NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER
2011-11-09 17:09:17 -08:00
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
3a845d2d75
Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created)
2011-11-07 16:16:03 -08:00
2b6f3d458e
UUID support for XML responses
2011-11-04 17:38:22 -07:00
3de3fc69d2
NaaS: Implement shutdownProviderInstances for virtual router
2011-11-03 13:44:26 -07:00
7e9b210d5c
bug 6745: Fix problems in Async create commands
2011-11-03 07:34:02 -07:00
79e39c20fb
Fixes on merged result
2011-11-03 07:34:01 -07:00
fa2dd8e93a
bug 6745: Using UUID instead of integers - for VM instances
2011-11-03 07:33:56 -07:00
fab2d1f880
bug 11678: added vm.destory.forcestop config var to set force when destroying a vm
2011-11-03 15:51:02 +05:30
267b12d015
bug 11709: saving encrypted password in db
...
status 11709: resolved fixed
2011-11-03 15:40:20 +05:30
3e20c60d6d
Fixed vm deployment in Basic zone
2011-11-02 17:02:44 -07:00
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
2250dff349
1) Removed tags from the network object
...
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
9560e92015
physicalNetworkId is optional in createNetwork api. Works as follows:
...
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
2011-11-01 15:49:39 -07:00
be21a5e37c
Don't allow enabling securityGroup service for Isolated networks
2011-11-01 13:09:14 -07:00
80dc2c0b1a
Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network
2011-11-01 12:07:32 -07:00
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
abb37acbdd
bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments
2011-10-31 16:35:42 +05:30
932e3c3a65
bug 11311: incremental checkin
2011-10-31 12:27:17 +05:30
07e44e3a23
bug 11311: change list vm call to provide less info
2011-10-30 16:25:57 +05:30
a572205e3c
Revert "bug 11311: vm summary command initial impl"
...
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
2011-10-30 15:13:58 +05:30
f456462443
bug 11311: vm summary command initial impl
2011-10-28 14:07:19 +05:30
3cb1426a6c
bug 10588: sending cluster sync only for xen
2011-10-28 11:39:22 +05:30
b413a625f4
1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command
...
2) Added deleteProjectInviation command. Can be executed by project admin only
2011-10-27 18:32:00 -07:00
d315e57b0e
Renamed "type" to "guestType"
2011-10-27 16:51:42 -07:00
fe0b685e95
Security group is a service now
2011-10-27 16:49:20 -07:00
e1e96c0bb3
NaaS: Add ServiceProviders
...
Added PortForwardingServiceProvider, StaticNatServiceProvider, rename
PasswordServiceProvider to UserDataServiceProvider(may rename to a better name
later).
Add related function for service providers.
2011-10-27 11:55:10 -07:00
21de281276
Fix broken compilation by new anget manager merge
2011-10-27 11:24:10 -07:00
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
a1a0fdc0a3
bug 10588: making sure the vms are synced during a delta also
2011-10-27 15:56:53 +05:30
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
525a0a7675
1)Changed implementation for restart network: call shutdown/implement methods as a part of it
...
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
2011-10-25 18:24:24 -07:00
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
780e0efe79
Removing references to DataCenter - providers, using the networkoffering -> providers map instead.
...
TODO:
- Still leaving the provider columns in data_center schema as-is for CloudKit and BareMetal
- ExternalNetworkDeviceMgrImpl still needs to fix the dataCenter.setProviders calls and externalNetworkApplicance usage checks to see if zone has external networking.
2011-10-24 18:06:33 -07:00
75c8e33226
Removed guestIpType from network/networkOffering
2011-10-24 17:05:00 -07:00
92eaf49f29
Add storage migration
2011-10-24 15:59:47 -07:00
19df7ed8af
Swift; create template from snapshot
2011-10-21 17:32:48 -07:00
6c5c24dd6b
swift: create volume from template works
2011-10-21 12:53:58 -07:00
219978a9be
Create network using physical network id
2011-10-20 18:25:13 -07:00
1ea9b5d703
bug 10588: putting config param for cluster sync intervals
2011-10-20 10:51:40 +05:30
ceda05298e
Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead
2011-10-19 16:38:39 -07:00
65f3bb1df5
Bug 11647 - OVM - no support for migrate instance
...
return available hosts when hypervisor type is Ovm
status 11647: resovled fixed
2011-10-17 16:26:32 -07:00
f7f2eb825d
bug 10588: incorporated review comments (Reviewer Nitin, Murali, Kishan, Jana)
...
1. Finetune vriable scope, s_ for static vars
2. Impl should be cluster aware and a host going down should not affect the sync
2011-10-17 14:59:24 +05:30
c00058adc2
Added type (Shared/Isolated) to the networkOffering/networks
2011-10-13 17:33:41 -07:00
cd6b872f8d
Bug 11670 - OVM - HA failed when host is disconnected from network
...
status 11670: resolved fixed
2011-10-13 14:46:36 -07:00
b050120303
bug 10588: clearing map so that the vm sync can resume on next connect, in case of failure
2011-10-12 12:34:54 +05:30
334eeccd2c
bug 11561: Added new Dao RandomlyIncreasing, which will increase the Vm Id by 1-10 randomly
...
status 11561: resolved fixed
2011-10-11 12:40:50 +05:30
0121c0516d
Network: Add Service providers
...
In the past, the NetworkElement would cover almost all the functionality that
e.g. virtual router can cover: firewall, source NAT, static NAT, password,
VPN... So anyone want to implement the NetworkElement would have to implement
these service's specific methods, even it wouldn't support it. Also, if we want
to find a e.g. FirewallServiceProvider, we have to proceed all the current
network service providers, to call a method to know if it support such service.
That's neither elegant nor scaling way to do it.
As the first step, this patch separates each ServiceProvider from NetworkElement
(there are some interface already out of NetworkElement, so this patch slightly
modifies them too), and only the class would implement the correlated interface, would
have the ability to do these services.
2011-10-10 11:45:39 -07:00
962bbcd5a0
bug 11634: add manual vm migration support for kvm
...
status 11634: resolved fixed
2011-10-10 11:31:18 -07:00
0f5384d086
Bug 11522 - New agent manager
...
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
a51fb221d6
Bug 11169 - Couldn't deploy a router because the host it existed on is in Maintenance.
...
Changes:
- VirtualMachineMgr puts the constraint that if Root volume is already READY, we provide the clusterId in the plan to the deploymentPlanner. Planner then searches for resources only under that cluster.
- If no deployment could be found, deploying VM fails.
- Fixed this, such that incase the root volume is recreatable, we call the planner again by removing the cluster constraint. Planner will then search for resources in other clusters.
- Works for system VMs(SSVM, consoleproxy, virual routers).
2011-10-05 18:35:59 -07:00
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
9bd5e5871b
Bug 11481 - get manual live migration working with all VMs
...
Changes:
- Added a new API 'migrateSystemVm' backed by MigrateSystemVMCmd.java to migrate system VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
- This is Admin only action
- The existing API 'migratevirtualmachine' is only for user VMs
2011-09-29 17:47:46 -07:00
12e25fb988
Implemented vm* api commands to be executed against the project
2011-09-29 10:20:51 -07:00
83c6cf3db0
bug 10588: code to sync VM state at cluster level and dettached from ping command
2011-09-27 13:18:21 +05:30
ccd47c1b21
Implemented Project Invitations
2011-09-26 17:47:20 -07:00
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
0eea1cb733
Bug 11404 - VM was in Running state, had null for a pod_id, basically didnt allow creation of subsequent vm's
...
Reviewed-by: Alex
Changes:
- When management server starts, it goes through all the pending work items from op_it_work table and schedules HA work for each. It used to mark each item as done. Instead we should keep the item as pending and let it get marked as Done after the HA work is done.
- Changes in VirtualMachineMgr::advanceStop() :
a) if we find a VM with null hostId, we stop the VM only if it is forced stopped.
b) if VM state transition to Stopping fails,for state Starting and Migrating we try to find the pending work item and then do cleanup the VM. In case state is Stopping we can cleanup directly.
c) We proceed releasing all resources only if state transitioned to 'Stopping'.
- Changes in HA:
a) Depend on VirtualMachineMgr::advanceStop() in case host is not found to do VM cleanup
- When Vm state between mgmt server and agent syncs from starting -> running, mark any pending work item as done.
Conflicts:
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-09-15 19:06:19 -07:00
6b82ba3ff9
Bug 11457 - NullPointerException while synching VM state from Starting -> Running between management server and agent
...
Reviewed-by: Kelven and Alex
Changes:
- Added log statements about the podId during deploying a VM.
2011-09-15 16:16:24 -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
7a64d8fda4
add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation
2011-09-14 15:15:26 -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
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
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
84868b7f9c
Bug 11200 - maximum number of guests per host
...
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
2011-09-07 14:53:05 -07:00
f9d5a46871
Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug
2011-09-05 18:41:42 +05:30
b93318cb73
bug 11002: userVmDao - create searchBuilder as a part of dao init process (otherwise it's not threadsafe)
...
status 11002: resolved fixed
2011-09-02 15:51:52 -07:00
ecd99ad379
bug 11332: don't try to log vm's information when the vm is already Expunged
...
status 11332: resolved fixed
Conflicts:
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java
2011-09-02 12:08:39 -07:00
ebfe43d15c
bug 11263: only update host Id when VM is in running state when detected external VM migration
2011-08-26 16:28:58 -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
cd01f7dab2
bug 11181: taking care of a boundary condition with 0 user VM
2011-08-25 15:38:48 +05:30
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
01044c5b2d
removing spurious debug statement
2011-08-24 16:47:29 +05:30
bd439831ad
bug 11181: batching the select statements
2011-08-24 16:34:28 +05:30
d3eb9db7fa
bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
...
status 11204: resolved fixed
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
40d348ff8b
Bug 11213 - UserConcentratedPod returning wrong list of pods
...
Changes:
- Needed to add parentheses to the query to get correct results.
2011-08-23 11:53:48 -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
8d4c7208a4
bug 11094: delinking api layer objects from dao layer
2011-08-19 15:23:49 +05:30
601708c3e6
bug 11094: delinking api layer objects from dao layer
2011-08-19 15:21:03 +05:30
843e41752f
Update redundant router status even router is down
...
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:23 -07:00
a961dd913f
Update redundant router status even router is down
...
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:13 -07:00
2c1df02ba1
Removed unused imports
2011-08-18 15:02:04 -07:00
ea102aa045
add host guid in migrate command
2011-08-18 11:03:40 -07:00
035001bd19
Fix baremetal planner reply to non-baremetal VM when migration
2011-08-18 10:14:40 -07:00
523a32edaa
Fix baremetal planner reply to non-baremetal VM when migration
2011-08-18 10:14:16 -07:00
c2a769d993
fixed execptions while adding second host
2011-08-18 16:28:19 +05:30
2df6e5cc69
fixed execptions while adding second host
2011-08-18 16:26:00 +05:30
441d9d765c
bug 11154: host can go in Maintenance state only after all vms are migrated from it
...
status 11154: resolved fixed
2011-08-17 12:04:11 -07:00
6291554576
bug 11154: host can go in Maintenance state only after all vms are migrated from it
...
status 11154: resolved fixed
2011-08-17 12:03:53 -07:00
a9c67d23fa
bug 11099: Let VM sync to cooperate with migration process
2011-08-16 15:23:01 -07:00
ed7214c710
add host guid in migrate command
2011-08-16 10:30:52 -07:00
356728ae19
Fixed spelling mistake
2011-08-16 09:52:00 -07:00
bbf20ac125
bug 11019: Let VM sync to coordinate with possible VM-relocation under VMware when VM is in starting time
2011-08-11 17:51:56 -07:00
9e1ee30ea3
bug 11019: Let VM sync to coordinate with possible VM-relocation under VMware when VM is in starting time
2011-08-11 14:28:39 -07:00
6e7ad8830f
bug 11043: Propagating fix
2011-08-11 10:30:03 -07:00
1079a77024
bug 11043: rverted the bad fix
2011-08-11 10:27:02 -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
924961d898
merge nectarine
2011-08-08 21:45:37 -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
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -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
68a450b5a4
initialize search builder
2011-08-05 12:26:15 -07:00
59d5080718
bug 10969: name of VM is instance name, instead of display name
...
status 10969: resolved fixed
2011-08-05 13:18:42 +05:30
415db5a126
bug 10969: name of VM is instance name, instead of display name
...
status 10969: resolved fixed
2011-08-05 13:16:39 +05:30
51e43be06c
bug 10969: name of VM is instance name, instead of display name
...
status 10969: resolved fixed
2011-08-05 13:14:28 +05:30
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
34a0c44f4f
Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs.
2011-08-03 16:10:20 -07:00
37dcec77bb
Bug 10197:
...
implement pool-wise VM sync,
For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
Conflicts:
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-08-02 17:31:36 -07:00
bba811a714
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 17:29:16 -07:00
dc7ff2b5ad
Bug 10197:
...
implement pool-wise VM sync,
For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
2011-08-02 16:52:24 -07:00
5f9884d97a
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 16:48:27 -07:00
bdbc16f081
bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
...
status 10938: resolved fixed
2011-08-02 16:14:20 -07:00
21afd1785a
bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated
...
status 10938: resolved fixed
2011-08-02 16:10:23 -07:00
f043f63eaa
Merged changes from 2.2.8.zucchini
2011-08-02 15:33:48 -07:00
79ddba246d
Revert "looks like lock tables don't return the tables locked"
...
This reverts commit 76781c10f8534acdd6f81c46952f88ade941e269.
2011-08-02 03:48:57 -07:00
91550836cf
looks like lock tables don't return the tables locked
2011-08-02 02:10:47 -07:00
04528c821b
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:40:29 -07:00
a6a2383561
bug 10929: allow only OperationFailedToError event to trigger transition to Error state.
2011-08-01 18:38:14 -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
93244b5b62
Bug 10197: if VM is already running, just return the host it is running on
2011-07-29 16:33:57 -07:00
31100824d7
Bug 10197: if VM is already running, just return the host it is running on
2011-07-29 16:33:33 -07:00
d48e97a368
bug 10768: root cause is StopCommand is not sent out in force stop,
...
status 10768: resolved fixed
2011-07-29 15:41:00 -07:00
07c2f6cdc7
differentiate between dhcp server and elb vm
2011-07-27 12:00:07 -07:00
200d2b9cd0
bug 10847: sg got executed in a big transaction leading to the deadlock
2011-07-25 17:41:11 -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
3167c49687
bug 10736: when deploy vm in Basic zone, 1) send vmData/Password info to the Dhcp running in the same pod 2) send dhcp information to all pods in the system only when network.dns.basiczone.updates has "all" value
...
status 10736: resolved fixed
2011-07-20 16:50:58 -07:00
d206bf7852
bug 10768: root cause is StopCommand is not sent out in force stop,
...
status 10768: resolved fixed
2011-07-20 16:47:48 -07:00
36edf298e7
bug 10373: Intermediate checkin for Domain level guest Virtual networks
2011-07-20 13:44:26 -07:00
d4ae9483cb
bug 10768: root cause is StopCommand is not sent out in force stop,
...
status 10768: resolved fixed
2011-07-20 12:11:21 -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
fa623c04e2
bug 10640: Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool
...
The old strategy is to deploy the second virtual router to diffent host only.
status 10640: resolved fixed
2011-07-19 15:06:15 -07:00
e5e76881c6
Redundant virtual router: Try to deploy the second virtual router to different pod/cluster/host/storagepool
...
The old strategy is to deploy the second virtual router to diffent host only.
2011-07-19 14:26:37 -07:00
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
19f7c9e26f
Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call
2011-07-19 10:33:34 -07:00
e2eac341a4
bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all"
...
status 10710: resolved fixed
Conflicts:
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/db/schema-228to229.sql
2011-07-19 10:33:34 -07:00
978b2640e2
Backport VirtualNetworkApplianceManager
...
Also:
1. Discard VPN related change.
2. Add network.dns.basiczone.updates in Config.java
3. Add findByNetworkOutsideThePod() for DomainRouterVO
Tested with VLAN and basic mode, works.
Disable redundant virtual router temporaily, would enable it after more testing.
2011-07-18 18:30:05 -07:00
4bc8686513
bug 10429: Backport redundant virtual router
...
Part 1
This backport contained:
commit 52317c718c25111c2535657139b541db0c9d1e1f
bug 9154: Initial check in for enabling redundant virtual router
commit 54199112055d754371bfb141168fb5538bf6d6ea
Add host verification for CheckRouterCommand
commit cef978a228c90056ead9be10cbc4de74c2b8de76
Fix CheckRouterAnswer's isMaster report
commit 4072f0a6991ac3b63601a1764fbe14188965f62f
Some build fixes and code refactoring for redundant router
commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
Redundant Router: Fix OVS
commit 6a228830e7c46d819fa0c3317e159e041337e887
Fix findByNetwork()/findByNetworkAndPod()'s return
commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
Redundant Router: Fix isVmAlive()
commit e1275d2514adc41f8744f5107d4069c38be195f1
Only issue CheckRouterCommand to redundant routers
And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes
in the master branch.
2011-07-18 18:29:56 -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
1081a3cfaa
bug 10732: fix console proxy assignment issue
2011-07-14 21:56:34 -07:00
028d235716
bug 10732: fix console proxy assignment issue
2011-07-14 21:52:16 -07:00
731c3bc20a
bug 10710: Basic zone setup - send dhcp entries to all domRs (in every Pod) only when network.dns.basiczone.updates is set to "all"
...
status 10710: resolved fixed
2011-07-14 16:28:13 -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
1acfa6013d
Close ResultSet and PreparedStatement when gather vm information during the listVirtualMachines call
2011-07-11 18:26:15 -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
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
186654b299
find templates that are not removed
2011-07-09 13:37:45 -07:00
fb8c3c032a
find templates that are not removed
2011-07-09 13:37:26 -07:00
040cffafca
bug 10447: don't set the reservation id to null
2011-07-08 11:36:52 -07:00
b23c2a3c53
bug 10447: don't set the reservation id to null
2011-07-08 11:36:30 -07:00
44666b6333
fixed the problem that vms in starting state were not being cleaned up when management server restarts
2011-07-08 00:05:55 -07:00
aa757f0303
fixed the problem that vms in starting state were not being cleaned up when management server restarts
2011-07-08 00:05:29 -07:00
d0de1a5b94
bug 10620: allow ISO attachment failure to propogate up
2011-07-07 17:02:51 -07:00
25d2c893e6
bug 10620: allow ISO attachment failure to propogate up
2011-07-07 17:00:51 -07:00
80ede648e3
bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
...
status 10629: resolved fixed
2011-07-07 15:48:02 -07:00
b92abc5333
bug 10629: fixed regression bug in listVms - security group name and display text weren't returned
...
status 10629: resolved fixed
2011-07-07 15:42:44 -07:00
79f5ece7dc
fix NPE in put primary storage into maintainance mode
2011-07-06 16:05:22 -07:00
561f415d5a
bug 10382: Move volume delete events to destroyVolume method
...
status 10382: resolved fixed
2011-07-06 18:08:48 +05:30
2aa1f3e596
bug 10570: fixed ISO id and name
...
status 10570: resolved fixed
2011-07-06 11:26:10 +05:30
c62ad3d11a
bug 10570: fixed ISO id and name
...
status 10570: resolved fixed
2011-07-06 11:23:23 +05:30
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
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
5f12ea73a8
bug 8962: Completed moving VM from one account to another.
2011-07-04 13:15:40 +05:30
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
7512689dc8
bug 10546: move sending agent command out of transaction
2011-07-01 15:49:48 -07:00
7e6e097b58
bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue
2011-07-01 14:09:58 -07:00
3b46e7c695
bug 10482: use version-based systemvm ISO in secondary storage to solve the upgrade issue
2011-07-01 14:02:09 -07:00
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
fd6900a3d8
bug 10382: wrapped usage events in txn
2011-07-01 18:11:56 +05:30
36d7ee5634
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-01 16:37:53 +05:30
Alex Huang
Naredula Janardhana Reddy
Abhinandan Prateek
Sheng Yang
Nitin
alena
Kelven Yang
anthony
root
frank
Edison Su
prachi
kishan
frank
Chiradeep Vittal
Edison Su
Alex Huang
keshav
Murali Reddy
Nitin