You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/09/19 22:13:08 UTC

[3/3] git commit: updated refs/heads/master to 7877f3f

CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl related test cases.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7877f3f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7877f3f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7877f3f9

Branch: refs/heads/master
Commit: 7877f3f9603b967680cf9480cb6e51845a81ddd8
Parents: dbb70fa
Author: Sangeetha Hariharan <sa...@citrix.com>
Authored: Fri Sep 19 14:51:10 2014 -0700
Committer: Sangeetha Hariharan <sa...@citrix.com>
Committed: Fri Sep 19 16:00:00 2014 -0700

----------------------------------------------------------------------
 .../component/test_acl_isolatednetwork.py       |  66 +++----
 .../test_acl_isolatednetwork_delete.py          |  20 +-
 .../component/test_acl_listsnapshot.py          | 190 +++++++++----------
 test/integration/component/test_acl_listvm.py   | 190 +++++++++----------
 .../component/test_acl_listvolume.py            | 190 +++++++++----------
 .../component/test_acl_sharednetwork.py         |  56 +++---
 ..._acl_sharednetwork_deployVM-impersonation.py | 102 +++++-----
 7 files changed, 407 insertions(+), 407 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7877f3f9/test/integration/component/test_acl_isolatednetwork.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_acl_isolatednetwork.py b/test/integration/component/test_acl_isolatednetwork.py
index 59119f1..b1e2575 100644
--- a/test/integration/component/test_acl_isolatednetwork.py
+++ b/test/integration/component/test_acl_isolatednetwork.py
@@ -357,7 +357,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to createNetwork as admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_01_createNetwork_admin(self):
 
 	"""
@@ -380,7 +380,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Admin User is not able to create a network for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_02_createNetwork_admin_foruserinsamedomain(self):
 
 	"""
@@ -404,7 +404,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Admin User is not able to create a network for other users in his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_03_createNetwork_admin_foruserinotherdomain(self):
 
 	"""
@@ -430,7 +430,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to createNetwork as domain admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_04_createNetwork_domaindmin(self):
 
 	"""
@@ -453,7 +453,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Domain admin User is not able to create a network for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_05_createNetwork_domaindmin_foruserinsamedomain(self):
 
 	"""
@@ -477,7 +477,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to create a network for other users in his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_06_createNetwork_domaindmin_foruserinsubdomain(self):
 
 	"""
@@ -501,7 +501,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to create a network for other users in his sub domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_07_createNetwork_domaindmin_forcrossdomainuser(self):
 
 	"""
@@ -528,7 +528,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to createNetwork as regular user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_08_createNetwork_user(self):
 
 	"""
@@ -551,7 +551,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "User is not able to create a network for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_09_createNetwork_user_foruserinsamedomain(self):
 
 	"""
@@ -577,7 +577,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                 if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.UNABLE_TO_LIST_NETWORK_ACCOUNT):
         	    self.fail("Error message validation failed when when User tries to create network for other users in his domain ")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_10_createNetwork_user_foruserinotherdomain(self):
 
 	"""
@@ -606,7 +606,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to Deploying VM in a network as admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_11_deployvm_admin(self):
 
 	"""
@@ -630,7 +630,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Admin User is not able to deploy VM in his own network")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_12_deployvm_admin_foruserinsamedomain(self):
 
 	"""
@@ -655,7 +655,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Admin User is not able to deploy VM for users in his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_13_deployvm_admin_foruserinotherdomain(self):
 
 	"""
@@ -680,7 +680,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Admin User is not able to deploy VM for users users in other domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self):
 
 	"""
@@ -708,7 +708,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to deploying VM as domain admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_14_deployvm_domaindmin(self):
 
 	"""
@@ -732,7 +732,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Domain admin User is not able to deploy VM for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_15_deployvm_domaindmin_foruserinsamedomain(self):
 
 	"""
@@ -756,7 +756,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to deploy VM for other users in his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_16_deployvm_domaindmin_foruserinsubdomain(self):
 
 	"""
@@ -780,7 +780,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to deploy vm for himself")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_17_deployvm_domaindmin_forcrossdomainuser(self):
 
 	"""
@@ -807,7 +807,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                 if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN):
         	    self.fail("Error message validation failed when Domain admin tries to deploy vm for users not in hos domain ")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_17_1_deployvm_domainadmin_foruserinotherdomain_crossnetwork(self):
 
 	"""
@@ -835,7 +835,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to deploying VM as regular user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_18_deployvm_user(self):
 
 	"""
