Commit Graph

3670 Commits

Author SHA1 Message Date
prachi 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
keshav e3252e5e66 Excluded external firewall/LB from host stats collection, and included them in ping checks 2011-09-08 16:43:37 -07:00
Kelven Yang aa7f06d7eb bug 11384: deprecate vmware.guest.nic.device.type global configuration variable 2011-09-08 16:11:17 -07:00
alena 6e6b6ab2ab Fixed the bug in AgentLB: consider only hosts of type=Routing when calculate average load 2011-09-08 14:57:04 -07:00
Kelven Yang a118880836 bug 10874: don't invalid run session of other management server even if it detects it is unreachable as the event may just be temporary network condition 2011-09-08 14:22:52 -07:00
anthony 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
Kelven Yang 905df61aac bug 11362: Make VM network adapter device type be selectable based on VM-specific details 2011-09-07 17:58:42 -07:00
Kelven Yang f70958809b bug 11360: make user_vm_details generic to all VMs instead of user-only VMs, VM details info will be carried down to hypervisor resource 2011-09-07 15:42:40 -07:00
prachi 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
alena b883b25a12 bug 11348: make content type for "json" files configurable
status 11348: resolved fixed
2011-09-07 14:22:01 -07:00
alena ba2c6695cc bug 11326: don't try to transfer the agent if it's a forward agent
status 11326: resolved fixed

Also added more logging to the agent rebalance code.

Conflicts:

	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
2011-09-07 12:47:25 -07:00
anthony 13ee22d421 bug 10078:
1. introduce migratewait in global configuration, the default value is 1 hour
 2. use async xapi VM migration API

status 10078: resolved fixed
2011-09-07 12:36:17 -07:00
kishan 066537a565 bug 4282: Removed caching of signatures. Added detailed error message expires parameter parsing 2011-09-07 17:51:09 +05:30
alena 47d9cbd2ee bug 11331: allow extending vnet range as a part of updateZone call
status 11331: resolved fixed
2011-09-06 17:40:28 -07:00
kishan 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
Naredula Janardhana Reddy 3c1f6fd24b bug 10467: Incorrect display of domain router linklocalmac address and linklocal netmask fixed 2011-09-05 13:42:12 +05:30
alena 3c0396bb20 bug 10751: don't remove already removed templates during the account cleanup
status 10751: resolved fixed
2011-09-02 16:06:55 -07:00
alena 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
Kelven Yang 4d3d47f01c bug 11304: restore host status after initialization failure 2011-09-02 15:19:36 -07:00
anthony c683fda236 set timeout for CheckOnHostCommand to 50 s 2011-09-02 15:01:32 -07:00
anthony c7fb330914 put getConnection into try 2011-09-02 15:01:28 -07:00
alena eb9b5c1f65 bug 11259: ROOT admin can extract template/iso even when it's not mark as extractable
status 11259: resolved fixed
2011-09-02 12:37:15 -07:00
alena 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
Sheng Yang 4e5ce5690a bug 11305: Stop disconnected redundant virtual router if we can process with the connected one
When we apply rules or start new VM, we may encounter some running routers that
we can't program. That can due to network issue or host is down or vCenter is
disconnected, etc. To keep the synchronization, we would stop them, but only
when there is the other router we've successfully updated. If both routers are
unable to communicate with, we simply give up and report it user.

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2011-08-31 19:29:32 -07:00
Sheng Yang 01eb08a384 bug 11305: Remove router stop logic from disconnect host.
Now the logic is: if we can only connect to one of the two redundant routers, we
would stop the one that can't be connected. If we fail to program both routers,
just let it go.
2011-08-31 19:27:57 -07:00
alena 8b5f2c758e Do account permission checks for snapshots the way it's done for all other ControlledEntities 2011-08-31 18:15:08 -07:00
frank 0c0fe8c1b3 Bug 8966 - Oracle VM (OVM) support
configure hostname of host for OCFS2
small fixes
2011-08-31 17:25:04 -07:00
Kelven Yang 0421eafba0 bug 10765: add japanese keyboard support for linux OSes 2011-08-31 15:53:01 -07:00
kishan 8d5e7ff659 bug 11316: In 2.2.y, removed new template upgrade changes. Added upgrade path from 2210 to 2211. Moved existing changes to 2211to2212
status 11316: resolved fixed
2011-08-31 15:16:12 +05:30
kishan 2ff1e4f92a bug 11316: Removed new template upgrade changes. Added upgrade path from 2210 to 2211. Existing changes moved to 2211to2212 upgrade
status 1316: resolved fixed
2011-08-31 14:19:20 +05:30
alena 39b78ee17c bug 11298: give detailed error message when failed to authenticate a user
status 11298: resolved fixed
2011-08-30 16:51:45 -07:00
alena d65bef383c Mark account as cleanup_required=0 when cleanup was finished successfully 2011-08-30 14:09:14 -07:00
alena 8f9b929e3f Don't remove the domain when it has accounts that are removed, but require cleanup 2011-08-30 14:09:01 -07:00
alena 09f8d8ee4c Fixed the bug when networkRate for the domR's guest network wasn't taken from the service offering 2011-08-30 10:41:17 -07:00
Naredula Janardhana Reddy 854f81962f bug 10617: Added Egress rules to Security groups.
Description :
   API's:
     -  Two new api's authorizeSecurityGroupEgress,revokeSecurityGroupEgressCmd are added. These two API's are similer to ingress rule API's.
           - authorizeSecurityGroupEgress :Authorizes a particular egress rule for this security group . Usageof API is very similer to that of authorizeSecurityGroupIngress except that instead of source cidr  there will be destination cidr. By default like ingress, all the outgoing flows are blocked.
           - revokeSecurityGroupEgress : It is similer to revokeSecurityGroupIngress api, It removes the egress rule.
     -  listSecurityGroup API's response changed. It include's egress list apart from the existing ingress rules in the output of the API.

   Hypervisors :
      - It is implemented in Xen and KVM.

   Pending Tasks :  Blocking using destination security groups.

   Previous commits: c9fda641673df7701f44963ef27e1d488f121219 , 24e4e44b8f0712a37147a3777833de3f9e24829e
