etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,698 Commits 342 Branches 328 Tags 925 MiB
Commit Graph

483 Commits

Author SHA1 Message Date
Alena Prokharchyk 56d94fc074 Merge branch 'master' into internallb1 
Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2013-05-09 10:21:34 -07:00
Rajesh Battala 2e21060028 CLOUDSTACK-869 nTier Apps 2.0 : Support NetScalar as external LB provider 2013-05-09 15:23:00 +05:30
Mice Xia 6ef615e40d fix bug CLOUDSTACK-2341 remove network from VM is not removing PF/LB/static nat rules for the VM 2013-05-09 11:04:30 +08:00
Alena Prokharchyk 1b8a6986a6 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/com/cloud/network/NetworkModel.java
	api/src/com/cloud/network/rules/LoadBalancerContainer.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
	client/tomcatconf/commands.properties.in
	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkModelImpl.java
	server/test/resources/appLoadBalancer.xml
	setup/db/db/schema-410to420.sql
	test/integration/component/test_multiple_ip_ranges.py
	test/integration/smoke/test_guest_vlan_range.py
	tools/marvin/marvin/integration/lib/base.py
 2013-05-08 13:29:43 -07:00
Alena Prokharchyk 43e1667f90 Moved all DAOs and VOs to the cloud-engine-schema project 2013-05-07 14:31:56 -07:00
Alex Huang e9953cd1a8 Fixed up unit testing to use only an in class TestConfiguration 2013-05-07 13:16:43 -07:00
Alex Huang 6727571403 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-07 13:15:33 -07:00
Alena Prokharchyk a153373c7e CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack 2013-05-07 13:15:30 -07:00
Likitha Shetty d5cd3f7e00 Dedicate guest vlan range to account 2013-05-07 13:13:54 -07:00
Kelven Yang b3dce64577 fix unitest 2013-05-07 10:59:06 -07:00
Alena Prokharchyk b17885f0f6 InternalLb: some fixes to the unittest 2013-05-07 09:55:47 -07:00
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Alex Huang 074df0b415 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00
Alena Prokharchyk b29449b4b7 CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack 2013-05-06 11:46:43 -07:00
Likitha Shetty c8d843241e Dedicate guest vlan range to account 2013-05-06 10:02:41 +05:30
Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-05-03 12:50:59 -07:00
Harikrishna Patnala 38b4f84f17 CLOUDSTACK-2146: system vm scaleup failed ;{ "scalevirtualmachineresponse" : {"errorcode":530,"cserrorcode":9999,"errortext":"Failed to scale vm"} } 
Only response generation for system vm scale up failed so fixed by changing the response object.

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-05-03 16:49:08 +05:30
Murali Reddy a3a5862301 CLOUDSTACK-2317: NPE while cloudstack trying to get system ip and enable 
static nat for the vm VM

splitting enableStaticNat() method in to a service and manager layer
method. So as to ensure action event annotation is present only on
service layer method.
 2013-05-03 15:37:25 +05:30
Jayapal 1f1467974f CLOUDSTACK-1828 Source Nat on private gateway feature 2013-05-02 15:40:15 +05:30
Alena Prokharchyk 8c8845bf77 Merge branch 'master' into internallb1 2013-05-01 10:39:10 -07:00
Harikrishna Patnala 1cb9bd531f CLOUDSTACK-2180: restoreVirtualMachine returns no password if the template is password enabled 
New password is generated as part of restore vm(passwd enabled template) and send new password on VR

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-05-01 12:29:08 +05:30
Alena Prokharchyk 7b24a7640c Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-29 16:12:10 -07:00
Harikrishna Patnala deaf9106ca CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200 
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
 2013-04-29 14:11:51 +05:30
Alena Prokharchyk 63babe4b7e InternalLb: 
1) Added unittests for InternalLoadBalancerVMService
2) Added unittests for InternalLoadBalancerElementService
 2013-04-26 15:22:19 -07:00
Jayapal d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-25 15:16:26 +05:30
Vijayendra Bhamidipati b0caae6b33 CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements 
Description:

	Currently, userdata sent over to the DeployVMCmd and
	updateVMCmd commands can be upto 2K in length, whether
	sent over GET or POST. We remove this limitation for
	POST to change this limit to 32K. Also enabling lazy
	load on userdata to improve performance during reads
	of large sized userdata from user VM records.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-04-24 13:42:38 +05:30
Mice Xia 434525b836 fix CLOUDSTACK-2149 and related unit test 2013-04-24 11:12:34 +08:00
Alena Prokharchyk ca2fc30655 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-23 16:58:28 -07:00
Alena Prokharchyk 8057567aaa Internallb: more unittests for ApplicationLoadBalancerService 2013-04-23 15:13:30 -07:00
Alena Prokharchyk 35c0273b85 InternalLb: unittests for ApplicationLoadBalancerService 2013-04-19 23:31:54 -07:00
Alena Prokharchyk 2ca7584994 Fixed VPC api unittests 2013-04-19 11:26:32 -07:00
Devdeep Singh 21ce3befc8 Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-19 11:36:42 +05:30
Harikrishna Patnala eae22d2ffa CLOUDSTACK-741: Granular Global Parameters 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-19 10:36:52 +05:30
Alena Prokharchyk 0cfe96bd00 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/network/IpAddress.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-17 15:51:05 -07:00
Bharat Kumar 8b40e393b8 Cloudstack-701 Support for non contiguous vlan ranges. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-17 10:14:42 +05:30
Prachi Damle 77ccc22723 Pulling back the changes to ServiceOffering to add a planner - these changes will be part of a separate feature branch 2013-04-16 15:17:01 -07:00
Likitha Shetty 9ad50272c1 Create Public IP address - If system account is specified do nothing 
Dedicate Public IP address - If system account is specified fail the request
 2013-04-17 02:16:07 +05:30
Alena Prokharchyk b7709b89ff Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network 2013-04-16 11:33:42 -07:00
Alena Prokharchyk 014689e45e Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/network/Network.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-16 09:55:45 -07:00
Alena Prokharchyk b3b16bae48 InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network 2013-04-16 09:50:07 -07:00
Alena Prokharchyk a4fc1d7d65 Internal LB: 
1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB
 2013-04-15 14:42:20 -07:00
Alena Prokharchyk 4530cebf2b InternalLbVm: support for start/stop Internal lb vm 2013-04-15 11:36:52 -07:00
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in 
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
 2013-04-14 17:50:15 +05:30
Pascal Borreli 20614598bf Fixed typos 
Signed-off-by: Milamber <milamber@apache.org>
 2013-04-13 13:28:32 +00:00
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
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Kelven Yang 370a7fdfd6 CLOUDSTACK-1884: fix the unit test issue 2013-04-11 17:23:49 -07:00
Prachi Damle 4958070b90 Reopening CLOUDSTACK-1884. Adding back the unit test, but still excluded due to component loading issue. 2013-04-11 15:43:54 -07:00
Prachi Damle 69f49e76cf Excluding this unit test for a while, since it fails because ComponentContext.initComponentsLifeCycle(); is failing when DB is unavailable 2013-04-11 14:50:35 -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