mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-2273: cleanup using user api client for domain admins
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
parent
cfd892fc3b
commit
9f9510be91
@ -353,8 +353,11 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
# 1. deploy VM in sub subdomain1
|
||||
# 2. stop VM in sub subdomain1
|
||||
# 3. assignVirtualMachine to subdomain2
|
||||
userapiclient = self.testClient.getUserApiClient(account=self.sdomain_account_user1['account'].name,
|
||||
domain=self.sdomain_account_user1['domain'].name,
|
||||
type=2)
|
||||
self.create_vm(self.sdomain_account_user1['account'], self.sdomain_account_user1['domain'])
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, self.apiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, userapiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
|
||||
@attr(tags = ["advanced"])
|
||||
@log_test_exceptions
|
||||
@ -386,8 +389,11 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
# Validate the following:
|
||||
# 1. deploy VM in sub subdomain1 with volumes.
|
||||
# 3. assignVirtualMachine to subdomain2
|
||||
userapiclient = self.testClient.getUserApiClient(account=self.sdomain_account_user1['account'].name,
|
||||
domain=self.sdomain_account_user1['domain'].name,
|
||||
type=2)
|
||||
self.create_vm(self.sdomain_account_user1['account'], self.sdomain_account_user1['domain'],volume=self.sdomain_account_user1['volume'])
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, self.apiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, userapiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
# Check all volumes attached to same VM
|
||||
list_volume_response = list_volumes(self.apiclient,
|
||||
virtualmachineid=self.virtual_machine.id,
|
||||
@ -398,6 +404,8 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
"Check list volumes response for valid list")
|
||||
|
||||
self.assertNotEqual(list_volume_response[0].domainid, self.sdomain_account_user2['domain'].id, "Volume ownership not changed.")
|
||||
self.virtual_machine.detach_volume(self.apiclient,
|
||||
self.sdomain_account_user1['volume'])
|
||||
|
||||
@attr(tags = ["advanced"])
|
||||
@log_test_exceptions
|
||||
@ -423,8 +431,11 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
# Validate the following:
|
||||
# 1. deploy VM in sub subdomain1 with snapshot.
|
||||
# 3. assignVirtualMachine to subdomain2
|
||||
userapiclient = self.testClient.getUserApiClient(account=self.sdomain_account_user1['account'].name,
|
||||
domain=self.sdomain_account_user1['domain'].name,
|
||||
type=2)
|
||||
self.create_vm(self.sdomain_account_user1['account'], self.sdomain_account_user1['domain'], project=self.sdomain_account_user1['project'])
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, self.apiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, userapiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
|
||||
@attr(tags = ["advanced"])
|
||||
@log_test_exceptions
|
||||
@ -439,8 +450,11 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
account=self.sdomain_account_user2['account'].name,
|
||||
domainid=self.sdomain_account_user2['domain'].id,
|
||||
max=0)
|
||||
userapiclient = self.testClient.getUserApiClient(account=self.sdomain_account_user1['account'].name,
|
||||
domain=self.sdomain_account_user1['domain'].name,
|
||||
type=2)
|
||||
self.create_vm(self.sdomain_account_user1['account'], self.sdomain_account_user1['domain'], snapshot=True)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, self.apiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, userapiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
|
||||
@attr(tags = ["advanced"])
|
||||
@log_test_exceptions
|
||||
@ -456,5 +470,10 @@ class TestVMOwnership(cloudstackTestCase):
|
||||
account=self.sdomain_account_user2['account'].name,
|
||||
domainid=self.sdomain_account_user2['domain'].id,
|
||||
max=0)
|
||||
userapiclient = self.testClient.getUserApiClient(account=self.sdomain_account_user1['account'].name,
|
||||
domain=self.sdomain_account_user1['domain'].name,
|
||||
type=2)
|
||||
self.create_vm(self.sdomain_account_user1['account'], self.sdomain_account_user1['domain'], snapshot=True, volume=self.sdomain_account_user1['volume'])
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, self.apiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.assertRaises(Exception, self.virtual_machine.assign_virtual_machine, userapiclient, self.sdomain_account_user2['account'].name ,self.sdomain_account_user2['domain'].id)
|
||||
self.virtual_machine.detach_volume(self.apiclient,
|
||||
self.sdomain_account_user1['volume'])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user