2011-08-30 16:28:35 +05:30
Murali Reddy 279d21ee92 bug 11179: template url and format are not validated
added check to verify url ends with extension same as the template format specified
2011-08-30 16:15:58 +05:30
Edison Su 03e33f16bf bug 11217: only work on the snapshot whose state is "backedup" and is not removed
status 11217: resolved fixed
2011-08-29 15:28:01 -07:00
Edison Su 60cbef1fb8 bug 11217: add db upgrade script, if sechost_id is missing of a snapshot, add one got from presnapshot_id
status 11217: resovled fixed

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
2011-08-29 15:27:53 -07:00
alena 41be3716e3 bug 11196: fixed the code when gson serialization was done twice
status 11196: resolved fixed
2011-08-29 14:50:18 -07:00
Murali Reddy 9abb544865 bug 6876: netscaler MPX & VPX support
- adding supprt for Netscaler VPX & MPX load blancers
    - implemented for virtual networking
    - works only with new fetched public IP, inline support is not added yet
2011-08-30 00:14:05 +05:30
alena 0b95ad2f0f bug 11290: insert VPN config values as a part of 229-2210 upgrade
status 11290: resolved fixed
2011-08-29 11:22:42 -07:00
Murali Reddy 9a10f2b402 bug 6876: netscaler MPX & VPX support
- adding supprt for Netscaler VPX & MPX load blancers
- implemented for virtual networking
- works only with new fetched public IP, inline support is not added yet

more details will be added in the bug
2011-08-29 19:26:08 +05:30
alena 9ecd2058e7 Reverted wrong commit for logging in HostDaoImpl 2011-08-26 17:49:12 -07:00
Kelven Yang 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
alena 482528ce8c Fixed the bug in extractTemplate - do ignoreCase comparison when verify the download mode. 2011-08-26 10:11:30 -07:00
Nitin 294f3953a4 bug 11244: Thread updating "op_host_capacity" table shouldn't do updates for removed pods/zones.
status 11244: resolved fixed
2011-08-26 18:58:52 +05:30
Naredula Janardhana Reddy cbed4c7a44 bug 11253:
Added New value "link-local"  to  global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
       global -  stats visible from public network
       guest-network - stats visible only to guestnetwork.
       link-local - stats visible only to link local network
       disabled - stats disabled.
2011-08-26 15:21:29 +05:30
alena a11b7de9fe Set firewall.rule.ui.enabled to false by default
Conflicts:

	server/src/com/cloud/configuration/Config.java
2011-08-25 16:12:55 -07:00
Kelven Yang 9ace681547 bug 11162: merge fix from 2.2.10 premium 2011-08-25 15:38:43 -07:00
Kelven Yang 97a7dddf7d bug 11162: support memory overprovisioning in VMware 2011-08-25 15:38:28 -07:00
alena 35b551a199 bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
prachi 1fefdd628d Bug 11261 - Allow to update host tags
Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags
2011-08-25 13:01:57 -07:00
alena 8c53dbcdd7 bug 11185: support multiple CIDR on overlapping port ranges for firewall rules
status 11185: resolved fixed

Conflicts:

	server/src/com/cloud/network/firewall/FirewallManagerImpl.java

Conflicts:

	api/src/com/cloud/network/firewall/FirewallService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2011-08-25 12:21:11 -07:00
prachi 16986c01c8 Bug 9921 - template tags
-Added missing import statement.
2011-08-25 12:16:09 -07:00
prachi b6851e631e Bug 9921 - template tags
-Upgrade path from 2.2.10 to 2.2.11
2011-08-25 12:09:21 -07:00
prachi 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
Abhinandan Prateek cd01f7dab2 bug 11181: taking care of a boundary condition with 0 user VM 2011-08-25 15:38:48 +05:30
Naredula Janardhana Reddy 9feb05ac13 bug 10617: This is Intermediate commit for Egress rules implementation in security groups.
previous commit: c9fda641673df7701f44963ef27e1d488f121219 ( this under bug 1067, typing error)
        changes: 1) partially implemented  listing of egress rules along with ingress rules.
                 2) partially implemneted egress rules for KVM
