Commit Graph

2224 Commits

Author SHA1 Message Date
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk c113ea184b Add Internal Lb Provider/Element as a part of adding a physical network 2013-04-12 12:21:24 -07:00
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Murali Reddy 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
Bharat Kumar 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
Alena Prokharchyk af6201257b Internal LB: fixed some bugs in internal lb vm startup process 2013-04-11 16:55:37 -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 eea0ed5c4e Fixes for issues found while testing after the merge 2013-04-11 13:23:46 -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 ec3f844ef1 Correcting the rebase merge issues. 2013-04-11 13:23:15 -07:00
Prachi Damle ee45437036 Build failure fixes after rebase. 2013-04-11 13:23:08 -07:00
Prachi Damle e312158f1c Adding the missing header! 2013-04-11 13:23:06 -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 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
Prachi Damle 119c5ceada API changes for createAffinityGroup 2013-04-11 13:22:26 -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 87e5f5b9a6 Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl 2013-04-10 16:29:57 -07:00
Alena Prokharchyk 53b9c0d142 Internal LB: added @Since to API docs for Internal LB related commands 2013-04-10 16:29:46 -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 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
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
Rohit Yadav 9213fa6f3a CLOUDSTACK-797: Removing cmds CreatePrivateNetworkCmd and DestroyConsoleProxyCmd
Removed as per Kishan. We still don't know if we want to keep:
ListRecurringSnapshotScheduleCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-10 13:21:24 +05:30
Mice Xia 97c2f7d0c4 add API version for vm snapshot related API commands 2013-04-10 12:53:25 +08:00
Chiradeep Vittal 1d70b9ea77 QuickCloud: add a network offering without any services
This can be used to avoid starting up a virtual router simply for the purposes of offering dhcp and dns services
With the QuickCloudNoServices offering, no virtual router will be started up and the vm instance will not get a CloudStack-assigned IP address.
Instead, the VM will simply get whatever IP address is offered by an DHCP service that happens to be running in the same network
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 790d2ce82e QuickCloud: Remove reference to unused code
QuickCloud: remove some dead code in ConsoleProxyManager
2013-04-09 14:45:26 -07:00
Murali Reddy ef2983cc12 region id is not Long, its integer changing the regionId parameter in
ListGlobalLoadBalancerRuleCmd.java
2013-04-09 19:23:13 +05:30
Murali Reddy 9180bd5990 CLOUDSTACK-1834: Events are not generated for registerUserKeys() 2013-04-09 17:45:57 +05:30
Jessica Wang 98bc240d2a Revert "Dedicate Public IP range"
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
2013-04-08 17:15:51 -07:00
Likitha Shetty d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Alena Prokharchyk 42ffac3ae8 CLOUDSTACK-1895: save placeholder nic with not null vmType='DomainRouter' when placeholder is used for the VR ip address 2013-04-04 13:29:17 -07:00
Edison Su f18a1d6f14 fix bunch of bugs related to zone wide storage 2013-04-03 21:51:17 -07:00