CLOUDSTACK-7693: Fixing pep8 issues pep8 fixes for test_routers.py
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35e05a69 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35e05a69 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35e05a69 Branch: refs/heads/master Commit: 35e05a69a51496c343cf3bf8545c9d3650d4c6e8 Parents: 58cfbcd Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Thu Oct 9 15:30:43 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Wed Oct 15 10:56:55 2014 +0530 ---------------------------------------------------------------------- .../component/test_recurring_snapshots.py | 497 +++--- test/integration/component/test_routers.py | 1422 +++++++++--------- 2 files changed, 984 insertions(+), 935 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35e05a69/test/integration/component/test_recurring_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_recurring_snapshots.py b/test/integration/component/test_recurring_snapshots.py index faa6787..58dd769 100644 --- a/test/integration/component/test_recurring_snapshots.py +++ b/test/integration/component/test_recurring_snapshots.py @@ -16,110 +16,125 @@ # under the License. from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import * -from marvin.cloudstackAPI import * -from marvin.lib.utils import * -from marvin.lib.base import * -from marvin.lib.common import * +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.lib.utils import (cleanup_resources) +from marvin.lib.base import (Account, + DiskOffering, + ServiceOffering, + VirtualMachine, + SnapshotPolicy) +from marvin.lib.common import (get_zone, + get_domain, + get_template, + list_snapshots, + list_volumes, + list_snapshot_policy + ) +import time + class Services: + """Test Snapshots Services """ def __init__(self): self.services = { - "account": { - "email": "t...@test.com", - "firstname": "Test", - "lastname": "User", - "username": "test", - # Random characters are appended for unique - # username - "password": "password", - }, - "service_offering": { - "name": "Tiny Instance", - "displaytext": "Tiny Instance", - "cpunumber": 1, - "cpuspeed": 200, # in MHz + "account": { + "email": "t...@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + # Random characters are appended for unique + # username + "password": "password", + }, + "service_offering": { + "name": "Tiny Instance", + "displaytext": "Tiny Instance", + "cpunumber": 1, + "cpuspeed": 200, # in MHz "memory": 256, # In MBs - }, - "disk_offering": { - "displaytext": "Small Disk", - "name": "Small Disk", - "disksize": 1 - }, - "server_with_disk": - { - "displayname": "Test VM -With Disk", - "username": "root", - "password": "password", - "ssh_port": 22, - "hypervisor": 'XenServer', - "privateport": 22, - "publicport": 22, - "protocol": 'TCP', - }, - - "server_without_disk": - { - "displayname": "Test VM-No Disk", - "username": "root", - "password": "password", - "ssh_port": 22, - "hypervisor": 'XenServer', - "privateport": 22, - # For NAT rule creation - "publicport": 22, - "protocol": 'TCP', - }, - "server": { - "displayname": "TestVM", - "username": "root", - "password": "password", - "ssh_port": 22, - "hypervisor": 'XenServer', - "privateport": 22, - "publicport": 22, - "protocol": 'TCP', - }, - "mgmt_server": { - "ipaddress": '192.168.100.21', - "username": "root", - "password": "password", - "port": 22, - }, - "recurring_snapshot": { - "intervaltype": 'HOURLY', - # Frequency of snapshots - "maxsnaps": 1, # Should be min 2 - "schedule": 1, - "timezone": 'US/Arizona', - # Timezone Formats - http://cloud.mindtouch.us/CloudStack_Documentation/Developer's_Guide%3A_CloudStack - }, - "templates": { - "displaytext": 'Template', - "name": 'Template', - "ostype": "CentOS 5.3 (64-bit)", - "templatefilter": 'self', - }, - "volume": { - "diskname": "APP Data Volume", - "size": 1, # in GBs - "diskdevice": ['/dev/xvdb', '/dev/sdb', '/dev/hdb', '/dev/vdb' ], # Data Disk - }, - "paths": { - "mount_dir": "/mnt/tmp", - "sub_dir": "test", - "sub_lvl_dir1": "test1", - "sub_lvl_dir2": "test2", - "random_data": "random.data", - }, - "ostype": "CentOS 5.3 (64-bit)", - # Cent OS 5.3 (64 bit) - "sleep": 60, - "timeout": 10, - } + }, + "disk_offering": { + "displaytext": "Small Disk", + "name": "Small Disk", + "disksize": 1 + }, + "server_with_disk": + { + "displayname": "Test VM -With Disk", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + + "server_without_disk": + { + "displayname": "Test VM-No Disk", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + "privateport": 22, + # For NAT rule creation + "publicport": 22, + "protocol": 'TCP', + }, + "server": { + "displayname": "TestVM", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + "mgmt_server": { + "ipaddress": '192.168.100.21', + "username": "root", + "password": "password", + "port": 22, + }, + "recurring_snapshot": { + "intervaltype": 'HOURLY', + # Frequency of snapshots + "maxsnaps": 1, # Should be min 2 + "schedule": 1, + "timezone": 'US/Arizona', + # Timezone Formats - + # http://cloud.mindtouch.us/CloudStack_Documentation/Developer's_Guide%3A_CloudStack + }, + "templates": { + "displaytext": 'Template', + "name": 'Template', + "ostype": "CentOS 5.3 (64-bit)", + "templatefilter": 'self', + }, + "volume": { + "diskname": "APP Data Volume", + "size": 1, # in GBs + # Data Disk + "diskdevice": ['/dev/xvdb', '/dev/sdb', + '/dev/hdb', '/dev/vdb'], + }, + "paths": { + "mount_dir": "/mnt/tmp", + "sub_dir": "test", + "sub_lvl_dir1": "test1", + "sub_lvl_dir2": "test2", + "random_data": "random.data", + }, + "ostype": "CentOS 5.3 (64-bit)", + # Cent OS 5.3 (64 bit) + "sleep": 60, + "timeout": 10, + } class TestRecurringSnapshots(cloudstackTestCase): @@ -135,14 +150,14 @@ class TestRecurringSnapshots(cloudstackTestCase): cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests()) cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( - cls.api_client, - cls.services["disk_offering"] - ) + cls.api_client, + cls.services["disk_offering"] + ) template = get_template( - cls.api_client, - cls.zone.id, - cls.services["ostype"] - ) + cls.api_client, + cls.zone.id, + cls.services["ostype"] + ) cls.services["domainid"] = cls.domain.id cls.services["server_with_disk"]["zoneid"] = cls.zone.id @@ -156,48 +171,48 @@ class TestRecurringSnapshots(cloudstackTestCase): # Create VMs, NAT Rules etc cls.account = Account.create( - cls.api_client, - cls.services["account"], - domainid=cls.domain.id - ) + cls.api_client, + cls.services["account"], + domainid=cls.domain.id + ) cls.services["account"] = cls.account.name cls.service_offering = ServiceOffering.create( - cls.api_client, - cls.services["service_offering"] - ) + cls.api_client, + cls.services["service_offering"] + ) cls.virtual_machine = cls.virtual_machine_with_disk = \ - VirtualMachine.create( - cls.api_client, - cls.services["server_with_disk"], - templateid=template.id, - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering.id, - mode=cls.services["mode"] - ) + VirtualMachine.create( + cls.api_client, + cls.services["server_with_disk"], + templateid=template.id, + accountid=cls.account.name, + domainid=cls.account.domainid, + serviceofferingid=cls.service_offering.id, + mode=cls.services["mode"] + ) cls.virtual_machine_without_disk = \ - VirtualMachine.create( - cls.api_client, - cls.services["server_without_disk"], - templateid=template.id, - accountid=cls.account.name, - domainid=cls.account.domainid, - serviceofferingid=cls.service_offering.id, - mode=cls.services["mode"] - ) + VirtualMachine.create( + cls.api_client, + cls.services["server_without_disk"], + templateid=template.id, + accountid=cls.account.name, + domainid=cls.account.domainid, + serviceofferingid=cls.service_offering.id, + mode=cls.services["mode"] + ) cls._cleanup = [ - cls.service_offering, - cls.disk_offering, - cls.account, - ] + cls.service_offering, + cls.disk_offering, + cls.account, + ] 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) @@ -211,82 +226,81 @@ class TestRecurringSnapshots(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(speed = "slow") + @attr(speed="slow") @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false") def test_recurring_snapshot_root_disk(self): """Test Recurring Snapshot Root Disk """ - #1. Create snapshot policy for root disk - #2. ListSnapshot policy should return newly created policy - #3. Verify only most recent number (maxsnaps) snapshots retailed + # 1. Create snapshot policy for root disk + # 2. ListSnapshot policy should return newly created policy + # 3. Verify only most recent number (maxsnaps) snapshots retailed volume = list_volumes( - self.apiclient, - virtualmachineid=self.virtual_machine_with_disk.id, - type='ROOT', - listall=True - ) + self.apiclient, + virtualmachineid=self.virtual_machine_with_disk.id, + type='ROOT', + listall=True + ) self.assertEqual( - isinstance(volume, list), - True, - "Check list response returns a valid list" - ) + isinstance(volume, list), + True, + "Check list response returns a valid list" + ) recurring_snapshot = SnapshotPolicy.create( - self.apiclient, - volume[0].id, - self.services["recurring_snapshot"] - ) + self.apiclient, + volume[0].id, + self.services["recurring_snapshot"] + ) self.cleanup.append(recurring_snapshot) - #ListSnapshotPolicy should return newly created policy + # ListSnapshotPolicy should return newly created policy list_snapshots_policy = list_snapshot_policy( - self.apiclient, - id=recurring_snapshot.id, - volumeid=volume[0].id - ) + self.apiclient, + id=recurring_snapshot.id, + volumeid=volume[0].id + ) self.assertEqual( - isinstance(list_snapshots_policy, list), - True, - "Check list response returns a valid list" - ) + isinstance(list_snapshots_policy, list), + True, + "Check list response returns a valid list" + ) self.assertNotEqual( - list_snapshots_policy, - None, - "Check if result exists in list item call" - ) + list_snapshots_policy, + None, + "Check if result exists in list item call" + ) snapshots_policy = list_snapshots_policy[0] self.assertEqual( - snapshots_policy.id, - recurring_snapshot.id, - "Check recurring snapshot id in list resources call" - ) + snapshots_policy.id, + recurring_snapshot.id, + "Check recurring snapshot id in list resources call" + ) self.assertEqual( - snapshots_policy.maxsnaps, - self.services["recurring_snapshot"]["maxsnaps"], - "Check interval type in list resources call" - ) + snapshots_policy.maxsnaps, + self.services["recurring_snapshot"]["maxsnaps"], + "Check interval type in list resources call" + ) # Sleep for (maxsnaps+1) hours to verify # only maxsnaps snapshots are retained time.sleep( (self.services["recurring_snapshot"]["maxsnaps"]) * 3600 - ) + ) timeout = self.services["timeout"] while True: snapshots = list_snapshots( - self.apiclient, - volumeid=volume[0].id, - intervaltype=\ - self.services["recurring_snapshot"]["intervaltype"], - snapshottype='RECURRING', - listall=True - ) + self.apiclient, + volumeid=volume[0].id, + intervaltype=self.services["recurring_snapshot"] + ["intervaltype"], + snapshottype='RECURRING', + listall=True) if isinstance(snapshots, list): break @@ -298,92 +312,91 @@ class TestRecurringSnapshots(cloudstackTestCase): timeout = timeout - 1 self.assertEqual( - isinstance(snapshots, list), - True, - "Check list response returns a valid list" - ) + isinstance(snapshots, list), + True, + "Check list response returns a valid list" + ) self.assertEqual( - len(snapshots), - self.services["recurring_snapshot"]["maxsnaps"], - "Check maximum number of recurring snapshots retained" - ) + len(snapshots), + self.services["recurring_snapshot"]["maxsnaps"], + "Check maximum number of recurring snapshots retained" + ) return - @attr(speed = "slow") + @attr(speed="slow") @attr(tags=["advanced", "advancedns", "smoke"], required_hardware="false") def test_recurring_snapshot_data_disk(self): """Test Recurring Snapshot data Disk """ - #1. Create snapshot policy for data disk - #2. ListSnapshot policy should return newly created policy - #3. Verify only most recent number (maxsnaps) snapshots retailed + # 1. Create snapshot policy for data disk + # 2. ListSnapshot policy should return newly created policy + # 3. Verify only most recent number (maxsnaps) snapshots retailed volume = list_volumes( - self.apiclient, - virtualmachineid=self.virtual_machine_with_disk.id, - type='DATADISK', - listall=True - ) + self.apiclient, + virtualmachineid=self.virtual_machine_with_disk.id, + type='DATADISK', + listall=True + ) self.assertEqual( - isinstance(volume, list), - True, - "Check list response returns a valid list" - ) + isinstance(volume, list), + True, + "Check list response returns a valid list" + ) recurring_snapshot = SnapshotPolicy.create( - self.apiclient, - volume[0].id, - self.services["recurring_snapshot"] - ) + self.apiclient, + volume[0].id, + self.services["recurring_snapshot"] + ) self.cleanup.append(recurring_snapshot) - #ListSnapshotPolicy should return newly created policy + # ListSnapshotPolicy should return newly created policy list_snapshots_policy = list_snapshot_policy( - self.apiclient, - id=recurring_snapshot.id, - volumeid=volume[0].id - ) + self.apiclient, + id=recurring_snapshot.id, + volumeid=volume[0].id + ) self.assertEqual( - isinstance(list_snapshots_policy, list), - True, - "Check list response returns a valid list" - ) + isinstance(list_snapshots_policy, list), + True, + "Check list response returns a valid list" + ) self.assertNotEqual( - list_snapshots_policy, - None, - "Check if result exists in list item call" - ) + list_snapshots_policy, + None, + "Check if result exists in list item call" + ) snapshots_policy = list_snapshots_policy[0] self.assertEqual( - snapshots_policy.id, - recurring_snapshot.id, - "Check recurring snapshot id in list resources call" - ) + snapshots_policy.id, + recurring_snapshot.id, + "Check recurring snapshot id in list resources call" + ) self.assertEqual( - snapshots_policy.maxsnaps, - self.services["recurring_snapshot"]["maxsnaps"], - "Check interval type in list resources call" - ) + snapshots_policy.maxsnaps, + self.services["recurring_snapshot"]["maxsnaps"], + "Check interval type in list resources call" + ) # Sleep for (maxsnaps) hours to verify only maxsnaps snapshots are # retained time.sleep( (self.services["recurring_snapshot"]["maxsnaps"]) * 3600 - ) + ) timeout = self.services["timeout"] while True: snapshots = list_snapshots( - self.apiclient, - volumeid=volume[0].id, - intervaltype=\ - self.services["recurring_snapshot"]["intervaltype"], - snapshottype='RECURRING', - listall=True - ) + self.apiclient, + volumeid=volume[0].id, + intervaltype=self.services["recurring_snapshot"] + ["intervaltype"], + snapshottype='RECURRING', + listall=True) if isinstance(snapshots, list): break @@ -395,13 +408,13 @@ class TestRecurringSnapshots(cloudstackTestCase): timeout = timeout - 1 self.assertEqual( - isinstance(snapshots, list), - True, - "Check list response returns a valid list" - ) + isinstance(snapshots, list), + True, + "Check list response returns a valid list" + ) self.assertEqual( - len(snapshots), - self.services["recurring_snapshot"]["maxsnaps"], - "Check maximum number of recurring snapshots retained" - ) + len(snapshots), + self.services["recurring_snapshot"]["maxsnaps"], + "Check maximum number of recurring snapshots retained" + ) return