@@ -858,7 +858,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "User is not able to deploy vm for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_19_deployvm_user_foruserinsamedomain(self):
 
 	"""
@@ -885,7 +885,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                 if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
         	    self.fail("Error message validation failed when Regular user tries to deploy vm for other users in his domain ")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_20_deployvm_user_foruserincrossdomain(self):
 
 	"""
@@ -912,7 +912,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                 if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
         	    self.fail("Error message validation failed when Regular user tries to deploy vm for users not in his domain ")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_20_1_deployvm_user_incrossnetwork(self):
 
 	"""
@@ -938,7 +938,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to restart Network as admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_21_restartNetwork_admin(self):
 
 	"""
@@ -954,7 +954,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Admin User is not able to restart network he owns")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_22_restartNetwork_admin_foruserinsamedomain(self):
 
 	"""
@@ -969,7 +969,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Admin User is not able to restart network owned by users his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_23_restartNetwork_admin_foruserinotherdomain(self):
 
 	"""
@@ -986,7 +986,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating to restart Network as domain admin user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_24_restartNetwork_domaindmin(self):
 
 	"""
@@ -1002,7 +1002,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "Domain admin User is not able to restart network for himself")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_25_restartNetwork_domaindmin_foruserinsamedomain(self):
 
 	"""
@@ -1016,7 +1016,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to restart network for other users in his domain")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_26_restartNetwork_domaindmin_foruserinsubdomain(self):
 
 	"""
@@ -1030,7 +1030,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     True,
                     "Domain admin User is not able to restart network he owns")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_27_restartNetwork_domaindmin_forcrossdomainuser(self):
 
 	"""
@@ -1049,7 +1049,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
 
 ## Test cases relating restart network as regular user
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_28_restartNetwork_user(self):
 
 	"""
@@ -1064,7 +1064,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                     "User is not able to restart network he owns")
 
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_29_restartNetwork_user_foruserinsamedomain(self):
 
 	"""
@@ -1081,7 +1081,7 @@ class TestIsolatedNetwork(cloudstackTestCase):
                 if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
         	    self.fail("Error message validation failed when Regular user tries to restart network for users in his domain ")
 
-    @attr(tags=[ "advanced"],required_hardware="false")
+    @attr("simulator_only",tags=[ "advanced"],required_hardware="false")
     def test_30_restartNetwork_user_foruserinotherdomain(self):
 
 	"""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7877f3f9/test/integration/component/test_acl_isolatednetwork_delete.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_acl_isolatednetwork_delete.py b/test/integration/component/test_acl_isolatednetwork_delete.py
index 3d09390..9d34e88 100644
--- a/test/integration/component/test_acl_isolatednetwork_delete.py
+++ b/test/integration/component/test_acl_isolatednetwork_delete.py
@@ -343,7 +343,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
 
 ## Test cases relating to delete Network as admin user
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_admin(self):
 	"""
         Validate that Admin should be able to delete network he owns
@@ -359,7 +359,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     "Admin User is not able to restart network he owns")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_admin_foruserinsamedomain(self):
 
 	"""
@@ -375,7 +375,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     None,
                     "Admin User is not able to delete network owned by users his domain")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_admin_foruserinotherdomain(self):
 
         # Validate that Admin should be able to delete network for users in his sub domain
@@ -391,7 +391,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
 
 ## Test cases relating to delete Network as domain admin user
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_domaindmin(self):
 	"""
         Validate that Domain admin should be able to delete network for himslef
@@ -407,7 +407,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     "Domain admin User is not able to delete a network he owns")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_domaindmin_foruserinsamedomain(self):
 
 	"""
@@ -422,7 +422,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     None,
                     "Domain admin User is not able to delete a network that is owned by user in the same domain")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_domaindmin_foruserinsubdomain(self):
 
 	"""
@@ -438,7 +438,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     None,
                     "Domain admin User is not able to delete a network that is owned by user in the subdomain")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_domaindmin_forcrossdomainuser(self):
 
 	"""
@@ -458,7 +458,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
 
 ## Test cases relating deleting network as regular user
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_user(self):
 
 	"""
