Commit Graph

4 Commits

Author SHA1 Message Date
SrikanteswaraRao Talluri 798a6aa2e3 Marvin + test changes from master Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 404ac549bf)

Conflicts:
	test/integration/smoke/test_vm_iam.py
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/lib/base.py
2014-07-28 17:40:56 +02:00
sanjeevneelarapu ce479ef0d2 CLOUDSTACK-702: Tests for Multiple IP Ranges 1. Removed advanced tag from all the tests. At the movement scripts support only basic zone 2. Added a test to deploy guest vm after adding ip range in new CIDR
CLOUDSTACK-702: Removed test for deploying vm after adding new cidr
1.This test would block parallel execution of remianing tests
2.Removed list_Routers proc and unused code
3.Added few more debug statements

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit daaec56d40)
2013-09-06 15:27:59 +05:30
sanjeevneelarapu 7d380423b5 CLOUDSTACK-702: Tests for Multiple IP Ranges
1. Add ip range super set to existing CIDR
2. Add ip range subset to existing CIDR

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 15:52:54 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30