You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gu...@apache.org on 2015/04/15 14:02:53 UTC
[1/2] git commit: updated refs/heads/master to 8558adb
Repository: cloudstack
Updated Branches:
refs/heads/master 581f3b79a -> 8558adb50
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8558adb5/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index cf4b0e3..e08ed91 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,9 +16,8 @@
# under the License.
""" P1 tests for Account
"""
-#Import Local Modules
+# Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase
-#from marvin.cloudstackAPI import *
from marvin.lib.utils import (random_gen,
cleanup_resources)
from marvin.lib.base import (Domain,
@@ -44,76 +43,78 @@ from nose.plugins.attrib import attr
from marvin.cloudstackException import CloudstackAPIException
import time
+
class Services:
+
"""Test Account Services
"""
def __init__(self):
self.services = {
- "domain": {
- "name": "Domain",
- },
- "account": {
- "email": "test@test.com",
- "firstname": "Test",
- "lastname": "User",
- "username": "test",
- # Random characters are appended for unique
- # username
- "password": "fr3sca",
- },
- "user": {
- "email": "user@test.com",
- "firstname": "User",
- "lastname": "User",
- "username": "User",
- # Random characters are appended for unique
- # username
- "password": "fr3sca",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- # in MHz
- "memory": 128,
- # In MBs
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "hypervisor": 'XenServer',
- # Hypervisor type should be same as
- # hypervisor type of cluster
- "privateport": 22,
- "publicport": 22,
- "protocol": 'TCP',
- },
- "template": {
- "displaytext": "Public Template",
- "name": "Public template",
- "ostype": 'CentOS 5.3 (64-bit)',
- "url": "",
- "hypervisor": '',
- "format": '',
- "isfeatured": True,
- "ispublic": True,
- "isextractable": True,
- "templatefilter": "self"
- },
- "natrule": {
- "publicport": 22,
- "privateport": 22,
- "protocol": 'TCP',
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- # Cent OS 5.3 (64 bit)
- "sleep": 60,
- "timeout": 10,
- }
+ "domain": {
+ "name": "Domain",
+ },
+ "account": {
+ "email": "test@test.com",
+ "firstname": "Test",
+ "lastname": "User",
+ "username": "test",
+ # Random characters are appended for unique
+ # username
+ "password": "fr3sca",
+ },
+ "user": {
+ "email": "user@test.com",
+ "firstname": "User",
+ "lastname": "User",
+ "username": "User",
+ # Random characters are appended for unique
+ # username
+ "password": "fr3sca",
+ },
+ "service_offering": {
+ "name": "Tiny Instance",
+ "displaytext": "Tiny Instance",
+ "cpunumber": 1,
+ "cpuspeed": 100,
+ # in MHz
+ "memory": 128,
+ # In MBs
+ },
+ "virtual_machine": {
+ "displayname": "Test VM",
+ "username": "root",
+ "password": "password",
+ "ssh_port": 22,
+ "hypervisor": 'XenServer',
+ # Hypervisor type should be same as
+ # hypervisor type of cluster
+ "privateport": 22,
+ "publicport": 22,
+ "protocol": 'TCP',
+ },
+ "template": {
+ "displaytext": "Public Template",
+ "name": "Public template",
+ "ostype": 'CentOS 5.3 (64-bit)',
+ "url": "",
+ "hypervisor": '',
+ "format": '',
+ "isfeatured": True,
+ "ispublic": True,
+ "isextractable": True,
+ "templatefilter": "self"
+ },
+ "natrule": {
+ "publicport": 22,
+ "privateport": 22,
+ "protocol": 'TCP',
+ },
+ "ostype": 'CentOS 5.3 (64-bit)',
+ # Cent OS 5.3 (64 bit)
+ "sleep": 60,
+ "timeout": 10,
+ }
class TestAccounts(cloudstackTestCase):
@@ -127,24 +128,24 @@ class TestAccounts(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"]
- )
+ cls.api_client,
+ cls.services["service_offering"]
+ )
cls._cleanup = [cls.service_offering]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -158,13 +159,20 @@ class TestAccounts(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created accounts, domains etc
+ # 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
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_create_account(self):
"""Test Create Account and user for that account
"""
@@ -175,72 +183,72 @@ class TestAccounts(cloudstackTestCase):
# Create an account
account = Account.create(
- self.apiclient,
- self.services["account"]
- )
+ self.apiclient,
+ self.services["account"]
+ )
self.debug("Created account: %s" % account.name)
self.cleanup.append(account)
list_accounts_response = list_accounts(
- self.apiclient,
- id=account.id
- )
+ self.apiclient,
+ id=account.id
+ )
self.assertEqual(
- isinstance(list_accounts_response, list),
- True,
- "Check list accounts for valid data"
- )
+ isinstance(list_accounts_response, list),
+ True,
+ "Check list accounts for valid data"
+ )
self.assertNotEqual(
- len(list_accounts_response),
- 0,
- "Check List Account response"
- )
+ len(list_accounts_response),
+ 0,
+ "Check List Account response"
+ )
account_response = list_accounts_response[0]
self.assertEqual(
- account.accounttype,
- account_response.accounttype,
- "Check Account Type of Created account"
- )
+ account.accounttype,
+ account_response.accounttype,
+ "Check Account Type of Created account"
+ )
self.assertEqual(
- account.name,
- account_response.name,
- "Check Account Name of Created account"
- )
+ account.name,
+ account_response.name,
+ "Check Account Name of Created account"
+ )
# Create an User associated with account
user = User.create(
- self.apiclient,
- self.services["user"],
- account=account.name,
- domainid=account.domainid
- )
+ self.apiclient,
+ self.services["user"],
+ account=account.name,
+ domainid=account.domainid
+ )
self.debug("Created user: %s" % user.id)
list_users_response = list_users(
- self.apiclient,
- id=user.id
- )
+ self.apiclient,
+ id=user.id
+ )
self.assertEqual(
- isinstance(list_users_response, list),
- True,
- "Check list users for valid data"
- )
+ isinstance(list_users_response, list),
+ True,
+ "Check list users for valid data"
+ )
self.assertNotEqual(
- len(list_users_response),
- 0,
- "Check List User response"
- )
+ len(list_users_response),
+ 0,
+ "Check List User response"
+ )
user_response = list_users_response[0]
self.assertEqual(
- user.username,
- user_response.username,
- "Check username of Created user"
- )
+ user.username,
+ user_response.username,
+ "Check username of Created user"
+ )
self.assertEqual(
- user.state,
- user_response.state,
- "Check state of created user"
- )
+ user.state,
+ user_response.state,
+ "Check state of created user"
+ )
return
@@ -248,39 +256,41 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.testClient = super(TestRemoveUserFromAccount, cls).getClsTestClient()
+ cls.testClient = super(
+ TestRemoveUserFromAccount,
+ cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["virtual_machine"]["template"] = cls.template.id
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"]
- )
+ cls.api_client,
+ cls.services["service_offering"]
+ )
# Create an account
cls.account = Account.create(
- cls.api_client,
- cls.services["account"]
- )
+ cls.api_client,
+ cls.services["account"]
+ )
- cls._cleanup = [cls.account,
- cls.service_offering,
+ cls._cleanup = [cls.account,
+ cls.service_offering,
]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -294,13 +304,20 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created instance, users etc
+ # Clean up, terminate the created instance, users etc
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_user_remove_VM_running(self):
"""Test Remove one user from the account
"""
@@ -308,51 +325,52 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
# Validate the following
# 1. Create an account with 2 users.
# 2. Start 2 VMs; one for each user of the account
- # 3. Remove one user from the account. Verify that account still exists.
+ # 3. Remove one user from the account. Verify that account
+ # still exists.
# 4. Verify that VM started by the removed user are still running
# Create an User associated with account and VMs
user_1 = User.create(
- self.apiclient,
- self.services["user"],
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ self.services["user"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.debug("Created user: %s" % user_1.id)
user_2 = User.create(
- self.apiclient,
- self.services["user"],
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ self.services["user"],
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.debug("Created user: %s" % user_2.id)
self.cleanup.append(user_2)
vm_1 = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
self.debug("Deployed VM in account: %s, ID: %s" % (
- self.account.name,
- vm_1.id
- ))
+ self.account.name,
+ vm_1.id
+ ))
self.cleanup.append(vm_1)
vm_2 = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id
+ )
self.debug("Deployed VM in account: %s, ID: %s" % (
- self.account.name,
- vm_2.id
- ))
+ self.account.name,
+ vm_2.id
+ ))
self.cleanup.append(vm_2)
# Remove one of the user
@@ -361,44 +379,44 @@ class TestRemoveUserFromAccount(cloudstackTestCase):
# Account should exist after deleting user
accounts_response = list_accounts(
- self.apiclient,
- id=self.account.id
- )
+ self.apiclient,
+ id=self.account.id
+ )
self.assertEqual(
- isinstance(accounts_response, list),
- True,
- "Check for valid list accounts response"
- )
+ isinstance(accounts_response, list),
+ True,
+ "Check for valid list accounts response"
+ )
self.assertNotEqual(
- len(accounts_response),
- 0,
- "Check List Account response"
- )
+ len(accounts_response),
+ 0,
+ "Check List Account response"
+ )
vm_response = list_virtual_machines(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.assertEqual(
- isinstance(vm_response, list),
- True,
- "Check for valid list VM response"
- )
+ isinstance(vm_response, list),
+ True,
+ "Check for valid list VM response"
+ )
self.assertNotEqual(
- len(vm_response),
- 0,
- "Check List VM response"
- )
+ len(vm_response),
+ 0,
+ "Check List VM response"
+ )
# VMs associated with that account should be running
for vm in vm_response:
self.assertEqual(
- vm.state,
- 'Running',
- "Check state of VMs associated with account"
- )
+ vm.state,
+ 'Running',
+ "Check state of VMs associated with account"
+ )
return
@@ -406,7 +424,9 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
@classmethod
def setUpClass(cls):
- cls.testClient = super(TestNonRootAdminsPrivileges, cls).getClsTestClient()
+ cls.testClient = super(
+ TestNonRootAdminsPrivileges,
+ cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.services = Services().services
@@ -414,25 +434,25 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
cls.services['mode'] = cls.zone.networktype
# Create an account, domain etc
cls.domain = Domain.create(
- cls.api_client,
- cls.services["domain"],
- )
+ cls.api_client,
+ cls.services["domain"],
+ )
cls.account = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
cls._cleanup = [
- cls.account,
- cls.domain
- ]
+ cls.account,
+ cls.domain
+ ]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -446,13 +466,20 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created accounts
+ # Clean up, terminate the created accounts
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_non_root_admin_Privileges(self):
"""Test to verify Non Root admin previleges"""
@@ -463,42 +490,42 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase):
# Create accounts for ROOT domain
account_1 = Account.create(
- self.apiclient,
- self.services["account"]
- )
+ self.apiclient,
+ self.services["account"]
+ )
self.debug("Created account: %s" % account_1.name)
self.cleanup.append(account_1)
account_2 = Account.create(
- self.apiclient,
- self.services["account"]
- )
+ self.apiclient,
+ self.services["account"]
+ )
self.debug("Created account: %s" % account_2.name)
self.cleanup.append(account_2)
accounts_response = list_accounts(
- self.apiclient,
- domainid=self.domain.id,
- listall=True
- )
+ self.apiclient,
+ domainid=self.domain.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(accounts_response, list),
- True,
- "Check list accounts response for valid data"
- )
+ isinstance(accounts_response, list),
+ True,
+ "Check list accounts response for valid data"
+ )
self.assertEqual(
- len(accounts_response),
- 1,
- "Check List accounts response"
- )
+ len(accounts_response),
+ 1,
+ "Check List accounts response"
+ )
# Verify only account associated with domain is listed
for account in accounts_response:
self.assertEqual(
- account.domainid,
- self.domain.id,
- "Check domain ID of account"
- )
+ account.domainid,
+ self.domain.id,
+ "Check domain ID of account"
+ )
return
@@ -507,54 +534,54 @@ class TestServiceOfferingSiblings(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.api_client = super(
- TestServiceOfferingSiblings,
- cls
- ).getClsTestClient().getApiClient()
+ TestServiceOfferingSiblings,
+ cls
+ ).getClsTestClient().getApiClient()
cls.services = Services().services
# Create Domains, accounts etc
cls.domain_1 = Domain.create(
- cls.api_client,
- cls.services["domain"]
- )
+ cls.api_client,
+ cls.services["domain"]
+ )
cls.domain_2 = Domain.create(
- cls.api_client,
- cls.services["domain"]
- )
+ cls.api_client,
+ cls.services["domain"]
+ )
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"],
- domainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["service_offering"],
+ domainid=cls.domain_1.id
+ )
# Create account for doamin_1
cls.account_1 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_1.id
+ )
# Create an account for domain_2
cls.account_2 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_2.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_2.id
+ )
cls._cleanup = [
- cls.account_1,
- cls.account_2,
- cls.service_offering,
- cls.domain_1,
- cls.domain_2,
- ]
+ cls.account_1,
+ cls.account_2,
+ cls.service_offering,
+ cls.domain_1,
+ cls.domain_2,
+ ]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -568,13 +595,20 @@ class TestServiceOfferingSiblings(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created domains, accounts
+ # Clean up, terminate the created domains, accounts
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_service_offering_siblings(self):
"""Test to verify service offerings at same level in hierarchy"""
@@ -583,38 +617,39 @@ class TestServiceOfferingSiblings(cloudstackTestCase):
# 2. Verify service offering is not visible for domain_2
service_offerings = list_service_offering(
- self.apiclient,
- domainid=self.domain_1.id
- )
+ self.apiclient,
+ domainid=self.domain_1.id
+ )
self.assertEqual(
- isinstance(service_offerings, list),
- True,
- "Check if valid list service offerings response"
- )
+ isinstance(service_offerings, list),
+ True,
+ "Check if valid list service offerings response"
+ )
self.assertNotEqual(
- len(service_offerings),
- 0,
- "Check List Service Offerings response"
- )
+ len(service_offerings),
+ 0,
+ "Check List Service Offerings response"
+ )
for service_offering in service_offerings:
self.debug("Validating service offering: %s" % service_offering.id)
self.assertEqual(
- service_offering.id,
- self.service_offering.id,
- "Check Service offering ID for domain" + str(self.domain_1.name)
+ service_offering.id,
+ self.service_offering.id,
+ "Check Service offering ID for domain" +
+ str(self.domain_1.name)
)
# Verify private service offering is not visible to other domain
service_offerings = list_service_offering(
- self.apiclient,
- domainid=self.domain_2.id
- )
+ self.apiclient,
+ domainid=self.domain_2.id
+ )
self.assertEqual(
- service_offerings,
- None,
- "Check List Service Offerings response for other domain"
- )
+ service_offerings,
+ None,
+ "Check List Service Offerings response for other domain"
+ )
return
@@ -623,56 +658,56 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.api_client = super(
- TestServiceOfferingHierarchy,
- cls
- ).getClsTestClient().getApiClient()
+ TestServiceOfferingHierarchy,
+ cls
+ ).getClsTestClient().getApiClient()
cls.services = Services().services
# Create domain, service offerings etc
cls.domain_1 = Domain.create(
- cls.api_client,
- cls.services["domain"]
- )
+ cls.api_client,
+ cls.services["domain"]
+ )
cls.domain_2 = Domain.create(
- cls.api_client,
- cls.services["domain"],
- parentdomainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["domain"],
+ parentdomainid=cls.domain_1.id
+ )
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"],
- domainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["service_offering"],
+ domainid=cls.domain_1.id
+ )
# Create account for doamin_1
cls.account_1 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_1.id
+ )
# Create an account for domain_2
cls.account_2 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_2.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_2.id
+ )
cls._cleanup = [
- cls.account_2,
- cls.domain_2,
- cls.service_offering,
- cls.account_1,
- cls.domain_1,
- ]
+ cls.account_2,
+ cls.domain_2,
+ cls.service_offering,
+ cls.account_1,
+ cls.domain_1,
+ ]
return
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -686,13 +721,20 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created instance, volumes and snapshots
+ # Clean up, terminate the created instance, volumes and snapshots
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_service_offering_hierarchy(self):
"""Test to verify service offerings at same level in hierarchy"""
@@ -701,37 +743,38 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
# 2. Verify service offering is also visible for domain_2
service_offerings = list_service_offering(
- self.apiclient,
- domainid=self.domain_1.id
- )
+ self.apiclient,
+ domainid=self.domain_1.id
+ )
self.assertEqual(
- isinstance(service_offerings, list),
- True,
- "Check List Service Offerings for a valid response"
- )
+ isinstance(service_offerings, list),
+ True,
+ "Check List Service Offerings for a valid response"
+ )
self.assertNotEqual(
- len(service_offerings),
- 0,
- "Check List Service Offerings response"
- )
+ len(service_offerings),
+ 0,
+ "Check List Service Offerings response"
+ )
for service_offering in service_offerings:
self.assertEqual(
- service_offering.id,
- self.service_offering.id,
- "Check Service offering ID for domain" + str(self.domain_1.name)
+ service_offering.id,
+ self.service_offering.id,
+ "Check Service offering ID for domain" +
+ str(self.domain_1.name)
)
# Verify private service offering is not visible to other domain
service_offerings = list_service_offering(
- self.apiclient,
- domainid=self.domain_2.id
- )
+ self.apiclient,
+ domainid=self.domain_2.id
+ )
self.assertEqual(
- service_offerings,
- None,
- "Check List Service Offerings for a valid response"
- )
+ service_offerings,
+ None,
+ "Check List Service Offerings for a valid response"
+ )
return
@@ -745,56 +788,56 @@ class TestTemplateHierarchy(cloudstackTestCase):
cls.services = Services().services
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
- cls.services['mode'] = cls.zone.networktype
+ cls.services['mode'] = cls.zone.networktype
# Create domains, accounts and template
cls.domain_1 = Domain.create(
- cls.api_client,
- cls.services["domain"]
- )
+ cls.api_client,
+ cls.services["domain"]
+ )
cls.domain_2 = Domain.create(
- cls.api_client,
- cls.services["domain"],
- parentdomainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["domain"],
+ parentdomainid=cls.domain_1.id
+ )
# Create account for doamin_1
cls.account_1 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_1.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_1.id
+ )
# Create an account for domain_2
cls.account_2 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain_2.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain_2.id
+ )
cls._cleanup = [
- cls.account_2,
- cls.domain_2,
- cls.account_1,
- cls.domain_1,
- ]
+ cls.account_2,
+ cls.domain_2,
+ cls.account_1,
+ cls.domain_1,
+ ]
builtin_info = get_builtin_template_info(cls.api_client, cls.zone.id)
- cls.services["template"]["url"] = builtin_info[0]
- cls.services["template"]["hypervisor"] = builtin_info[1]
- cls.services["template"]["format"] = builtin_info[2]
-
+ cls.services["template"]["url"] = builtin_info[0]
+ cls.services["template"]["hypervisor"] = builtin_info[1]
+ cls.services["template"]["format"] = builtin_info[2]
+
# Register new template
cls.template = Template.register(
- cls.api_client,
- cls.services["template"],
- zoneid=cls.zone.id,
- account=cls.account_1.name,
- domainid=cls.domain_1.id,
- hypervisor=cls.hypervisor
- )
+ cls.api_client,
+ cls.services["template"],
+ zoneid=cls.zone.id,
+ account=cls.account_1.name,
+ domainid=cls.domain_1.id,
+ hypervisor=cls.hypervisor
+ )
# Wait for template to download
cls.template.download(cls.api_client)
@@ -806,7 +849,7 @@ class TestTemplateHierarchy(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -820,7 +863,7 @@ class TestTemplateHierarchy(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created instance, volumes and snapshots
+ # Clean up, terminate the created instance, volumes and snapshots
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -837,53 +880,53 @@ class TestTemplateHierarchy(cloudstackTestCase):
# Sleep to ensure that template state is reflected across
templates = list_templates(
- self.apiclient,
- templatefilter='self',
- account=self.account_1.name,
- domainid=self.domain_1.id
- )
+ self.apiclient,
+ templatefilter='self',
+ account=self.account_1.name,
+ domainid=self.domain_1.id
+ )
self.assertEqual(
- isinstance(templates, list),
- True,
- "Template response %s is not a list" % templates
- )
+ isinstance(templates, list),
+ True,
+ "Template response %s is not a list" % templates
+ )
self.assertNotEqual(
- len(templates),
- 0,
- "No templates found"
- )
+ len(templates),
+ 0,
+ "No templates found"
+ )
for template in templates:
self.assertEqual(
- template.id,
- self.template.id,
- "Check Template ID for domain" + str(self.domain_1.name)
+ template.id,
+ self.template.id,
+ "Check Template ID for domain" + str(self.domain_1.name)
)
# Verify private service offering is not visible to other domain
templates = list_templates(
- self.apiclient,
- id=self.template.id,
- templatefilter='all',
- account=self.account_2.name,
- domainid=self.domain_2.id
- )
+ self.apiclient,
+ id=self.template.id,
+ templatefilter='all',
+ account=self.account_2.name,
+ domainid=self.domain_2.id
+ )
self.assertEqual(
- isinstance(templates, list),
- True,
- "Template response %s is not a list" % templates
- )
+ isinstance(templates, list),
+ True,
+ "Template response %s is not a list" % templates
+ )
self.assertNotEqual(
- len(templates),
- 0,
- "No templates found"
- )
+ len(templates),
+ 0,
+ "No templates found"
+ )
for template in templates:
self.assertEqual(
- template.id,
- self.template.id,
- "Check Template ID for domain" + str(self.domain_2.name)
+ template.id,
+ self.template.id,
+ "Check Template ID for domain" + str(self.domain_2.name)
)
return
@@ -900,68 +943,68 @@ class TestAddVmToSubDomain(cloudstackTestCase):
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
cls.sub_domain = Domain.create(
- cls.api_client,
- cls.services["domain"],
- parentdomainid=cls.domain.id
- )
+ cls.api_client,
+ cls.services["domain"],
+ parentdomainid=cls.domain.id
+ )
# Create account for doamin_1
cls.account_1 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.domain.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.domain.id
+ )
# Create an account for domain_2
cls.account_2 = Account.create(
- cls.api_client,
- cls.services["account"],
- admin=True,
- domainid=cls.sub_domain.id
- )
+ cls.api_client,
+ cls.services["account"],
+ admin=True,
+ domainid=cls.sub_domain.id
+ )
cls.service_offering = ServiceOffering.create(
- cls.api_client,
- cls.services["service_offering"],
- domainid=cls.domain.id
- )
+ cls.api_client,
+ cls.services["service_offering"],
+ domainid=cls.domain.id
+ )
cls._cleanup = [
- cls.account_2,
- cls.account_1,
- cls.sub_domain,
- cls.service_offering
- ]
+ cls.account_2,
+ cls.account_1,
+ cls.sub_domain,
+ cls.service_offering
+ ]
cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.vm_1 = VirtualMachine.create(
- cls.api_client,
- cls.services["virtual_machine"],
- templateid=cls.template.id,
- accountid=cls.account_1.name,
- domainid=cls.account_1.domainid,
- serviceofferingid=cls.service_offering.id
- )
+ cls.api_client,
+ cls.services["virtual_machine"],
+ templateid=cls.template.id,
+ accountid=cls.account_1.name,
+ domainid=cls.account_1.domainid,
+ serviceofferingid=cls.service_offering.id
+ )
cls.vm_2 = VirtualMachine.create(
- cls.api_client,
- cls.services["virtual_machine"],
- templateid=cls.template.id,
- accountid=cls.account_2.name,
- domainid=cls.account_2.domainid,
- serviceofferingid=cls.service_offering.id
- )
+ cls.api_client,
+ cls.services["virtual_machine"],
+ templateid=cls.template.id,
+ accountid=cls.account_2.name,
+ domainid=cls.account_2.domainid,
+ serviceofferingid=cls.service_offering.id
+ )
return
@classmethod
def tearDownClass(cls):
try:
- #Clean up, terminate the created resources
+ # Clean up, terminate the created resources
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -975,60 +1018,68 @@ class TestAddVmToSubDomain(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created resources
+ # Clean up, terminate the created resources
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
+ @attr(
+ tags=[
+ "advanced",
+ "basic",
+ "eip",
+ "advancedns",
+ "sg"],
+ required_hardware="false")
def test_01_add_vm_to_subdomain(self):
- """ Test Sub domain allowed to launch VM when a Domain level zone is created"""
+ """ Test Sub domain allowed to launch VM when a Domain
+ level zone is created"""
# Validate the following
# 1. Verify VM created by Account_1 is in Running state
# 2. Verify VM created by Account_2 is in Running state
vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_1.id
- )
+ self.apiclient,
+ id=self.vm_1.id
+ )
self.assertEqual(
- isinstance(vm_response, list),
- True,
- "Check List VM for a valid response"
- )
+ isinstance(vm_response, list),
+ True,
+ "Check List VM for a valid response"
+ )
self.assertNotEqual(
- len(vm_response),
- 0,
- "Check List Template response"
- )
+ len(vm_response),
+ 0,
+ "Check List Template response"
+ )
for vm in vm_response:
self.debug("VM ID: %s and state: %s" % (vm.id, vm.state))
self.assertEqual(
- vm.state,
- 'Running',
- "Check State of Virtual machine"
- )
+ vm.state,
+ 'Running',
+ "Check State of Virtual machine"
+ )
vm_response = list_virtual_machines(
- self.apiclient,
- id=self.vm_2.id
- )
+ self.apiclient,
+ id=self.vm_2.id
+ )
self.assertNotEqual(
- len(vm_response),
- 0,
- "Check List Template response"
- )
+ len(vm_response),
+ 0,
+ "Check List Template response"
+ )
for vm in vm_response:
self.debug("VM ID: %s and state: %s" % (vm.id, vm.state))
self.assertEqual(
- vm.state,
- 'Running',
- "Check State of Virtual machine"
- )
+ vm.state,
+ 'Running',
+ "Check State of Virtual machine"
+ )
return
@@ -1049,7 +1100,7 @@ class TestUserDetails(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -1063,22 +1114,22 @@ class TestUserDetails(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created network offerings
+ # Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@attr(tags=[
- "role",
- "accounts",
- "simulator",
- "advanced",
- "advancedns",
- "basic",
- "eip",
- "sg"
- ])
+ "role",
+ "accounts",
+ "simulator",
+ "advanced",
+ "advancedns",
+ "basic",
+ "eip",
+ "sg"
+ ])
def test_updateUserDetails(self):
"""Test user update API
"""
@@ -1096,26 +1147,26 @@ class TestUserDetails(cloudstackTestCase):
self.debug("Creating an user account..")
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=self.domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=self.domain.id
+ )
self.cleanup.append(self.account)
# Fetching the user details of account
self.debug(
- "Fetching user details for account: %s" %
- self.account.name)
+ "Fetching user details for account: %s" %
+ self.account.name)
users = User.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.debug("Updating the details of user: %s" % user_1.name)
firstname = random_gen()
@@ -1123,49 +1174,49 @@ class TestUserDetails(cloudstackTestCase):
self.debug("New firstname: %s, lastname: %s" % (firstname, lastname))
User.update(
- self.apiclient,
- user_1.id,
- firstname=firstname,
- lastname=lastname
- )
+ self.apiclient,
+ user_1.id,
+ firstname=firstname,
+ lastname=lastname
+ )
# Fetching the user details of account
self.debug(
- "Fetching user details for user: %s" % user_1.name)
+ "Fetching user details for user: %s" % user_1.name)
users = User.list(
- self.apiclient,
- id=user_1.id,
- listall=True
- )
+ self.apiclient,
+ id=user_1.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.assertEqual(
- user_1.firstname,
- firstname,
- "User's first name should be updated with new one"
- )
+ user_1.firstname,
+ firstname,
+ "User's first name should be updated with new one"
+ )
self.assertEqual(
- user_1.lastname,
- lastname,
- "User's last name should be updated with new one"
- )
+ user_1.lastname,
+ lastname,
+ "User's last name should be updated with new one"
+ )
return
@attr(tags=[
- "role",
- "accounts",
- "simulator",
- "advanced",
- "advancedns",
- "basic",
- "eip",
- "sg"
- ])
+ "role",
+ "accounts",
+ "simulator",
+ "advanced",
+ "advancedns",
+ "basic",
+ "eip",
+ "sg"
+ ])
def test_updateAdminDetails(self):
"""Test update admin details
"""
@@ -1183,26 +1234,26 @@ class TestUserDetails(cloudstackTestCase):
self.debug("Creating a ROOT admin account")
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- )
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ )
self.cleanup.append(self.account)
# Fetching the user details of account
self.debug(
- "Fetching user details for account: %s" %
- self.account.name)
+ "Fetching user details for account: %s" %
+ self.account.name)
users = User.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.debug("Updating the details of user: %s" % user_1.name)
firstname = random_gen()
@@ -1210,49 +1261,49 @@ class TestUserDetails(cloudstackTestCase):
self.debug("New firstname: %s, lastname: %s" % (firstname, lastname))
User.update(
- self.apiclient,
- user_1.id,
- firstname=firstname,
- lastname=lastname
- )
+ self.apiclient,
+ user_1.id,
+ firstname=firstname,
+ lastname=lastname
+ )
# Fetching the user details of account
self.debug(
- "Fetching user details for user: %s" % user_1.name)
+ "Fetching user details for user: %s" % user_1.name)
users = User.list(
- self.apiclient,
- id=user_1.id,
- listall=True
- )
+ self.apiclient,
+ id=user_1.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.assertEqual(
- user_1.firstname,
- firstname,
- "User's first name should be updated with new one"
- )
+ user_1.firstname,
+ firstname,
+ "User's first name should be updated with new one"
+ )
self.assertEqual(
- user_1.lastname,
- lastname,
- "User's last name should be updated with new one"
- )
+ user_1.lastname,
+ lastname,
+ "User's last name should be updated with new one"
+ )
return
@attr(tags=[
- "role",
- "accounts",
- "simulator",
- "advanced",
- "advancedns",
- "basic",
- "eip",
- "sg"
- ])
+ "role",
+ "accounts",
+ "simulator",
+ "advanced",
+ "advancedns",
+ "basic",
+ "eip",
+ "sg"
+ ])
def test_updateDomainAdminDetails(self):
"""Test update domain admin details
"""
@@ -1269,27 +1320,27 @@ class TestUserDetails(cloudstackTestCase):
self.debug("Creating a domain admin account")
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- admin=True,
- domainid=self.domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ admin=True,
+ domainid=self.domain.id
+ )
self.cleanup.append(self.account)
# Fetching the user details of account
self.debug(
- "Fetching user details for account: %s" %
- self.account.name)
+ "Fetching user details for account: %s" %
+ self.account.name)
users = User.list(
- self.apiclient,
- account=self.account.name,
- domainid=self.account.domainid
- )
+ self.apiclient,
+ account=self.account.name,
+ domainid=self.account.domainid
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.debug("Updating the details of user: %s" % user_1.name)
firstname = random_gen()
@@ -1297,39 +1348,40 @@ class TestUserDetails(cloudstackTestCase):
self.debug("New firstname: %s, lastname: %s" % (firstname, lastname))
User.update(
- self.apiclient,
- user_1.id,
- firstname=firstname,
- lastname=lastname
- )
+ self.apiclient,
+ user_1.id,
+ firstname=firstname,
+ lastname=lastname
+ )
# Fetching the user details of account
self.debug(
- "Fetching user details for user: %s" % user_1.name)
+ "Fetching user details for user: %s" % user_1.name)
users = User.list(
- self.apiclient,
- id=user_1.id,
- listall=True
- )
+ self.apiclient,
+ id=user_1.id,
+ listall=True
+ )
self.assertEqual(
- isinstance(users, list),
- True,
- "List users should return a valid list for account"
- )
+ isinstance(users, list),
+ True,
+ "List users should return a valid list for account"
+ )
user_1 = users[0]
self.assertEqual(
- user_1.firstname,
- firstname,
- "User's first name should be updated with new one"
- )
+ user_1.firstname,
+ firstname,
+ "User's first name should be updated with new one"
+ )
self.assertEqual(
- user_1.lastname,
- lastname,
- "User's last name should be updated with new one"
- )
+ user_1.lastname,
+ lastname,
+ "User's last name should be updated with new one"
+ )
return
+
class TestUserLogin(cloudstackTestCase):
@classmethod
@@ -1347,7 +1399,7 @@ class TestUserLogin(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
- #Cleanup resources used
+ # Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -1361,14 +1413,14 @@ class TestUserLogin(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created network offerings
+ # Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
@attr(tags=["login", "accounts", "simulator", "advanced",
- "advancedns", "basic", "eip", "sg"])
+ "advancedns", "basic", "eip", "sg"])
def test_LoginApiUuidResponse(self):
"""Test if Login API does not return UUID's
"""
@@ -1385,31 +1437,31 @@ class TestUserLogin(cloudstackTestCase):
self.debug("Creating an user account..")
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=self.domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=self.domain.id
+ )
self.cleanup.append(self.account)
self.debug("Logging into the cloudstack with login API")
respose = User.login(
- self.apiclient,
- username=self.account.name,
- password=self.services["account"]["password"]
- )
+ self.apiclient,
+ username=self.account.name,
+ password=self.services["account"]["password"]
+ )
self.debug("Login API response: %s" % respose)
self.assertNotEqual(
- respose.sessionkey,
- None,
- "Login to the CloudStack should be successful" +
- "response shall have non Null key"
- )
+ respose.sessionkey,
+ None,
+ "Login to the CloudStack should be successful" +
+ "response shall have non Null key"
+ )
return
@attr(tags=["login", "accounts", "simulator", "advanced",
- "advancedns", "basic", "eip", "sg"])
+ "advancedns", "basic", "eip", "sg"])
def test_LoginApiDomain(self):
"""Test login API with domain
"""
@@ -1427,55 +1479,55 @@ class TestUserLogin(cloudstackTestCase):
self.debug("Creating a domain for login with API domain test")
domain = Domain.create(
- self.apiclient,
- self.services["domain"],
- parentdomainid=self.domain.id
- )
+ self.apiclient,
+ self.services["domain"],
+ parentdomainid=self.domain.id
+ )
self.debug("Domain: %s is created succesfully." % domain.name)
self.debug(
"Checking if the created domain is listed in list domains API")
domains = Domain.list(self.apiclient, id=domain.id, listall=True)
self.assertEqual(
- isinstance(domains, list),
- True,
- "List domains shall return a valid response"
- )
+ isinstance(domains, list),
+ True,
+ "List domains shall return a valid response"
+ )
self.debug("Creating an user account in domain: %s" % domain.name)
self.account = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=domain.id
+ )
self.cleanup.append(self.account)
accounts = Account.list(
- self.apiclient,
- name=self.account.name,
- domainid=self.account.domainid,
- listall=True
- )
+ self.apiclient,
+ name=self.account.name,
+ domainid=self.account.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(accounts, list),
- True,
- "List accounts should return a valid response"
- )
+ isinstance(accounts, list),
+ True,
+ "List accounts should return a valid response"
+ )
self.debug("Logging into the cloudstack with login API")
respose = User.login(
- self.apiclient,
- username=self.account.name,
- password=self.services["account"]["password"],
- domainid=domain.id)
+ self.apiclient,
+ username=self.account.name,
+ password=self.services["account"]["password"],
+ domainid=domain.id)
self.debug("Login API response: %s" % respose)
self.assertNotEqual(
- respose.sessionkey,
- None,
- "Login to the CloudStack should be successful" +
- "response shall have non Null key"
- )
+ respose.sessionkey,
+ None,
+ "Login to the CloudStack should be successful" +
+ "response shall have non Null key"
+ )
return
@@ -1492,10 +1544,10 @@ class TestDomainForceRemove(cloudstackTestCase):
cls.services['mode'] = cls.zone.networktype
cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+ cls.api_client,
+ cls.zone.id,
+ cls.services["ostype"]
+ )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls._cleanup = []
@@ -1504,7 +1556,7 @@ class TestDomainForceRemove(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
- #Clean up, terminate the created resources
+ # Clean up, terminate the created resources
cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
@@ -1519,13 +1571,20 @@ class TestDomainForceRemove(cloudstackTestCase):
def tearDown(self):
try:
- #Clean up, terminate the created resources
+ # Clean up, terminate the created resources
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
- @attr(tags=["domains", "advanced", "advancedns", "simulator", "dvs"], required_hardware="false")
+ @attr(
+ tags=[
+ "domains",
+ "advanced",
+ "advancedns",
+ "simulator",
+ "dvs"],
+ required_hardware="false")
def test_forceDeleteDomain(self):
""" Test delete domain with force option"""
@@ -1547,124 +1606,124 @@ class TestDomainForceRemove(cloudstackTestCase):
self.debug("Creating a domain for login with API domain test")
domain = Domain.create(
- self.apiclient,
- self.services["domain"],
- parentdomainid=self.domain.id
- )
+ self.apiclient,
+ self.services["domain"],
+ parentdomainid=self.domain.id
+ )
self.debug("Domain is created succesfully.")
self.debug(
"Checking if the created domain is listed in list domains API")
domains = Domain.list(self.apiclient, id=domain.id, listall=True)
self.assertEqual(
- isinstance(domains, list),
- True,
- "List domains shall return a valid response"
- )
+ isinstance(domains, list),
+ True,
+ "List domains shall return a valid response"
+ )
self.debug("Creating 2 user accounts in domain: %s" % domain.name)
self.account_1 = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=domain.id
+ )
self.account_2 = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=domain.id
+ )
try:
self.debug("Creating a tiny service offering for VM deployment")
self.service_offering = ServiceOffering.create(
- self.apiclient,
- self.services["service_offering"],
- domainid=self.domain.id
- )
+ self.apiclient,
+ self.services["service_offering"],
+ domainid=self.domain.id
+ )
self.debug("Deploying virtual machine in account 1: %s" %
- self.account_1.name)
+ self.account_1.name)
vm_1 = VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- templateid=self.template.id,
- accountid=self.account_1.name,
- domainid=self.account_1.domainid,
- serviceofferingid=self.service_offering.id
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ accountid=self.account_1.name,
+ domainid=self.account_1.domainid,
+ serviceofferingid=self.service_offering.id
+ )
self.debug("Deploying virtual machine in account 2: %s" %
- self.account_2.name)
+ self.account_2.name)
VirtualMachine.create(
- self.apiclient,
- self.services["virtual_machine"],
- templateid=self.template.id,
- accountid=self.account_2.name,
- domainid=self.account_2.domainid,
- serviceofferingid=self.service_offering.id
- )
+ self.apiclient,
+ self.services["virtual_machine"],
+ templateid=self.template.id,
+ accountid=self.account_2.name,
+ domainid=self.account_2.domainid,
+ serviceofferingid=self.service_offering.id
+ )
networks = Network.list(
- self.apiclient,
- account=self.account_1.name,
- domainid=self.account_1.domainid,
- listall=True
- )
+ self.apiclient,
+ account=self.account_1.name,
+ domainid=self.account_1.domainid,
+ listall=True
+ )
self.assertEqual(
- isinstance(networks, list),
- True,
- "List networks should return a valid response"
- )
+ isinstance(networks, list),
+ True,
+ "List networks should return a valid response"
+ )
network_1 = networks[0]
self.debug("Default network in account 1: %s is %s" % (
- self.account_1.name,
- network_1.name))
+ self.account_1.name,
+ network_1.name))
src_nat_list = PublicIPAddress.list(
- self.apiclient,
- associatednetworkid=network_1.id,
- account=self.account_1.name,
- domainid=self.account_1.domainid,
- listall=True,
- issourcenat=True,
- )
+ self.apiclient,
+ associatednetworkid=network_1.id,
+ account=self.account_1.name,
+ domainid=self.account_1.domainid,
+ listall=True,
+ issourcenat=True,
+ )
self.assertEqual(
- isinstance(src_nat_list, list),
- True,
- "List Public IP should return a valid source NAT"
- )
+ isinstance(src_nat_list, list),
+ True,
+ "List Public IP should return a valid source NAT"
+ )
self.assertNotEqual(
- len(src_nat_list),
- 0,
- "Length of response from listPublicIp should not be 0"
- )
+ len(src_nat_list),
+ 0,
+ "Length of response from listPublicIp should not be 0"
+ )
src_nat = src_nat_list[0]
self.debug(
- "Trying to create a port forwarding rule in source NAT: %s" %
- src_nat.ipaddress)
- #Create NAT rule
+ "Trying to create a port forwarding rule in source NAT: %s" %
+ src_nat.ipaddress)
+ # Create NAT rule
nat_rule = NATRule.create(
- self.apiclient,
- vm_1,
- self.services["natrule"],
- ipaddressid=src_nat.id
- )
+ self.apiclient,
+ vm_1,
+ self.services["natrule"],
+ ipaddressid=src_nat.id
+ )
self.debug("Created PF rule on source NAT: %s" % src_nat.ipaddress)
nat_rules = NATRule.list(self.apiclient, id=nat_rule.id)
self.assertEqual(
- isinstance(nat_rules, list),
- True,
- "List NAT should return a valid port forwarding rules"
- )
+ isinstance(nat_rules, list),
+ True,
+ "List NAT should return a valid port forwarding rules"
+ )
self.assertNotEqual(
- len(nat_rules),
- 0,
- "Length of response from listLbRules should not be 0"
- )
+ len(nat_rules),
+ 0,
+ "Length of response from listLbRules should not be 0"
+ )
except Exception as e:
self.clenaup.append(self.account_1)
self.cleanup.append(self.account_2)
@@ -1675,27 +1734,33 @@ class TestDomainForceRemove(cloudstackTestCase):
domain.delete(self.apiclient, cleanup=True)
except Exception as e:
self.debug("Waiting for account.cleanup.interval" +
- " to cleanup any remaining resouces")
+ " to cleanup any remaining resouces")
# Sleep 3*account.gc to ensure that all resources are deleted
- wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*3)
+ wait_for_cleanup(self.apiclient, ["account.cleanup.interval"] * 3)
with self.assertRaises(CloudstackAPIException):
Domain.list(
- self.apiclient,
- id=domain.id,
- listall=True
- )
+ self.apiclient,
+ id=domain.id,
+ listall=True
+ )
self.debug("Checking if the resources in domain are deleted")
with self.assertRaises(CloudstackAPIException):
Account.list(
- self.apiclient,
- name=self.account_1.name,
- domainid=self.account_1.domainid,
- listall=True
- )
+ self.apiclient,
+ name=self.account_1.name,
+ domainid=self.account_1.domainid,
+ listall=True
+ )
return
- @attr(tags=["domains", "advanced", "advancedns", "simulator"], required_hardware="false")
+ @attr(
+ tags=[
+ "domains",
+ "advanced",
+ "advancedns",
+ "simulator"],
+ required_hardware="false")
def test_DeleteDomain(self):
""" Test delete domain without force option"""
@@ -1715,126 +1780,126 @@ class TestDomainForceRemove(cloudstackTestCase):
self.debug("Creating a domain for login with API domain test")
domain = Domain.create(
- self.apiclient,
- self.services["domain"],
- parentdomainid=self.domain.id
- )
+ self.apiclient,
+ self.services["domain"],
+ parentdomainid=self.domain.id
+ )
self.debug("Domain: %s is created successfully." % domain.name)
self.debug(
"Checking if the created domain is listed in list domains API")
domains = Domain.list(self.apiclient, id=domain.id, listall=True)
self.assertEqual(
- isinstance(domains, list),
- True,
- "List domains shall return a valid response"
- )
+ isinstance(domains, list),
+ True,
+ "List domains shall return a valid response"
+ )
self.debug("Creating 2 user accounts in domain: %s" % domain.name)
self.account_1 = Account.create(
- self.apiclient,
- self.services["account"],
- domainid=domain.id
- )
+ self.apiclient,
+ self.services["account"],
+ domainid=domain.id
+ )
self.cleanup.append(self.account_1)
self.account_2 = Account.create(
-
<TRUNCATED>
[2/2] git commit: updated refs/heads/master to 8558adb
Posted by gu...@apache.org.
CLOUDSTACK-8388: test_accounts.py - Fixing pep8 issues
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
This closes #171
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8558adb5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8558adb5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8558adb5
Branch: refs/heads/master
Commit: 8558adb508abc0fa00621fe31efd6431c4ef3c39
Parents: 581f3b7
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Apr 15 17:21:15 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Wed Apr 15 17:31:51 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 1743 +++++++++++-----------
1 file changed, 904 insertions(+), 839 deletions(-)
----------------------------------------------------------------------