3b41d5bee1
Merge branch 'master' into internallb1
...
Conflicts:
server/src/com/cloud/network/NetworkModelImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2013-04-12 15:32:40 -07:00
bb73531fed
Internal Lb: list internal lb vms as a part of listRouters response. Introduced new parameter - role (can be virtual_router or internal_lb_vm)
2013-04-12 15:29:55 -07:00
4b1a9f146c
Fix CLOUDSTACK-1987: Deleted service offering still shows for domain users. Also extend this fix for Disk offering as well.
2013-04-12 13:47:45 -07:00
c113ea184b
Add Internal Lb Provider/Element as a part of adding a physical network
2013-04-12 12:21:24 -07:00
7b4e1953d8
QuickCloud: accidental commit, removing
2013-04-12 12:08:13 -07:00
78c9db79da
InternalLbVm: destroy the internal lb vm when the last rule for the ip is being revoked
2013-04-12 11:07:00 -07:00
8f865c5a90
Dedicate Public IP address range to an account
2013-04-12 23:27:35 +05:30
85b1519fe5
GlobalLoadBalancerResponse should contain the service type details and
...
GSLB rule is defaulted to have source IP as sticky method
2013-04-12 19:27:46 +05:30
38df62865d
CLOUDSTACK-1989: Without this fix you can't query service offerings
...
that don't have a domain id set (null).
Tested via: Called "listServiceOfferings" using a simple perl script,
once with an ID, and once without an ID specified.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-12 14:03:28 +01:00
accfccd83e
Summary: Add support for nested hypervisors to the VmWare resource.
...
Add a flag VmDetailConstants.NESTED_VIRTUALIZATION_FLAG
Add an advanced config uption VmwareEnableNestedVirtualization
Depending on the settings of the flags and the capabilities of the target hypervisor the nested virtualization option will be set on guest VMs. It's a global setting intended only for developers to support cloud-in-a-cloud deployments.
2013-04-12 13:49:42 +02:00
c0419791ed
CLOUDSTACK-1934: NPE with listSupportedNetworkServices
...
For 'connectivity' network service current set of providers (MidoNet,
NiciraNcp) not necessarily part of OSS builds. So handle the case where
there are no providers for a service
2013-04-12 16:47:50 +05:30
580731ccc0
CLOUDSTACK-1534 Disable/Enable-unmanaged/manage cluster is setting CPU overcommit and memory overcommit ratio to 1 (defalut value).
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-12 15:30:02 +05:30
cbcb83b086
fix CLOUDSTACK-1894 User is not able to deploy VMs in a project[permission denied to access the guest network)
2013-04-12 15:39:36 +08:00
3795048fcc
Merge branch 'master' into internallb1
...
Conflicts:
api/src/com/cloud/async/AsyncJob.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/BaseCmd.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-04-11 14:16:33 -07:00
f4c2b53c21
InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)
2013-04-11 13:59:44 -07:00
bfed74c411
Fixing rat. Merge with master missed the header change
2013-04-11 13:37:03 -07:00
fc248cb99c
ACl on affinity group
2013-04-11 13:23:41 -07:00
7201eb9ee4
CLOUDSTACK-1968: affinity_groups: Column 'deployment planner' cannot be null when creating a service offering
...
Added default value to all constructors..
2013-04-11 13:23:37 -07:00
0f565f2167
Fixes to de-couple the AffinityGroupResponse from UserVmResponse, since ApiDiscoveryService breaks, if we nest two response objects into each other.
2013-04-11 13:23:25 -07:00
3403b54773
Added AffinityGroup View in order to include VM details while listing AffinityGroups.
2013-04-11 13:23:23 -07:00
09a6eb735d
Changes to return affinity groups information during listVMsCmd
2013-04-11 13:23:20 -07:00
0b3850c14f
Added cleanup of affinitygroups when a VM is expunging and when the account is deleted.
2013-04-11 13:23:18 -07:00
ee45437036
Build failure fixes after rebase.
2013-04-11 13:23:08 -07:00
c7c899f62d
Fixes after functional tests
...
Conflicts:
client/tomcatconf/commands.properties.in
2013-04-11 13:23:04 -07:00
c8ae2a9d25
API to list planners and set the planner in Service offering
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-04-11 13:22:56 -07:00
fe2a86871f
Changes to add AffinityGroupprocessor, deployVM changes
2013-04-11 13:22:42 -07:00
50f53c86f5
DeleteAffinityGroup API changes
2013-04-11 13:22:34 -07:00
1e205a3d0b
More API changes
2013-04-11 13:22:30 -07:00
76a4b1cf81
InternalLB: added logic for acquiring guest ip address for the Internal LB rule
2013-04-11 12:09:56 -07:00
915e39fbaa
Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl
2013-04-11 10:19:18 -07:00
ca8ac08cf3
CLOUDSTACK-2003: When accounts and domains are deleted, cleanup can fail,
...
leaving instances in eternal expunged state. This happens when a domain is
deleted while a deleted account is cleaning up. The cleanup looks for the domain
of the account and we hit a null pointer. Adding null pointer check.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1365695448 -0600
2013-04-11 09:50:48 -06:00
5cd3608529
Remove the chmod solution and replace with an explicit call to
...
/bin/bash. This way the file will only need read permissions.
2013-04-11 11:30:45 +02:00
20beb7a16c
Internal LB: applyLoadBalancerRules - put not null check for sourceIpAddressId (can be null when Schema is not Public)
2013-04-10 16:58:35 -07:00
87e5f5b9a6
Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl
2013-04-10 16:29:57 -07:00
7b9af28094
InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs:
...
1) configureInternalLoadBalancerElement
2) createInternalLoadBalancerElement
3) listInternalLoadBalancerElements
2013-04-10 16:29:26 -07:00
039e303d4a
InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins.
2013-04-10 16:29:18 -07:00
f0018b4512
Internal LB:
...
1)Added InternalLoadBalancerManager and corresponding Impl
2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well
2013-04-10 16:29:05 -07:00
e344cf250a
InternalLB - removed unused code from LoadBalancerDao
2013-04-10 16:28:53 -07:00
3588f46848
Internal LB - added network-element plugin for internal lb service
2013-04-10 16:28:38 -07:00
76325e6168
Internal Lb:
...
1) When network has both kinds of LB rules - Public and Internal - never send them in the same set to the provider
2) Added extra checks on the provider side to validate if the schema - Public or Internal - is supported.
2013-04-10 16:28:26 -07:00
56c2fe1d37
InternalLB:
...
1) Added new capability for the LB service - LbSchemes. Can take 2 values - Internal and Public.
2) F5 and Netscaler LB providers - changes all LB related methods to accept LoadBalancingRule instead of ? extends FirewallRule.
2013-04-10 16:28:17 -07:00
34bcb2d026
InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation
2013-04-10 16:28:06 -07:00
9ab31e11f7
InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id
2013-04-10 16:27:56 -07:00
08f855d4e4
InternalLB:
...
1) Added new set of Interfaces - including the new VO - for the internal load balancer
2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-04-10 16:27:33 -07:00
a4a059c043
CLOUDSTACK-779 Egress firewall rules support for Juniper SRX
2013-04-10 10:54:04 -07:00
ee0a91d111
Fixed the issue - VM deployment for local service offering for Root and with data disk(shared), was deploying data disk to local disk too. Currently there is no way to let the planner know multiple pool information, hence letting the planner search for a pool always during VM deployment.
2013-04-10 10:47:50 -07:00
c8f2003138
CLOUDSTACK-1862 Added vm ip address info in the list PF rules response
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-10 14:26:36 +05:30
b646e43a1a
use hypervisor capabilities to control if vm snapshot is enabled for hypervisors
2013-04-10 12:36:42 +08:00
bd7a38957a
1)use vmsnapshot.create.wait to control vmsnapshot timeout 2)remove global configuration vmsnapshot.expunge.interval and vmsnapshot.expunge.workers since vmsnapshot expunge is synchronous
2013-04-10 11:35:58 +08:00
d4e2aa32c6
CLOUDSTACK-1675: VMSnapshot: ListVMSnapshotsCmd should not display Domain ID in the Error Message
...
Description:
Replace domain db id by uuid in exception message.
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-04-10 11:35:58 +08:00
Alena Prokharchyk
Min Chen
Chiradeep Vittal
Likitha Shetty
Murali Reddy
Ryan Dietrich
Hugo Trippaers
Bharat Kumar
Mice Xia
Prachi Damle
Marcus Sorensen
Hugo Trippaers
Jayapal
Vijayendra Bhamidipati