@@ -475,7 +475,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
                     "User is not able to delete a network he owns")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_user_foruserinsamedomain(self):
 
 	"""
@@ -492,7 +492,7 @@ class TestIsolatedNetworkDelete(cloudstackTestCase):
 		if not CloudstackAclException.verifyMsginException(e,CloudstackAclException.NO_PERMISSION_TO_OPERATE_ACCOUNT):
                     self.fail("Regular user is allowed to delete network for users in his domain ")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_deleteNetwork_user_foruserinotherdomain(self):
 
 	"""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7877f3f9/test/integration/component/test_acl_listsnapshot.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_acl_listsnapshot.py b/test/integration/component/test_acl_listsnapshot.py
index ac8748d..394072d 100644
--- a/test/integration/component/test_acl_listsnapshot.py
+++ b/test/integration/component/test_acl_listsnapshot.py
@@ -384,7 +384,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true" parameter as domain admin
@@ -417,7 +417,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true"i and isrecusriv="true" parameter as domain admin
@@ -450,7 +450,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="true" and isrecusriv="false" parameter as domain admin
@@ -485,7 +485,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  with listall=false
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_false(self):
 	"""
 	Test listing of Snapshots by passing listall="false" parameter as domain admin
@@ -510,7 +510,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as domain admin
@@ -535,7 +535,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as domain admin
@@ -561,7 +561,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  without passing listall paramter 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin(self):
 	"""
 	Test listing of Snapshots by passing no parameter as domain admin
