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 2012/09/12 15:24:10 UTC
[18/37] git commit: Rearranging the project test suite according to
global configs required
Rearranging the project test suite according to global configs required
* Skipping if the global config required is not set
* Cleanup the email tests from project suite
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6e7b5138
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6e7b5138
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6e7b5138
Branch: refs/heads/master
Commit: 6e7b5138104070a35dba4caa5d87b8550dc8f52f
Parents: 0119e6d
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Thu Jul 12 20:58:45 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Sep 12 18:48:32 2012 +0530
----------------------------------------------------------------------
test/integration/component/test_project_configs.py | 405 ++++++++++-----
test/integration/component/test_projects.py | 243 +++------
2 files changed, 341 insertions(+), 307 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6e7b5138/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 ceb62c4..4384efb 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -86,7 +86,7 @@ class Services:
"template": {
"displaytext": "Public Template",
"name": "Public template",
- "ostypeid": 'f9b709f2-e0fc-4c0f-80f1-b0494168f58d',
+ "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
"url": "http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2",
"hypervisor": 'XenServer',
"format": 'VHD',
@@ -97,13 +97,7 @@ class Services:
"configs": {
"project.invite.timeout": 300,
},
- "mail_account": {
- "server": 'imap.gmail.com',
- "email": 'administrator@clogeny.com',
- "password": 'fr3sca21!',
- "folder": 'inbox',
- },
- "ostypeid": 'f9b709f2-e0fc-4c0f-80f1-b0494168f58d',
+ "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -123,6 +117,16 @@ class TestUserProjectCreation(cloudstackTestCase):
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+ configs = Configurations.list(
+ cls.api_client,
+ name='allow.user.create.projects'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: allow.user.create.projects")
+ elif (configs[0].value).lower() != 'true':
+ raise unittest.SkipTest("'allow.user.create.projects' should be true")
+
# Create domains, account etc.
cls.domain = Domain.create(
cls.api_client,
@@ -169,14 +173,10 @@ class TestUserProjectCreation(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- def test_01_admin_project_creation(self):
+ def test_admin_project_creation(self):
"""Test create project as a domain admin and domain user
"""
-<<<<<<< HEAD
-
-=======
tags = ["advanced", "basic", "sg", "eip", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
# Validate the following
# 1. Check if 'allow.user.create.projects' configuration is true
# 2. Create a Project as domain admin
@@ -200,6 +200,7 @@ class TestUserProjectCreation(cloudstackTestCase):
)
# Create project as a domain admin
+
project = Project.create(
self.apiclient,
self.services["project"],
@@ -267,8 +268,78 @@ class TestUserProjectCreation(cloudstackTestCase):
)
return
+
+class TestProjectCreationNegative(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(
+ TestProjectCreationNegative,
+ cls
+ ).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone
+ cls.zone = get_zone(cls.api_client, cls.services)
+
+ # Checking for prereqisits - global configs
+ configs = Configurations.list(
+ cls.api_client,
+ name='allow.user.create.projects'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: allow.user.create.projects")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'allow.user.create.projects' should be false")
+
+ # Create domains, account etc.
+ cls.domain = Domain.create(
+ cls.api_client,
+ cls.services["domain"]
+ )
+
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls.user = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls._cleanup = [cls.account, cls.user, cls.domain]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created accounts, domains etc
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
@unittest.skip("Known bug-able to create project as a domain user")
- def test_02_user_project_creation(self):
+ def test_user_project_creation(self):
"""Test create project as a domain admin and domain user
"""
@@ -346,7 +417,10 @@ class TestProjectInviteRequired(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.api_client = super(TestProjectInviteRequired, cls).getClsTestClient().getApiClient()
+ cls.api_client = super(
+ TestProjectInviteRequired,
+ cls
+ ).getClsTestClient().getApiClient()
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
@@ -354,6 +428,17 @@ class TestProjectInviteRequired(cloudstackTestCase):
# Create domains, account etc.
cls.domain = get_domain(cls.api_client, cls.services)
+ # Verify 'project.invite.required' is set to false
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("The 'project.invite.required' is not found in global configs")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be false")
+
cls.account = Account.create(
cls.api_client,
cls.services["account"],
@@ -394,35 +479,16 @@ class TestProjectInviteRequired(cloudstackTestCase):
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- def test_03_add_user_to_project(self):
+ def test_add_user_to_project(self):
"""Add user to project when 'project.invite.required' is false"""
-<<<<<<< HEAD
-
-=======
+
tags = ["advanced", "basic", "sg", "eip", "advancedns"]
->>>>>>> 6d17e21... This commit has following fixes:
+
# Validate the following:
# 1. Create a Project
# 2. Add users to the project. Verify user is added to project
# as regular user
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be true"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -498,30 +564,81 @@ class TestProjectInviteRequired(cloudstackTestCase):
return
- def test_04_add_user_to_project(self):
- """Add user to project when 'project.invite.required' is true"""
-
- # Validate the following:
- # 1. Create a Project
- # 2. Add users to the project. verify user is shown in pending state
+class TestProjectInviteRequiredTrue(cloudstackTestCase):
- # Verify 'project.invite.required' is set to false
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(
+ TestProjectInviteRequiredTrue,
+ cls
+ ).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone
+ cls.zone = get_zone(cls.api_client, cls.services)
+
+ # Create domains, account etc.
+ cls.domain = get_domain(cls.api_client, cls.services)
+
+ # Verify 'project.invite.required' is set to true
configs = Configurations.list(
- self.apiclient,
+ cls.api_client,
name='project.invite.required'
)
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("The 'project.invite.required' is not found in global configs")
+ elif (configs[0].value).lower() != 'true':
+ raise unittest.SkipTest("'project.invite.required' should be true")
+
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
)
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'true',
- "'project.invite.required' should be true"
+
+ cls.user = Account.create(
+ cls.api_client,
+ cls.services["user"],
+ admin=True,
+ domainid=cls.domain.id
)
+ cls._cleanup = [cls.account, cls.user]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created accounts, domains etc
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def test_add_user_to_project(self):
+ """Add user to project when 'project.invite.required' is true"""
+
+ tags = ["advanced", "basic", "sg", "eip", "advancedns"]
+
+ # Validate the following:
+ # 1. Create a Project
+ # 2. Add users to the project. verify user is shown in pending state
+
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -597,9 +714,91 @@ class TestProjectInviteRequired(cloudstackTestCase):
)
return
- def test_05_invitation_timeout(self):
+
+class TestProjectInviteTimeout(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ cls.api_client = super(
+ TestProjectInviteTimeout,
+ cls
+ ).getClsTestClient().getApiClient()
+ cls.services = Services().services
+ # Get Zone
+ cls.zone = get_zone(cls.api_client, cls.services)
+
+ # Create domains, account etc.
+ cls.domain = get_domain(cls.api_client, cls.services)
+
+ # Verify 'project.invite.required' is set to true
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("The 'project.invite.required' is not found in global configs")
+ elif (configs[0].value).lower() != 'true':
+ raise unittest.SkipTest("'project.invite.required' should be true")
+
+ # Verify 'project.invite.timeout' is set to 300
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.timeout'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("The 'project.invite.timeout' is not found in global configs")
+ elif int(configs[0].value) != cls.services["configs"]["project.invite.timeout"]:
+ raise unittest.SkipTest("'project.invite.timeout' should be: %s " %
+ cls.services["configs"]["project.invite.timeout"])
+
+ cls.config = configs[0]
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls.user = Account.create(
+ cls.api_client,
+ cls.services["user"],
+ admin=True,
+ domainid=cls.domain.id
+ )
+
+ cls._cleanup = [cls.account, cls.user]
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ #Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ return
+
+ def tearDown(self):
+ try:
+ #Clean up, terminate the created accounts, domains etc
+ cleanup_resources(self.apiclient, self.cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def test_01_invitation_timeout(self):
"""Test global config project invitation timeout"""
-
+
+ tags = ["advanced", "basic", "sg", "eip", "advancedns"]
+
# Validate the following:
# 1. Set configuration to 5 mins
# 2. Create a Project
@@ -607,24 +806,6 @@ class TestProjectInviteRequired(cloudstackTestCase):
# 4. As a user accept invitation within 5 mins. Verify invitation is
# accepted and user become regular user of project
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.timeout'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- int(config.value),
- self.services["configs"]["project.invite.timeout"],
- "'project.invite.timeout' should be %s" %
- self.services["configs"]["project.invite.timeout"]
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -738,9 +919,11 @@ class TestProjectInviteRequired(cloudstackTestCase):
)
return
- def test_06_invitation_timeout_after_expiry(self):
+ def test_02_invitation_timeout_after_expiry(self):
"""Test global config project invitation timeout"""
-
+
+ tags = ["advanced", "basic", "sg", "eip", "advancedns"]
+
# Validate the following:
# 1. Set configuration to 5 mins
# 2. Create a Project
@@ -748,24 +931,6 @@ class TestProjectInviteRequired(cloudstackTestCase):
# 4. As a user accept invitation after 5 mins. Verify invitation is
# not accepted and is shown as expired
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.timeout'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- int(config.value),
- self.services["configs"]["project.invite.timeout"],
- "'project.invite.timeout' should be %s" %
- self.services["configs"]["project.invite.timeout"]
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -842,7 +1007,7 @@ class TestProjectInviteRequired(cloudstackTestCase):
# sleep for 'project.invite.timeout' * 2 interval to wait for invite
# to expire
- time.sleep(int(config.value) * 2)
+ time.sleep(int(self.config.value) * 2)
with self.assertRaises(Exception):
# Accept the invite
@@ -884,9 +1049,11 @@ class TestProjectInviteRequired(cloudstackTestCase):
)
return
- def test_07_invite_after_expiry(self):
+ def test_03_invite_after_expiry(self):
"""Test global config project invitation timeout"""
-
+
+ tags = ["advanced", "basic", "sg", "eip", "advancedns"]
+
# Validate the following:
# 1. Set configuration to 5 mins
# 2. Create a Project
@@ -895,24 +1062,6 @@ class TestProjectInviteRequired(cloudstackTestCase):
# 5. Resend the invitation
# 6. Verify invitation is sent again
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.timeout'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- int(config.value),
- self.services["configs"]["project.invite.timeout"],
- "'project.invite.timeout' should be %s" %
- self.services["configs"]["project.invite.timeout"]
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -989,7 +1138,7 @@ class TestProjectInviteRequired(cloudstackTestCase):
# sleep for 'project.invite.timeout' * 2 interval to wait for invite
# to expire
- time.sleep(int(config.value) * 2)
+ time.sleep(int(self.config.value) * 2)
self.debug("Adding %s user again to project: %s" % (
self.user.account.name,
@@ -1029,9 +1178,11 @@ class TestProjectInviteRequired(cloudstackTestCase):
)
return
- def test_08_decline_invitation(self):
+ def test_04_decline_invitation(self):
"""Test decline invitation"""
-
+
+ tags = ["advanced", "basic", "sg", "eip", "advancedns"]
+
# Validate the following:
# 1. Set configuration to 5 mins
# 2. Create a Project
@@ -1040,24 +1191,6 @@ class TestProjectInviteRequired(cloudstackTestCase):
# 5. Verify invitation is rejected and user doesn't become regular
# user.
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.timeout'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- int(config.value),
- self.services["configs"]["project.invite.timeout"],
- "'project.invite.timeout' should be %s" %
- self.services["configs"]["project.invite.timeout"]
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6e7b5138/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index f0af670..e7dca88 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -91,7 +91,7 @@ class Services:
"publicport": 22,
"protocol": 'TCP',
},
- "ostypeid": '8531d1df-faac-4895-a741-238d3b10e6e6',
+ "ostypeid": '7ddbbbb5-bb09-40de-b038-ee78995788ea',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@@ -117,6 +117,16 @@ class TestMultipleProjectCreation(cloudstackTestCase):
cls.services
)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
cls.account = Account.create(
cls.api_client,
cls.services["account"],
@@ -168,23 +178,6 @@ class TestMultipleProjectCreation(cloudstackTestCase):
# 2. add one account to multiple project. Verify at step 2 an account
# is allowed to added to multiple project
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project_1 = Project.create(
self.apiclient,
@@ -334,6 +327,16 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
cls.services
)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create domains, account etc.
cls.new_domain = Domain.create(
cls.api_client,
@@ -389,23 +392,6 @@ class TestCrossDomainAccountAdd(cloudstackTestCase):
# 2. Add different domain account to the project. Add account should
# fail
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -474,6 +460,16 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
cls.services
)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create account
cls.account = Account.create(
cls.api_client,
@@ -516,23 +512,6 @@ class TestDeleteAccountWithProject(cloudstackTestCase):
# 2. Delete account who is owner of the project. Delete account should
# fail
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -589,6 +568,17 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
cls.services = Services().services
# Get Zone
cls.zone = get_zone(cls.api_client, cls.services)
+
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create account
cls.domain = Domain.create(
cls.api_client,
@@ -637,23 +627,6 @@ class TestDeleteDomainWithProject(cloudstackTestCase):
# 2. Delete domain forcefully. Verify that project is also deleted as
# as part of domain cleanup
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -740,6 +713,16 @@ class TestProjectOwners(cloudstackTestCase):
)
cls.zone = get_zone(cls.api_client, cls.services)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create accounts
cls.admin = Account.create(
cls.api_client,
@@ -790,23 +773,6 @@ class TestProjectOwners(cloudstackTestCase):
# owner. verify new user is project owner and old account is
# regular user of the project.
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -948,23 +914,6 @@ class TestProjectOwners(cloudstackTestCase):
# owner.
# 3. Update project to add another account as an owner
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -1191,6 +1140,16 @@ class TestProjectResources(cloudstackTestCase):
cls.services
)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create account, disk offering etc.
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -1246,23 +1205,6 @@ class TestProjectResources(cloudstackTestCase):
# 3. Delete the account. Verify resources are still there after
# account deletion.
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -1379,23 +1321,6 @@ class TestProjectResources(cloudstackTestCase):
# account deletion.
# 4. Verify all accounts are unassigned from project.
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Create project as a domain admin
project = Project.create(
self.apiclient,
@@ -1527,6 +1452,16 @@ class TestProjectSuspendActivate(cloudstackTestCase):
cls.zone.id,
cls.services["ostypeid"]
)
+ configs = Configurations.list(
+ cls.api_client,
+ name='project.invite.required'
+ )
+
+ if not isinstance(configs, list):
+ raise unittest.SkipTest("List configurations has no config: project.invite.required")
+ elif (configs[0].value).lower() != 'false':
+ raise unittest.SkipTest("'project.invite.required' should be set to false")
+
# Create account, service offering, disk offering etc.
cls.disk_offering = DiskOffering.create(
cls.api_client,
@@ -1600,23 +1535,6 @@ class TestProjectSuspendActivate(cloudstackTestCase):
# 3. Delete the account. Verify resources are still there after
# account deletion.
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
self.debug("Adding %s user to project: %s" % (
self.user.account.name,
self.project.name
@@ -1751,23 +1669,6 @@ class TestProjectSuspendActivate(cloudstackTestCase):
# 1. Activate the project
# 2. Verify project is activated and we are able to add resources
- # Verify 'project.invite.required' is set to false
- configs = Configurations.list(
- self.apiclient,
- name='project.invite.required'
- )
- self.assertEqual(
- isinstance(configs, list),
- True,
- "Check for a valid list configurations response"
- )
- config = configs[0]
- self.assertEqual(
- (config.value).lower(),
- 'false',
- "'project.invite.required' should be set to false"
- )
-
# Activating the project
self.debug("Activating project: %s" % self.project.name)
self.project.activate(self.apiclient)