apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2363: fixing the scripts to conform with lib changes

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Talluri 2013-05-08 04:43:31 +05:30 committed by Prasanna Santhanam
parent 731cc439a3
commit 1fe50a8d67
5 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
test/integration/component/test_project_configs.py
View File

@ -242,8 +242,8 @@ class TestUserProjectCreation(cloudstackTestCase):
project = Project.create( project = Project.create(
self.apiclient, self.apiclient,
self.services["project"], self.services["project"],
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
# Cleanup created project at end of test # Cleanup created project at end of test
self.cleanup.append(project) self.cleanup.append(project)
@ -409,11 +409,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
project = Project.create( project = Project.create(
self.apiclient, self.apiclient,
self.services["project"], self.services["project"],
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.debug("Project creation with domain user: %s failed" % self.debug("Project creation with domain user: %s failed" %
self.user.account.name) self.user.name)
return return
@ -531,21 +531,21 @@ class TestProjectInviteRequired(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_reponse)
self.assertEqual( self.assertEqual(
@ -684,22 +684,22 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -853,22 +853,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -894,18 +894,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
accept=True, accept=True,
account=self.user.account.name account=self.user.name
) )
self.debug( self.debug(
"Accepting project invitation for project: %s user: %s" % ( "Accepting project invitation for project: %s user: %s" % (
project.name, project.name,
self.user.account.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
@ -979,22 +979,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1025,18 +1025,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
accept=True, accept=True,
account=self.user.account.name account=self.user.name
) )
self.debug( self.debug(
"Accepting invitation after expiry project: %s user: %s" % ( "Accepting invitation after expiry project: %s user: %s" % (
project.name, project.name,
self.user.account.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
@ -1110,22 +1110,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1151,22 +1151,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
time.sleep(int(self.config.value) * 2) time.sleep(int(self.config.value) * 2)
self.debug("Adding %s user again to project: %s" % ( self.debug("Adding %s user again to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1239,22 +1239,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list( accounts_reponse = ProjectInvitation.list(
self.apiclient, self.apiclient,
state='Pending', state='Pending',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1279,18 +1279,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
accept=False, accept=False,
account=self.user.account.name account=self.user.name
) )
self.debug( self.debug(
"Declining invitation for project: %s user: %s" % ( "Declining invitation for project: %s user: %s" % (
project.name, project.name,
self.user.account.name self.user.name
)) ))
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
accounts_reponse, accounts_reponse,
@ -1367,19 +1367,19 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding user with email: %s to project: %s" % ( self.debug("Adding user with email: %s to project: %s" % (
self.user.account.email, self.user.email,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
email=self.user.account.user[0].email email=self.user.user[0].email
) )
# Fetch the latest mail sent to user # Fetch the latest mail sent to user
mail_content = fetch_latest_mail( mail_content = fetch_latest_mail(
self.services["mail_account"], self.services["mail_account"],
from_mail=self.user.account.user[0].email from_mail=self.user.user[0].email
) )
return return

10
test/integration/component/test_project_limits.py
View File

@ -429,14 +429,14 @@ class TestProjectLimits(cloudstackTestCase):
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
) )
# Get the resource limits for domain # Get the resource limits for domain
@ -459,14 +459,14 @@ class TestProjectLimits(cloudstackTestCase):
#with self.assertRaises(Exception): #with self.assertRaises(Exception):
self.debug( self.debug(
"Attempting to update resource limit by user: %s" % ( "Attempting to update resource limit by user: %s" % (
self.user.account.name self.user.name
)) ))
# Update project resource limits to 3 # Update project resource limits to 3
update_resource_limit( update_resource_limit(
self.apiclient, self.apiclient,
resource.resourcetype, resource.resourcetype,
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid, domainid=self.user.domainid,
max=3, max=3,
projectid=project.id projectid=project.id
) )

50
test/integration/component/test_projects.py
View File

@ -248,15 +248,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
# Add user to the project # Add user to the project
project_1.addAccount( project_1.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project_1.id, projectid=project_1.id,
account=self.user.account.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_reponse)
self.assertEqual( self.assertEqual(
@ -280,15 +280,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
# Add user to the project # Add user to the project
project_2.addAccount( project_2.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.user.account.email self.user.email
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project_2.id, projectid=project_2.id,
account=self.user.account.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_reponse)
self.assertEqual( self.assertEqual(
@ -432,15 +432,15 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
) )
self.debug("Adding user: %s from domain: %s to project: %s" % ( self.debug("Adding user: %s from domain: %s to project: %s" % (
self.user.account.name, self.user.name,
self.user.account.domainid, self.user.domainid,
project.id project.id
)) ))
with self.assertRaises(Exception): with self.assertRaises(Exception):
# Add user to the project from different domain # Add user to the project from different domain
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name self.user.name
) )
self.debug("User add to project failed!") self.debug("User add to project failed!")
return return
@ -938,7 +938,7 @@ class TestProjectOwners(cloudstackTestCase):
) )
self.cleanup.append(self.user) self.cleanup.append(self.user)
self.debug("Created account with ID: %s" % self.debug("Created account with ID: %s" %
self.user.account.name) self.user.name)
list_projects_reponse = Project.list( list_projects_reponse = Project.list(
self.apiclient, self.apiclient,
@ -1033,20 +1033,20 @@ class TestProjectOwners(cloudstackTestCase):
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1068,19 +1068,19 @@ class TestProjectOwners(cloudstackTestCase):
) )
self.debug("Updating project with new Admin: %s" % self.debug("Updating project with new Admin: %s" %
self.user.account.name) self.user.name)
# Update the project with new admin # Update the project with new admin
project.update( project.update(
self.apiclient, self.apiclient,
account=self.user.account.name account=self.user.name
) )
# listProjectAccount to verify the user is new admin of the project # listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.debug(accounts_reponse) self.debug(accounts_reponse)
self.assertEqual( self.assertEqual(
@ -1248,20 +1248,20 @@ class TestProjectResources(cloudstackTestCase):
"Check project name from list response" "Check project name from list response"
) )
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1370,20 +1370,20 @@ class TestProjectResources(cloudstackTestCase):
) )
self.cleanup.append(self.user) self.cleanup.append(self.user)
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
project.name project.name
)) ))
# Add user to the project # Add user to the project
project.addAccount( project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name self.user.name
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=project.id, projectid=project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),
@ -1543,20 +1543,20 @@ class TestProjectSuspendActivate(cloudstackTestCase):
# account deletion. # account deletion.
self.debug("Adding %s user to project: %s" % ( self.debug("Adding %s user to project: %s" % (
self.user.account.name, self.user.name,
self.project.name self.project.name
)) ))
# Add user to the project # Add user to the project
self.project.addAccount( self.project.addAccount(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
) )
# listProjectAccount to verify the user is added to project or not # listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts( accounts_reponse = Project.listAccounts(
self.apiclient, self.apiclient,
projectid=self.project.id, projectid=self.project.id,
account=self.user.account.name, account=self.user.name,
) )
self.assertEqual( self.assertEqual(
isinstance(accounts_reponse, list), isinstance(accounts_reponse, list),

12
test/integration/smoke/test_network.py
View File

@ -151,8 +151,8 @@ class TestPublicIP(cloudstackTestCase):
cls.user_network = Network.create( cls.user_network = Network.create(
cls.api_client, cls.api_client,
cls.services["network"], cls.services["network"],
cls.user.account.name, cls.user.name,
cls.user.account.domainid cls.user.domainid
) )
# Create Source NAT IP addresses # Create Source NAT IP addresses
@ -164,9 +164,9 @@ class TestPublicIP(cloudstackTestCase):
) )
user_src_nat_ip = PublicIPAddress.create( user_src_nat_ip = PublicIPAddress.create(
cls.api_client, cls.api_client,
cls.user.account.name, cls.user.name,
cls.zone.id, cls.zone.id,
cls.user.account.domainid cls.user.domainid
) )
cls._cleanup = [ cls._cleanup = [
cls.account_network, cls.account_network,
@ -248,9 +248,9 @@ class TestPublicIP(cloudstackTestCase):
ip_address = PublicIPAddress.create( ip_address = PublicIPAddress.create(
self.apiclient, self.apiclient,
self.user.account.name, self.user.name,
self.zone.id, self.zone.id,
self.user.account.domainid self.user.domainid
) )
#listPublicIpAddresses should return newly created public IP #listPublicIpAddresses should return newly created public IP

8
test/integration/smoke/test_templates.py
View File

@ -752,8 +752,8 @@ class TestTemplates(cloudstackTestCase):
list_template_response = list_templates( list_template_response = list_templates(
self.apiclient, self.apiclient,
templatefilter='featured', templatefilter='featured',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(list_template_response, list), isinstance(list_template_response, list),
@ -784,8 +784,8 @@ class TestTemplates(cloudstackTestCase):
list_template_response = list_templates( list_template_response = list_templates(
self.apiclient, self.apiclient,
templatefilter='featured', templatefilter='featured',
account=self.user.account.name, account=self.user.name,
domainid=self.user.account.domainid domainid=self.user.domainid
) )
self.assertEqual( self.assertEqual(
isinstance(list_template_response, list), isinstance(list_template_response, list),