12 Commits

Author SHA1 Message Date
Santhosh Edukulla
7c15f148da CLOUDSTACK-6914: Fixed the mentioned issue
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2014-06-17 14:26:44 +05:30
Bharat Kumar
96272f4cde CLOUDSTACK-6776: Removed hard coded vlan ids from BVT test_non_contiguous_vlan.py
Conflicts:
	test/integration/smoke/test_non_contigiousvlan.py
2014-06-05 11:33:08 +05:30
SrikanteswaraRao Talluri
0e223d6787 Merge branch 'master' into marvin
Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py
2014-04-08 17:53:37 +05:30
SrikanteswaraRao Talluri
102c1bc9c8 CLOUDSTACK-6125: added smoke tests with following tags 1. selfservice - tests which can be run on simulator. 2. provisioning - tests that need actual hypervisor resource.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-25 15:43:05 +05:30
Santhosh Edukulla
bf72441d13 CLOUDSTACK-6006: Remove integration folder and lib 2014-02-04 12:01:58 +05:30
Girish Shilamkar
6c5b1670b2 CLOUDSTACK-5925: Removed incorrect import 2014-01-27 19:14:45 -05:00
Girish Shilamkar
7305063fb4 CLOUDSTACK-5925: get_*() functionality changed in marvin, changed BVT too. 2014-01-28 11:12:24 +05:30
Bharat Kumar
eaeef9e994 CLOUDSTACK-3753 fixed the test test_non_contigiousvlan.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 6e83a54ffbf69e46a79fbaf0be63e63092385b65)
2013-08-02 16:34:10 +05:30
Prasanna Santhanam
3f5c1c6da3 CLOUDSTACK-3384: Fix the vlan range < 4096
VLAN ranges beyond 4095 are properly handled. Fix the test to accomdate
this change

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-11 09:41:17 +05:30
Nitin Mehta
c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Prasanna Santhanam
a1912d9ce2 Refactoring vlan and globalsetting tests
Refactoring the vlan and global_setting tests to use the marvin
libraries instead of command classes.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-22 19:35:22 +05:30
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