2011-08-25 12:18:33 +05:30
Edison Su 9391938908 fix conflict 2011-08-24 18:47:09 -07:00
alena 0355c26f03 bug 11242: check if db object is already removed before generating the Debug log. It can happen in case when deleteHost command is called many times in parallel for the same host
status 11242: resolved fixed
2011-08-24 15:48:18 -07:00
Kelven Yang a51383e296 bug 11219: use local storage flag from service offering when it is ROOT disk 2011-08-24 15:17:53 -07:00
alena ee9fbf10b6 Method signature change 2011-08-24 14:56:37 -07:00
alena 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
frank 85f18ff256 fix build, add test rpm back 2011-08-24 13:24:51 -07:00
Edison Su 9a6fc7de45 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 11:05:45 -07:00
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
Edison Su 9a65935809 bug 11217: add secondary storage id into snapshot, if it's an empty snapshot
status 11217: resolved fixed
2011-08-24 10:48:10 -07:00
Nitin 4b6d072490 bug 10972: Improve logging - put in the hostid and hostname on which the vm launches.
status 10972: resolved fixed
2011-08-24 18:04:46 +05:30
root 01044c5b2d removing spurious debug statement 2011-08-24 16:47:29 +05:30
Abhinandan Prateek bd439831ad bug 11181: batching the select statements 2011-08-24 16:34:28 +05:30
Naredula Janardhana Reddy 470ffcb652 bug 11191:
Added global config to enable/disable rp_filter for domR.
   previous commit: d966906374d4a0cb8fa57326a1f7625c871f64fd

   Test Case-1 :
      1) Set network.disable.rpfilter  global config to true
      2) Restart the domR
      3) check the settings reflected in proc filesystem
           - for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 0 , and rest other interfaces should have value of 1
   Test Case-2 :
      1) set network.disable.rpfilter global config to false
      2) Restart the domR
      3) check the settings reflected in proc filesystem
           - for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 1 , and rest other interfaces should also have value of 1
2011-08-24 13:32:07 +05:30
Naredula Janardhana Reddy 145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
frank b3478c377e Full opensource 2011-08-23 19:52:19 -07:00
Sheng Yang fb6fb03175 bug 11214: Don't try to start the running router again
It's very like caused by StartRouterCmd sent to the running router. I can
reproduce it by issue a StartRouterCmd to a running redundant router. And this
patch should the following exception:

Exception: com.cloud.exception.ResourceUnavailableException: Resource
[VirtualNetworkApplianceManagerImpl$$EnhancerByCGLIB$$565b4d45:0] is
unreachable: There are already two redundant routers with IP 10.91.32.126, they
are r-5-VM(5) and r-4-VM(4)

status 11214: resolved fixed
2011-08-23 18:20:34 -07:00
Sheng Yang 2888247b74 Add more debug info 2011-08-23 17:59:54 -07:00
Kelven Yang 4f8a52f94c Move VMware/Premium Secondary storage VM to opensource 2011-08-23 14:43:39 -07:00
alena 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
prachi 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
alena c9e60d703d Fixed listNetwork by id 2011-08-23 01:03:40 -07:00
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
alena c2732850f4 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:35:43 -07:00
alena 0b061529b1 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:34:47 -07:00
alena 31a022c720 Added networkRate parameter to createServiceOffering api command
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2011-08-22 12:05:34 -07:00
alena 033765f93f Added networkRate parameter to createServiceOffering api command 2011-08-22 12:02:08 -07:00
alena 0998b04098 Fixed security issue in listNetworks
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
2011-08-22 10:51:44 -07:00
alena 20a518f3ac Fixed security issue in listNetworks 2011-08-22 10:50:30 -07:00
prachi 8755044ea9 Merge Bug 11186 from 2.2.8mango
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created

Changes:
- We should not check for the cluster 'allocation_state' while starting an
    existing VM provided it has storage already allocated. But if volumes are
    deleted and new storage needs to be allocated, then we will not allow the
VM
    start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:12:15 -07:00
prachi 3d4767c94c Merge Bug 11186 from 2.2.8mango
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created

Changes:
 - We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:02:09 -07:00
anthony 7084c270d3 reversed funtion parameter 2011-08-19 18:48:49 -07:00
anthony 2e2e550cc4 reversed funtion parameter 2011-08-19 18:41:59 -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
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -07:00
frank cbbf80cee3 Use class.getSimpleName in ResourceListener 2011-08-19 17:06:58 -07:00
frank 016700737c Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-19 17:06:48 -07:00
frank 7350d12fff Bug 8966 - Oracle VM (OVM) support
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-19 17:06:35 -07:00
frank 0f109dd037 Introduce new resource life cycle listener 2011-08-19 17:06:12 -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