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

5 Commits

Author SHA1 Message Date
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
sanjeevneelarapu 53e496517e CLOUDSTACK-702: Tests for Multiple IP Ranges-R4 
Add ip range overlapped with two ip ranges in the exiting cidr

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-05-08 14:37:29 +05:30
sanjeevneelarapu 33ff5e9107 CLOUDSTACK-702: Tests for Multiple IP Ranges 
1.Deleting IP Range from the existing CIDR
2.Add non-contiguous guest IP range in new CIDR
3.Add overlapped guest IP range in existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-05-07 13:13:55 -07:00
sanjeevneelarapu 70c936bb85 CLOUDSTACK-702: Tests for Multiple IP Ranges 
1.Deleting IP Range from the existing CIDR
2.Add non-contiguous guest IP range in new CIDR
3.Add overlapped guest IP range in existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-05-06 14:28:32 +05:30
sanjeevneelarapu b2fdd5e2a2 CLOUDSTACK-702: Tests for Multiple IP Ranges 
1. Adding a cidr in existing subnet
2. Adding a cidr in new subnet

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-04-29 11:24:40 +05:30