You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/05/08 14:00:50 UTC
[81/90] [abbrv] git commit: updated refs/heads/marvin_refactor to
26ea081
CLOUDSTACK-2363: fixing the scripts to conform with lib changes
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1fe50a8d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1fe50a8d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1fe50a8d
Branch: refs/heads/marvin_refactor
Commit: 1fe50a8d6778e37fd0784919538fdc7afccfb4c8
Parents: 731cc43
Author: Talluri <Sr...@citrix.com>
Authored: Wed May 8 04:43:31 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed May 8 14:26:43 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_project_configs.py | 104 +++++++-------
test/integration/component/test_project_limits.py | 10 +-
test/integration/component/test_projects.py | 50 ++++----
test/integration/smoke/test_network.py | 12 +-
test/integration/smoke/test_templates.py | 8 +-
5 files changed, 92 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fe50a8d/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index fa2ee0a..33409ac 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -242,8 +242,8 @@ class TestUserProjectCreation(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
# Cleanup created project at end of test
self.cleanup.append(project)
@@ -409,11 +409,11 @@ class TestProjectCreationNegative(cloudstackTestCase):
project = Project.create(
self.apiclient,
self.services["project"],
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.debug("Project creation with domain user: %s failed" %
- self.user.account.name)
+ self.user.name)
return
@@ -531,21 +531,21 @@ class TestProjectInviteRequired(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -684,22 +684,22 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -853,22 +853,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -894,18 +894,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient,
projectid=project.id,
accept=True,
- account=self.user.account.name
+ account=self.user.name
)
self.debug(
"Accepting project invitation for project: %s user: %s" % (
project.name,
- self.user.account.name
+ self.user.name
))
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
@@ -979,22 +979,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1025,18 +1025,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient,
projectid=project.id,
accept=True,
- account=self.user.account.name
+ account=self.user.name
)
self.debug(
"Accepting invitation after expiry project: %s user: %s" % (
project.name,
- self.user.account.name
+ self.user.name
))
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
@@ -1110,22 +1110,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1151,22 +1151,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
time.sleep(int(self.config.value) * 2)
self.debug("Adding %s user again to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1239,22 +1239,22 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = ProjectInvitation.list(
self.apiclient,
state='Pending',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1279,18 +1279,18 @@ class TestProjectInviteTimeout(cloudstackTestCase):
self.apiclient,
projectid=project.id,
accept=False,
- account=self.user.account.name
+ account=self.user.name
)
self.debug(
"Declining invitation for project: %s user: %s" % (
project.name,
- self.user.account.name
+ self.user.name
))
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
accounts_reponse,
@@ -1367,19 +1367,19 @@ class TestProjectInviteTimeout(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding user with email: %s to project: %s" % (
- self.user.account.email,
+ self.user.email,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- email=self.user.account.user[0].email
+ email=self.user.user[0].email
)
# Fetch the latest mail sent to user
mail_content = fetch_latest_mail(
self.services["mail_account"],
- from_mail=self.user.account.user[0].email
+ from_mail=self.user.user[0].email
)
return
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fe50a8d/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 4a8b9d4..c5d2d6d 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -429,14 +429,14 @@ class TestProjectLimits(cloudstackTestCase):
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
+ self.user.name,
)
# Get the resource limits for domain
@@ -459,14 +459,14 @@ class TestProjectLimits(cloudstackTestCase):
#with self.assertRaises(Exception):
self.debug(
"Attempting to update resource limit by user: %s" % (
- self.user.account.name
+ self.user.name
))
# Update project resource limits to 3
update_resource_limit(
self.apiclient,
resource.resourcetype,
- account=self.user.account.name,
- domainid=self.user.account.domainid,
+ account=self.user.name,
+ domainid=self.user.domainid,
max=3,
projectid=project.id
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fe50a8d/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 9fa6075..ccfc8ef 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -248,15 +248,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
# Add user to the project
project_1.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project_1.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -280,15 +280,15 @@ class TestMultipleProjectCreation(cloudstackTestCase):
# Add user to the project
project_2.addAccount(
self.apiclient,
- self.user.account.name,
- self.user.account.email
+ self.user.name,
+ self.user.email
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project_2.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -432,15 +432,15 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
)
self.debug("Adding user: %s from domain: %s to project: %s" % (
- self.user.account.name,
- self.user.account.domainid,
+ self.user.name,
+ self.user.domainid,
project.id
))
with self.assertRaises(Exception):
# Add user to the project from different domain
project.addAccount(
self.apiclient,
- self.user.account.name
+ self.user.name
)
self.debug("User add to project failed!")
return
@@ -938,7 +938,7 @@ class TestProjectOwners(cloudstackTestCase):
)
self.cleanup.append(self.user)
self.debug("Created account with ID: %s" %
- self.user.account.name)
+ self.user.name)
list_projects_reponse = Project.list(
self.apiclient,
@@ -1033,20 +1033,20 @@ class TestProjectOwners(cloudstackTestCase):
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
+ self.user.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1068,19 +1068,19 @@ class TestProjectOwners(cloudstackTestCase):
)
self.debug("Updating project with new Admin: %s" %
- self.user.account.name)
+ self.user.name)
# Update the project with new admin
project.update(
self.apiclient,
- account=self.user.account.name
+ account=self.user.name
)
# listProjectAccount to verify the user is new admin of the project
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.debug(accounts_reponse)
self.assertEqual(
@@ -1248,20 +1248,20 @@ class TestProjectResources(cloudstackTestCase):
"Check project name from list response"
)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name,
+ self.user.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1370,20 +1370,20 @@ class TestProjectResources(cloudstackTestCase):
)
self.cleanup.append(self.user)
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
project.name
))
# Add user to the project
project.addAccount(
self.apiclient,
- self.user.account.name
+ self.user.name
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
@@ -1543,20 +1543,20 @@ class TestProjectSuspendActivate(cloudstackTestCase):
# account deletion.
self.debug("Adding %s user to project: %s" % (
- self.user.account.name,
+ self.user.name,
self.project.name
))
# Add user to the project
self.project.addAccount(
self.apiclient,
- self.user.account.name,
+ self.user.name,
)
# listProjectAccount to verify the user is added to project or not
accounts_reponse = Project.listAccounts(
self.apiclient,
projectid=self.project.id,
- account=self.user.account.name,
+ account=self.user.name,
)
self.assertEqual(
isinstance(accounts_reponse, list),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fe50a8d/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 322e8c2..4a7bb44 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -151,8 +151,8 @@ class TestPublicIP(cloudstackTestCase):
cls.user_network = Network.create(
cls.api_client,
cls.services["network"],
- cls.user.account.name,
- cls.user.account.domainid
+ cls.user.name,
+ cls.user.domainid
)
# Create Source NAT IP addresses
@@ -164,9 +164,9 @@ class TestPublicIP(cloudstackTestCase):
)
user_src_nat_ip = PublicIPAddress.create(
cls.api_client,
- cls.user.account.name,
+ cls.user.name,
cls.zone.id,
- cls.user.account.domainid
+ cls.user.domainid
)
cls._cleanup = [
cls.account_network,
@@ -248,9 +248,9 @@ class TestPublicIP(cloudstackTestCase):
ip_address = PublicIPAddress.create(
self.apiclient,
- self.user.account.name,
+ self.user.name,
self.zone.id,
- self.user.account.domainid
+ self.user.domainid
)
#listPublicIpAddresses should return newly created public IP
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1fe50a8d/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index b2ad4ca..382f56f 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -752,8 +752,8 @@ class TestTemplates(cloudstackTestCase):
list_template_response = list_templates(
self.apiclient,
templatefilter='featured',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(list_template_response, list),
@@ -784,8 +784,8 @@ class TestTemplates(cloudstackTestCase):
list_template_response = list_templates(
self.apiclient,
templatefilter='featured',
- account=self.user.account.name,
- domainid=self.user.account.domainid
+ account=self.user.name,
+ domainid=self.user.domainid
)
self.assertEqual(
isinstance(list_template_response, list),