From e9fb9065991a5063216f97f37082287b1b97a4e9 Mon Sep 17 00:00:00 2001
From: SrikanteswaraRao Talluri <talluri@apache.org>
Date: Fri, 25 Apr 2014 18:08:47 +0530
Subject: [PATCH] CLOUDSTACK-6511: fixed for bvt and component test failures

---
 test/integration/smoke/test_nic.py     | 2 +-
 test/integration/smoke/test_vm_ha.py   | 6 +++---
 test/integration/smoke/test_volumes.py | 2 +-
 tools/marvin/marvin/codes.py           | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index 5c72607f285..abfe443ca71 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -124,7 +124,7 @@ class TestNic(cloudstackTestCase):
         except Exception as ex:
             self.debug("Exception during NIC test SETUP!: " + str(ex))
 
-    @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg", "provisioning"])
+    @attr(tags = ["devcloud",  "smoke", "basic", "sg", "provisioning"])
     def test_01_nic(self):
         #TODO: SIMENH: add validation
         """Test to add and update added nic to a virtual machine"""
diff --git a/test/integration/smoke/test_vm_ha.py b/test/integration/smoke/test_vm_ha.py
index ae5b51f5926..197814d86ef 100644
--- a/test/integration/smoke/test_vm_ha.py
+++ b/test/integration/smoke/test_vm_ha.py
@@ -25,13 +25,13 @@ from marvin.cloudstackTestCase import cloudstackTestCase
 #Import Integration Libraries
 
 #base - contains all resources as entities and defines create, delete, list operations on them
-from marvin.integration.lib.base import Account, VirtualMachine, Cluster, Host, ServiceOffering, Configurations, SimulatorMock
+from marvin.lib.base import Account, VirtualMachine, Cluster, Host, ServiceOffering, Configurations, SimulatorMock
 
 #utils - utility classes for common cleanup, external library wrappers etc
-from marvin.integration.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources
 
 #common - commonly used methods for all tests are listed here
-from marvin.integration.lib.common import get_zone, get_domain, get_template
+from marvin.lib.common import get_zone, get_domain, get_template
 
 from nose.plugins.attrib import attr
 
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index ecce6e3a733..7f5c4f3c061 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -51,7 +51,7 @@ class TestCreateVolume(cloudstackTestCase):
                                     cls.services["disk_offering"]
                                     )
         cls.sparse_disk_offering = DiskOffering.create(
-                                    cls.api_client,
+                                    cls.apiclient,
                                     cls.services["sparse_disk_offering"]
                                     )
         cls.custom_disk_offering = DiskOffering.create(
diff --git a/tools/marvin/marvin/codes.py b/tools/marvin/marvin/codes.py
index 4d44c58ade9..28e907cbcd8 100644
--- a/tools/marvin/marvin/codes.py
+++ b/tools/marvin/marvin/codes.py
@@ -74,3 +74,5 @@ ADMIN = 1
 DOMAIN_ADMIN = 2
 USER = 0
 XEN_SERVER = "XenServer"
+ADMIN_ACCOUNT='ADMIN_ACCOUNT'
+USER_ACCOUNT='USER_ACCOUNT'