8c398654d3
Open vSwitch tunnel manager
...
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
Conflicts:
api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:37 +01:00
8f08898fb7
bug CS-14396: the VMs with current host id should be listed here, probably this fix did not make to this branch, is there is 2.2.14 branch
2012-04-09 12:24:49 +05:30
72d284de7d
Switch to Apache license
2012-04-03 04:54:14 -07:00
caefc3087b
bug 14156: return instancename parameter in userVm response to ROOT admin only
2012-03-06 13:39:03 -08:00
f67af1d1a2
bug 13866: return publicIp info in listVms api response when vm is linked to public ip via static nat
...
Reviewed-by: Frank
2012-02-17 15:30:57 -08:00
59c7150af7
bug 13439: full sync at management server restart, disabling hourly sync
2012-02-06 15:01:44 +05:30
bda032b874
bug 12760: generate vm.destroy event when vm goes from Stopped to Expuning state
...
status 12760: resolved fixed
2012-01-17 10:38:52 -08:00
a703315d34
bug 12348: fixed getting VMs for a cluster which was not getting back VMs in starting state
2011-12-13 12:20:48 +05:30
0980c47100
bug 12363: don't expunge nics when vm is expunged, just leave them in Removed state in the DB
...
status 12363: resolved fixed
2011-12-09 14:26:30 -08:00
7b8287d323
bug 10804: Api and middle layer support for default route feature
2011-12-05 14:53:45 -08:00
09905b641b
bug 10617: merge code from branch bug10617.
2011-12-01 14:17:52 +05:30
488ac8238e
bug 11311: lis host takes in a additional parameter to fine tune the details, the default behavious is still unchanged.
2011-11-22 16:26:52 +05:30
313e6ca284
Bug 8791 user dispersing allocator
...
Changes:
- Added a two new deployment planners 'UserDispersingPlanner' and 'UserConcentratedPodPlanner' to the DeploymentPlanners
- Planner can be chosen by setting the global config variable 'vm.allocation.algorithm' to either of the following values:
('random', 'firstfit', 'userdispersing', 'userconcentratedpod')
- By default, the value is 'random'. When the value is 'random', FirstFitPlanner is invoked as before that shuffles the resource lists.
- Now Admin can choose whether the deployment heuristic should be applied starting at cluster or pod level. This can be done by using the
global config variable 'apply.allocation.algorithm.to.pods' which is false by default. Thus by default as earlier, planner starts at clusters directly.
'UserConcentratedPodPlanner' changes:
- Earlier to 3.0, FirstFitPlanner used to reorder the clusters in case this heuristic was chosen.
- Now this is done by a separate planner and is applied only when 'vm.allocation.algorithm' is set to this planner
- It reorders the capacity based clusters/pods such that those pods having more number of Running Vms for the given account are tried first.
- Note that this userconcentration is applied only to pods and clusters. Not to hosts or storagepools within a cluster.
'UserDispersingPlanner' changes:
- 'UserDispersingPlanner' reorders the capacity ordered pods and clusters based on number of 'Running' VMs for the given account in ascending order. Aim is to choose thodes pods/clusters first which have less number of Running VMs for the given account
- Admin can provide weights to capacity and user dispersion so that both parameters get considered in reordering the pods/clusters. This can be done by setting
the global config parameter 'vm.user.dispersion.weight'. Default value is 1. Thus if this planner is chosen, by default, ordering will be done only by number of Running Vms, unless the weight is changed.
- HostAlllocators and StoragePoolAllocators also reorder the hosts and pools by ascending order of number of Running VMS/ Ready Volumes respectively for the given account. Thus try to choose that host or pool within a cluster with less number of VMs for the account.
2011-11-17 18:29:39 -08:00
f1b99f4f07
Revert "bug 10617: merging code from branch bug10617"
...
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2011-11-11 20:23:26 +05:30
bde1f6d2de
Merge branch 'networkasservice'
...
Conflicts:
api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
setup/db/create-schema.sql
2011-11-10 16:36:08 -08:00
d6c22c42fe
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-11-10 15:26:39 -08:00
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
9b8f96c06d
NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER
2011-11-09 17:09:17 -08: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
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
d315e57b0e
Renamed "type" to "guestType"
2011-10-27 16:51:42 -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
219978a9be
Create network using physical network id
2011-10-20 18:25:13 -07:00
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
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
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
cd01f7dab2
bug 11181: taking care of a boundary condition with 0 user VM
2011-08-25 15:38:48 +05:30
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
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
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
8277584b8a
merge ELB / nectarine branch
2011-08-08 15:20:56 -07:00
68a450b5a4
initialize search builder
2011-08-05 12:26:15 -07:00
Salvatore Orlando
Abhi
frank
Alena Prokharchyk
Naredula Janardhana Reddy
prachi
Sheng Yang
Alex Huang
Kelven Yang
Abhinandan Prateek
alena
Edison Su
kishan
root
Chiradeep Vittal