Commit Graph

9 Commits

Author SHA1 Message Date
Girish Shilamkar be87c5c5fb Re-enabling fixed test cases
(cherry picked from commit 5863ab826e)
2014-07-28 23:12:52 +02:00
Santhosh Edukulla 45db2348de CLOUDSTACK-6914: Fixed the Issue
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit 54e4c07528)
2014-07-28 23:12:47 +02:00
santhosh e75b1acf05 CLOUDSTACK-6736: Added version informatoin, fixed data corruption, regression issues.
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit e5de1cb7c2)
2014-07-28 23:12:42 +02:00
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
SrikanteswaraRao Talluri 14796783fd 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-28 15:39:22 +05:30
Girish Shilamkar b544669a84 CLOUDSTACK-5497: Fix test_guest_vlan_range.py to get free vlan range 2013-12-24 11:11:17 +05:30
Sheng Yang b96fea2e06 Automation: BVT: Fix test_guest_vlan_range.py due to updated API 2013-08-02 16:47:32 -07:00
Prasanna Santhanam 80c2ea769e Fixing merge markers introduced by conflict from 2660a6
test had conflict markers as a result of an improper merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-14 14:35:45 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30