Skip to content

travis: Fix failing list vms & snapshots tests #6124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Pearl1594 wants to merge 1 commit into from
Closed

travis: Fix failing list vms & snapshots tests #6124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions test/integration/component/test_acl_listsnapshot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,15 +457,15 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -645,15 +645,16 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -1391,15 +1392,15 @@ 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
self.apiclient.connection.securityKey = self.user_a_secretkey
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!!")

Expand Down
13 changes: 7 additions & 6 deletions test/integration/component/test_acl_listvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,15 +430,15 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -618,15 +618,16 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -1364,15 +1365,15 @@ 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
self.apiclient.connection.securityKey = self.user_a_secretkey
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!!")

Expand Down
10 changes: 5 additions & 5 deletions test/integration/component/test_acl_listvolume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,15 +443,15 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -631,15 +631,15 @@ 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
self.apiclient.connection.securityKey = self.user_d1_secretkey
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!!")

Expand Down Expand Up @@ -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!!")

Expand Down