@@ -586,7 +586,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_rec_true(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="true" parameter as domain admin
@@ -611,7 +611,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="false" parameter as domain admin
@@ -638,7 +638,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases when domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing domainId and listall="true" parameter as domain admin
@@ -665,7 +665,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainId ,listall="true" and isrecursive="true" parameter as domain admin
@@ -693,7 +693,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainId ,listall="true" and isrecursive="false" parameter as domain admin
@@ -723,7 +723,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  when domainId is passed with listall=false
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainId ,listall="false" parameter as domain admin
@@ -750,7 +750,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainId ,listall="false" and isrecursive="true" parameter as domain admin
@@ -778,7 +778,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainId ,listall="false" and isrecursive="false" parameter as domain admin
@@ -808,7 +808,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  when domainId is passed with no listall parameter
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid(self):
 	"""
 
@@ -835,7 +835,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainId and isrecursive="true" parameter as domain admin
@@ -863,7 +863,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainId and isrecursive="false" parameter as domain admin
@@ -893,7 +893,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  when account and domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and listall="true" parameter as domain admin
@@ -918,7 +918,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and listall="true" and isrecursive="true" parameter as domain admin
@@ -943,7 +943,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId , listall="true" and isrecursive="false" parameter as domain admin
@@ -971,7 +971,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  when account and domainId is passed with listall=false
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and listall="false" parameter as domain admin
@@ -996,7 +996,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and listall="false" and isrecursive="true" parameter as domain admin
@@ -1021,7 +1021,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId , listall="false" and isrecursive="false" parameter as domain admin
@@ -1048,7 +1048,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Domain Admin - Test cases  when account and domainId is passed with listall not passed
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId parameter as domain admin
@@ -1073,7 +1073,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_rec_true(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and isrecursive="true" parameter as domain admin
@@ -1098,7 +1098,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_domainid_accountid_rec_false(self):
 	"""
 	Test listing of Snapshots by passing account ,domainId and isrecursive="false" parameter as domain admin
@@ -1125,7 +1125,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true" parameter as admin
@@ -1161,7 +1161,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true" and isrecusrive="true" parameter as admin
@@ -1197,7 +1197,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="true" and isrecusrive="false" parameter as admin
@@ -1234,7 +1234,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  with listall=false
  
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_false(self):
 	"""
 	Test listing of Snapshots by passing listall="false" parameter as admin
@@ -1259,7 +1259,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as admin
@@ -1285,7 +1285,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as admin
@@ -1314,7 +1314,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  without passing listall paramter 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin(self):
 	"""
 	Test listing of Snapshots by passing no parameter as admin
@@ -1340,7 +1340,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_rec_true(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="true" parameter as admin
@@ -1365,7 +1365,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_rec_false(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="false" parameter as admin
@@ -1392,7 +1392,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases when domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing domainid and listall="true" parameter as admin
@@ -1419,7 +1419,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid , listall="true" and isrecusrive="true" parameter as admin
@@ -1447,7 +1447,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid, listall="true" and isrecusrive="false" parameter as admin
@@ -1477,7 +1477,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  when domainId is passed with listall=false
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainid, listall="false" parameter as admin
@@ -1504,7 +1504,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid, listall="false" and isrecusrive="true" parameter as admin
@@ -1532,7 +1532,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid, listall="false" and isrecusrive="false" parameter as admin
@@ -1562,7 +1562,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  when domainId is passed with no listall parameter
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid(self):
 	"""
 	Test listing of Snapshots by passing domainid parameter as admin
@@ -1589,7 +1589,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid and isrecusrive="true" parameter as admin
@@ -1617,7 +1617,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid and isrecusrive="false" parameter as admin
@@ -1647,7 +1647,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  when account and domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "true" parameter as admin
@@ -1672,7 +1672,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "true" and isrecusrive="true" parameter as admin
@@ -1697,7 +1697,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "true" and isrecusrive="false" parameter as admin
@@ -1725,7 +1725,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  when account and domainId is passed with listall=false
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "false" parameter as admin
@@ -1750,7 +1750,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin
@@ -1775,7 +1775,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account ,listall = "false" and isrecusrive="false" parameter as admin
@@ -1803,7 +1803,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## ROOT Admin - Test cases  when account and domainId is passed with listall not passed
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid(self):
 	"""
 	Test listing of Snapshots by passing domainid,account parameter as admin
@@ -1828,7 +1828,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account and isrecusrive="true" parameter as admin
@@ -1853,7 +1853,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_rootadmin_domainid_accountid_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account and isrecusrive="false" parameter as admin
@@ -1881,7 +1881,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Regular User - Test cases  with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true"  parameter as regular user
@@ -1906,7 +1906,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="true" and isrecusrive="true" parameter as regular user
@@ -1931,7 +1931,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="true" and isrecusrive="false" parameter as regular user
@@ -1958,7 +1958,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  with listall=false
  
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="false" parameter as regular user
@@ -1983,7 +1983,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="true" parameter as regular user
@@ -2009,7 +2009,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing listall="false" and isrecusrive="false" parameter as regular user
@@ -2038,7 +2038,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  without passing listall paramter 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser(self):
 	"""
 	Test listing of Snapshots by passing no parameter as regular user
@@ -2064,7 +2064,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_rec_true(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="true" parameter as regular user
@@ -2089,7 +2089,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_rec_false(self):
 	"""
 	Test listing of Snapshots by passing isrecusrive="false" parameter as regular user
@@ -2116,7 +2116,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases when domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="true" parameter as regular user
@@ -2141,7 +2141,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="true" and isrecusrive="true" parameter as regular user
@@ -2166,7 +2166,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="true" and isrecusrive="false" parameter as regular user
@@ -2194,7 +2194,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  when domainId is passed with listall=false
  
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="false" parameter as regular user
@@ -2220,7 +2220,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="false" and isrecusrive="true" parameter as regular user
@@ -2247,7 +2247,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,listall="false" and isrecusrive="false" parameter as regular user
@@ -2275,7 +2275,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  when domainId is passed with no listall parameter
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid(self):
 	"""
 	Test listing of Snapshots by passing domainid parameter as regular user
@@ -2301,7 +2301,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid and isrecusrive="true" parameter as regular user
@@ -2328,7 +2328,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid__rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,isrecusrive="false" parameter as regular user
@@ -2356,7 +2356,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  when account and domainId is passed with listall =true 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="true" parameter as regular user
@@ -2381,7 +2381,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="true" and isrecusrive="true" parameter as regular user
@@ -2406,7 +2406,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_true_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="true" and isrecusrive="false" parameter as regular user
@@ -2434,7 +2434,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User - Test cases  when account and domainId is passed with listall=false
  
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="false" parameter as regular user
@@ -2460,7 +2460,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="false" and isrecusrive="true" parameter as regular user
@@ -2485,7 +2485,7 @@ class TestSnapshotList(cloudstackTestCase):
 			True,
 			"Account access check failed!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_listall_false_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account,listall="false" and isrecusrive="false" parameter as regular user
@@ -2513,7 +2513,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ##  Regular User  - Test cases  when account and domainId is passed with listall not passed
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid(self):
 	"""
 	Test listing of Snapshots by passing domainid,account parameter as regular user
@@ -2539,7 +2539,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_rec_true(self):
 	"""
 	Test listing of Snapshots by passing domainid,account and isrecusrive="true" parameter as regular user
@@ -2565,7 +2565,7 @@ class TestSnapshotList(cloudstackTestCase):
 			"Account access check failed!!")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_domainid_accountid_rec_false(self):
 	"""
 	Test listing of Snapshots by passing domainid,account isrecusrive="false" parameter as regular user
@@ -2592,7 +2592,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 ## Cross Domain access check
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_cross_domainid_accountid(self):
 	"""
 	Regular User should not be allowed to list Snapshotss of other accounts in the same domain
@@ -2607,7 +2607,7 @@ class TestSnapshotList(cloudstackTestCase):
 		self.debug ("List as Regular User passing domainId and accountId of another account %s" %e)
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_regularuser_cross_domainid(self):
 	"""
 	Regular User should not be allowed to list Snapshotss of other accounts in other domains
@@ -2622,7 +2622,7 @@ class TestSnapshotList(cloudstackTestCase):
 		self.debug ("List as Regular User passing domainId of a domain that user does not belong to %s" %e)
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_cross_domainid_accountid(self):
 	"""
 	Domain admin should not be allowed to list Snapshotss of accounts in other domains
@@ -2637,7 +2637,7 @@ class TestSnapshotList(cloudstackTestCase):
 		self.debug ("List as domain admin passing domainId and accountId of another account %s" %e)
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_as_domainadmin_cross_domainid(self):
 	"""
 	Domain admin should not be allowed to list Snapshotss from other domains
@@ -2653,7 +2653,7 @@ class TestSnapshotList(cloudstackTestCase):
 
 
 ## List test cases relating to filter - id
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_domainadmin_owns(self):
 	"""
 	Domain admin should be able to list Snapshots that he owns by passing uuid in "id" parameter
@@ -2671,7 +2671,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "Domain Admin is not able to list Snapshotss that belongs to him")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_domainadmin_ownedbyusersindomain(self):
 	"""
 	Domain admin should be able to list Snapshots that is  owned by any account in his domain by passing uuid in "id" parameter
@@ -2689,7 +2689,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "Domain Admin is not able to list Snapshotss from his domain")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain(self):
 	"""
 	Domain admin should be able to list Snapshots that is  owned by any account in his sub-domain by passing uuid in "id" parameter
@@ -2707,7 +2707,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "Domain Admin is not able to list Snapshotss from his sub domain")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_domainadmin_ownedbyusersnotindomain(self):
 	"""
 	Domain admin should not be able to list Snapshots that is owned by account that is not in his domain by passing uuid in "id" parameter
@@ -2721,7 +2721,7 @@ class TestSnapshotList(cloudstackTestCase):
                          None,
                         "Domain Admin is able to list Snapshotss from  other domains!!!")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_domainadmin_ownedbyusersinsubdomain2(self):
 	"""
 	Domain admin should be able to list Snapshots that is owned by account that is in his sub domains by passing uuid in "id" parameter
@@ -2740,7 +2740,7 @@ class TestSnapshotList(cloudstackTestCase):
                         "Domain Admin is not able to list Snapshotss from his sub domains")
 
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_rootadmin_owns(self):
 	"""
 	ROOT admin should be able to list Snapshots that is owned by account in his domains by passing uuid in "id" parameter
@@ -2756,7 +2756,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "ROOT Admin not able to list Snapshotss that he owns")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_rootadmin_Snapshotsownedbyothers(self):
 	"""
 	ROOT admin should be able to list Snapshots that is owned by any account iby passing uuid in "id" parameter
@@ -2780,7 +2780,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "ROOT Admin not able to list Snapshotss from other domains")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_user_own(self):
 	"""
 	Regular user should be able to list Snapshots that is owned by him by passing uuid in "id" parameter
@@ -2799,7 +2799,7 @@ class TestSnapshotList(cloudstackTestCase):
                          1,
                         "Regular User is not able to list Snapshotss that he owns")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_user_snapshotfromsamedomaindifferentaccount(self):
 	"""
 	Regular user should not be able to list Snapshots that is owned by different account in the same domain by passing uuid in "id" parameter
@@ -2813,7 +2813,7 @@ class TestSnapshotList(cloudstackTestCase):
                          None,
                         "Regular User  is able to list Snapshotss from  other accounts")
 
-    @attr(tags=["advanced"],required_hardware="false")
+    @attr("simulator_only",tags=["advanced"],required_hardware="false")
     def test_listSnapshot_by_id_as_user_snapshotfromotherdomain(self):
 	"""
 	Regular user should not be able to list Snapshots that is owned by different account in the different domain by passing uuid in "id" parameter