diff --git a/test/integration/component/test_acl_listsnapshot.py b/test/integration/component/test_acl_listsnapshot.py index 9e6a8d02cf4b..5f6acf160afc 100644 --- a/test/integration/component/test_acl_listsnapshot.py +++ b/test/integration/component/test_acl_listsnapshot.py @@ -457,7 +457,7 @@ def test_listSnapshot_as_domainadmin_listall_true_rec_true(self): 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 - Validate that it returns all the Snapshots that is owned by accounts in this domain and all its subdomain + Validate that it returns all the Snapshots that is owned by accounts in this domain. """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -465,7 +465,7 @@ def test_listSnapshot_as_domainadmin_listall_true_rec_false(self): snapshotList = Snapshot.list(self.apiclient, listall="true", isrecursive="false") self.debug("List as Domain Admin - listall=true,isrecursive=false %s" % snapshotList) - self.assertEqual(len(snapshotList) == 9, + self.assertEqual(len(snapshotList) == 3, True, "Number of items in list response check failed!!") @@ -645,7 +645,8 @@ def test_listSnapshot_as_domainadmin_true_rec_false(self): def test_listSnapshot_as_domainadmin_domainid_listall_true(self): """ Test listing of Snapshots by passing domainId and listall="true" parameter as domain admin - Validate that it returns all the Snapshots in the domain passed + Validate that it returns all the Snapshots in the domain passed. When listall="true" and isrescursive + isn't passed them isrecursive is treated as 'true' """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -653,7 +654,7 @@ def test_listSnapshot_as_domainadmin_domainid_listall_true(self): snapshotList = Snapshot.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as Domain Admin passing domainId - listall=true %s" % snapshotList) - self.assertEqual(len(snapshotList) == 3, + self.assertEqual(len(snapshotList) == 4, True, "Number of items in list response check failed!!") @@ -1391,7 +1392,7 @@ def test_listSnapshot_as_rootadmin_rec_false(self): def test_listSnapshot_as_rootadmin_domainid_listall_true(self): """ Test listing of Snapshots by passing domainid and listall="true" parameter as admin - Validate that it returns all the Snapshots in the domain passed + Validate that it returns all the Snapshots in the domain passed and its subdomains """ self.apiclient.connection.apiKey = self.user_a_apikey @@ -1399,7 +1400,7 @@ def test_listSnapshot_as_rootadmin_domainid_listall_true(self): snapshotList = Snapshot.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as ROOT Admin passing domainId - listall=true %s" % snapshotList) - self.assertEqual(len(snapshotList) == 3, + self.assertEqual(len(snapshotList) == 4, True, "Number of items in list response check failed!!") diff --git a/test/integration/component/test_acl_listvm.py b/test/integration/component/test_acl_listvm.py index 5c27f29314e2..6c3cfc658b03 100644 --- a/test/integration/component/test_acl_listvm.py +++ b/test/integration/component/test_acl_listvm.py @@ -430,7 +430,7 @@ def test_listVM_as_domainadmin_listall_true_rec_true(self): def test_listVM_as_domainadmin_listall_true_rec_false(self): """ # Test listing of Vms by passing listall="true" and isrecusriv="false" parameter as domain admin - # Validate that it returns all the Vms that is owned by accounts in this domain and all its subdomain + # Validate that it returns all the Vms that is owned by accounts in this domain. """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -438,7 +438,7 @@ def test_listVM_as_domainadmin_listall_true_rec_false(self): vmList = VirtualMachine.list(self.apiclient, listall="true", isrecursive="false") self.debug("List as Domain Admin - listall=true,isrecursive=false %s" % vmList) - self.assertEqual(len(vmList) == 9, + self.assertEqual(len(vmList) == 3, True, "Number of items in list response check failed!!") @@ -618,7 +618,8 @@ def test_listVM_as_domainadmin_true_rec_false(self): def test_listVM_as_domainadmin_domainid_listall_true(self): """ # Test listing of Vms by passing domainId and listall="true" parameter as domain admin - # Validate that it returns all the Vms in the domain passed + # Validate that it returns all the Vms in the domain passed and it's sub-domains (when + isrecursive isn't passed, it defaults to true) """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -626,7 +627,7 @@ def test_listVM_as_domainadmin_domainid_listall_true(self): vmList = VirtualMachine.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as Domain Admin passing domainId - listall=true %s" % vmList) - self.assertEqual(len(vmList) == 3, + self.assertEqual(len(vmList) == 4, True, "Number of items in list response check failed!!") @@ -1364,7 +1365,7 @@ def test_listVM_as_rootadmin_rec_false(self): def test_listVM_as_rootadmin_domainid_listall_true(self): """ # Test listing of Vms by passing domainid and listall="true" parameter as admin - # Validate that it returns all the Vms in the domain passed + # Validate that it returns all the Vms in the domain passed and it's subdomains """ self.apiclient.connection.apiKey = self.user_a_apikey @@ -1372,7 +1373,7 @@ def test_listVM_as_rootadmin_domainid_listall_true(self): vmList = VirtualMachine.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as ROOT Admin passing domainId - listall=true %s" % vmList) - self.assertEqual(len(vmList) == 3, + self.assertEqual(len(vmList) == 4, True, "Number of items in list response check failed!!") diff --git a/test/integration/component/test_acl_listvolume.py b/test/integration/component/test_acl_listvolume.py index c63bfe234052..73365045528a 100644 --- a/test/integration/component/test_acl_listvolume.py +++ b/test/integration/component/test_acl_listvolume.py @@ -443,7 +443,7 @@ def test_listVolume_as_domainadmin_listall_true_rec_true(self): def test_listVolume_as_domainadmin_listall_true_rec_false(self): """ # Test listing of Volumes by passing listall="true" and isrecusriv="false" parameter as domain admin - # Validate that it returns all the Volumes that is owned by accounts in this domain and all its subdomain + # Validate that it returns all the Volumes that is owned by accounts in this domain. """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -451,7 +451,7 @@ def test_listVolume_as_domainadmin_listall_true_rec_false(self): volumeList = Volume.list(self.apiclient, listall="true", isrecursive="false") self.debug("List as Domain Admin - listall=true,isrecursive=false %s" % volumeList) - self.assertEqual(len(volumeList) == 9, + self.assertEqual(len(volumeList) == 3, True, "Number of items in list response check failed!!") @@ -631,7 +631,7 @@ def test_listVolume_as_domainadmin_true_rec_false(self): def test_listVolume_as_domainadmin_domainid_listall_true(self): """ # Test listing of Volumes by passing domainId and listall="true" parameter as domain admin - # Validate that it returns all the Volumes in the domain passed + # Validate that it returns all the Volumes in the domain passed and all the subdomains """ self.apiclient.connection.apiKey = self.user_d1_apikey @@ -639,7 +639,7 @@ def test_listVolume_as_domainadmin_domainid_listall_true(self): volumeList = Volume.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as Domain Admin passing domainId - listall=true %s" % volumeList) - self.assertEqual(len(volumeList) == 3, + self.assertEqual(len(volumeList) == 4, True, "Number of items in list response check failed!!") @@ -1381,7 +1381,7 @@ def test_listVolume_as_rootadmin_domainid_listall_true(self): volumeList = Volume.list(self.apiclient, domainid=self.domain_11.id, listall="true") self.debug("List as ROOT Admin passing domainId - listall=true %s" % volumeList) - self.assertEqual(len(volumeList) == 3, + self.assertEqual(len(volumeList) == 4, True, "Number of items in list response check failed!!")