Alena Prokharchyk
1db240c2b6
InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl
2013-04-11 14:23:55 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
Prachi Damle
bfed74c411
Fixing rat. Merge with master missed the header change
2013-04-11 13:37:03 -07:00
Prachi Damle
6137d327a8
Fixes to unit-test dues to changes in master
2013-04-11 13:23:48 -07:00
Prachi Damle
eea0ed5c4e
Fixes for issues found while testing after the merge
2013-04-11 13:23:46 -07:00
Prachi Damle
bbf7900732
Adding pretty toString() to AffinityGroup
2013-04-11 13:23:43 -07:00
Prachi Damle
fc248cb99c
ACl on affinity group
2013-04-11 13:23:41 -07:00
Prachi Damle
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
Prachi Damle
d38bf8a10c
More log statements to debug
2013-04-11 13:23:27 -07:00
Prachi Damle
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
Prachi Damle
3403b54773
Added AffinityGroup View in order to include VM details while listing AffinityGroups.
2013-04-11 13:23:23 -07:00
Prachi Damle
09a6eb735d
Changes to return affinity groups information during listVMsCmd
2013-04-11 13:23:20 -07:00
Prachi Damle
0b3850c14f
Added cleanup of affinitygroups when a VM is expunging and when the account is deleted.
2013-04-11 13:23:18 -07:00
Prachi Damle
b633dde744
Adding a unit test for the new affinity groups API
2013-04-11 13:23:11 -07:00
Prachi Damle
ee45437036
Build failure fixes after rebase.
2013-04-11 13:23:08 -07:00
Prachi Damle
c7c899f62d
Fixes after functional tests
...
Conflicts:
client/tomcatconf/commands.properties.in
2013-04-11 13:23:04 -07:00
Prachi Damle
bb9bdf0173
Changes to make affinity group types configurable.
2013-04-11 13:23:01 -07:00
Prachi Damle
708157d33f
API changes to expose the commands
2013-04-11 13:22:59 -07:00
Prachi Damle
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
Prachi Damle
e9300d2676
DAO constructor should be lightweight to make Spring DI faster.
2013-04-11 13:22:51 -07:00
Prachi Damle
bf9221a370
Separated out host anti-affinity as a plugin.
2013-04-11 13:22:45 -07:00
Prachi Damle
fe2a86871f
Changes to add AffinityGroupprocessor, deployVM changes
2013-04-11 13:22:42 -07:00
Prachi Damle
1aed5bf9c2
ListAffinityGroups API changes
2013-04-11 13:22:38 -07:00
Prachi Damle
50f53c86f5
DeleteAffinityGroup API changes
2013-04-11 13:22:34 -07:00
Prachi Damle
1e205a3d0b
More API changes
2013-04-11 13:22:30 -07:00
Alena Prokharchyk
76a4b1cf81
InternalLB: added logic for acquiring guest ip address for the Internal LB rule
2013-04-11 12:09:56 -07:00
Alena Prokharchyk
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
Marcus Sorensen
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
Hugo Trippaers
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
Alena Prokharchyk
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
Alena Prokharchyk
87e5f5b9a6
Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl
2013-04-10 16:29:57 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
e344cf250a
InternalLB - removed unused code from LoadBalancerDao
2013-04-10 16:28:53 -07:00
Alena Prokharchyk
3588f46848
Internal LB - added network-element plugin for internal lb service
2013-04-10 16:28:38 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
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
Alena Prokharchyk
9ab31e11f7
InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id
2013-04-10 16:27:56 -07:00
Alena Prokharchyk
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
Jayapal
a4a059c043
CLOUDSTACK-779 Egress firewall rules support for Juniper SRX
2013-04-10 10:54:04 -07:00
Prachi Damle
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
Jayapal
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
Mice Xia
b646e43a1a
use hypervisor capabilities to control if vm snapshot is enabled for hypervisors
2013-04-10 12:36:42 +08:00
Mice Xia
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
Vijayendra Bhamidipati
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
Kelven Yang
913f73ab6b
Apply patch https://reviews.apache.org/r/10137/
2013-04-09 17:29:21 -07:00
Chiradeep Vittal
2e6c65fd34
QuickCloud: sanitize logs for normal running of agents outside systemvm
2013-04-09 14:45:27 -07:00