You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/10/26 00:01:43 UTC

[3/9] Add new "lint" target to tox, flake8 fixes in the whole codebase.

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_slicehost.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_slicehost.py b/libcloud/test/compute/test_slicehost.py
index 345c8aa..3b3bb3d 100644
--- a/libcloud/test/compute/test_slicehost.py
+++ b/libcloud/test/compute/test_slicehost.py
@@ -27,6 +27,7 @@ from libcloud.test.compute import TestCaseMixin
 from libcloud.test.file_fixtures import ComputeFileFixtures
 from libcloud.test.secrets import SLICEHOST_PARAMS
 
+
 class SlicehostTest(unittest.TestCase, TestCaseMixin):
 
     def setUp(self):
@@ -66,8 +67,9 @@ class SlicehostTest(unittest.TestCase, TestCaseMixin):
         self.assertEqual(image.id, '2')
 
     def test_reboot_node(self):
-        node = Node(id=1, name=None, state=None, public_ips=None, private_ips=None,
-                    driver=self.driver)
+        node = Node(
+            id=1, name=None, state=None, public_ips=None, private_ips=None,
+            driver=self.driver)
 
         ret = node.reboot()
         self.assertTrue(ret is True)
@@ -85,8 +87,9 @@ class SlicehostTest(unittest.TestCase, TestCaseMixin):
             self.fail('test should have thrown')
 
     def test_destroy_node(self):
-        node = Node(id=1, name=None, state=None, public_ips=None, private_ips=None,
-                    driver=self.driver)
+        node = Node(
+            id=1, name=None, state=None, public_ips=None, private_ips=None,
+            driver=self.driver)
 
         ret = node.destroy()
         self.assertTrue(ret is True)
@@ -96,11 +99,14 @@ class SlicehostTest(unittest.TestCase, TestCaseMixin):
 
     def test_create_node(self):
         image = NodeImage(id=11, name='ubuntu 8.10', driver=self.driver)
-        size = NodeSize(1, '256 slice', None, None, None, None, driver=self.driver)
-        node = self.driver.create_node(name='slicetest', image=image, size=size)
+        size = NodeSize(
+            1, '256 slice', None, None, None, None, driver=self.driver)
+        node = self.driver.create_node(
+            name='slicetest', image=image, size=size)
         self.assertEqual(node.name, 'slicetest')
         self.assertEqual(node.extra.get('password'), 'fooadfa1231')
 
+
 class SlicehostMockHttp(MockHttp):
 
     fixtures = ComputeFileFixtures('slicehost')
@@ -117,7 +123,7 @@ class SlicehostMockHttp(MockHttp):
             if not (name and image_id and flavor_id) \
                 or tree.tag != 'slice' \
                 or not 'Content-Type' in headers  \
-                or headers['Content-Type'] != 'application/xml':
+                    or headers['Content-Type'] != 'application/xml':
 
                 err_body = self.fixtures.load('slices_error.xml')
                 return (httplib.UNPROCESSABLE_ENTITY, err_body, {}, '')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_softlayer.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_softlayer.py b/libcloud/test/compute/test_softlayer.py
index 934aaf9..203f25f 100644
--- a/libcloud/test/compute/test_softlayer.py
+++ b/libcloud/test/compute/test_softlayer.py
@@ -16,14 +16,11 @@
 import unittest
 import sys
 
-from xml.etree import ElementTree as ET
-
 from libcloud.common.types import InvalidCredsError
 
 from libcloud.utils.py3 import httplib
 from libcloud.utils.py3 import xmlrpclib
 from libcloud.utils.py3 import next
-from libcloud.utils.py3 import u
 
 from libcloud.compute.drivers.softlayer import SoftLayerNodeDriver as SoftLayer
 from libcloud.compute.drivers.softlayer import SoftLayerException
@@ -105,7 +102,6 @@ class SoftLayerTests(unittest.TestCase):
         self.driver.create_node(name="Test", size=size)
 
     def test_create_node_domain_for_name(self):
-        size = [s for s in self.driver.list_sizes() if 'san' in s.id][0]
         self.driver.create_node(name="libcloud.org")
 
     def test_create_node_ex_options(self):

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_ssh_client.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ssh_client.py b/libcloud/test/compute/test_ssh_client.py
index 57df407..338ab66 100644
--- a/libcloud/test/compute/test_ssh_client.py
+++ b/libcloud/test/compute/test_ssh_client.py
@@ -30,10 +30,11 @@ from libcloud.compute.ssh import have_paramiko
 from mock import patch, Mock
 
 if not have_paramiko:
-    ParamikoSSHClient = None
+    ParamikoSSHClient = None  # NOQA
 
 
 class ParamikoSSHClientTests(unittest.TestCase):
+
     @patch('paramiko.SSHClient', Mock)
     def setUp(self):
         """
@@ -154,11 +155,12 @@ class ParamikoSSHClientTests(unittest.TestCase):
 
 
 if not ParamikoSSHClient:
-    class ParamikoSSHClientTests(unittest.TestCase):
+    class ParamikoSSHClientTests(unittest.TestCase):  # NOQA
         pass
 
 
 class ShellOutSSHClientTests(unittest.TestCase):
+
     def test_password_auth_not_supported(self):
         try:
             ShellOutSSHClient(hostname='localhost', username='foo',

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_vcl.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_vcl.py b/libcloud/test/compute/test_vcl.py
index 6240a96..31d0fb0 100644
--- a/libcloud/test/compute/test_vcl.py
+++ b/libcloud/test/compute/test_vcl.py
@@ -16,11 +16,8 @@
 import unittest
 import sys
 
-from xml.etree import ElementTree as ET
-
 from libcloud.utils.py3 import httplib
 from libcloud.utils.py3 import xmlrpclib
-from libcloud.utils.py3 import next
 
 from libcloud.compute.drivers.vcl import VCLNodeDriver as VCL
 from libcloud.compute.types import NodeState

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_vcloud.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_vcloud.py b/libcloud/test/compute/test_vcloud.py
index b3fd6cf..2682cf3 100644
--- a/libcloud/test/compute/test_vcloud.py
+++ b/libcloud/test/compute/test_vcloud.py
@@ -43,7 +43,8 @@ class TerremarkTests(unittest.TestCase, TestCaseMixin):
 
     def test_list_images(self):
         ret = self.driver.list_images()
-        self.assertEqual(ret[0].id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/5')
+        self.assertEqual(
+            ret[0].id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vAppTemplate/5')
 
     def test_list_sizes(self):
         ret = self.driver.list_sizes()
@@ -61,13 +62,15 @@ class TerremarkTests(unittest.TestCase, TestCaseMixin):
             cpus=2,
         )
         self.assertTrue(isinstance(node, Node))
-        self.assertEqual(node.id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vapp/14031')
+        self.assertEqual(
+            node.id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vapp/14031')
         self.assertEqual(node.name, 'testerpart2')
 
     def test_list_nodes(self):
         ret = self.driver.list_nodes()
         node = ret[0]
-        self.assertEqual(node.id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vapp/14031')
+        self.assertEqual(
+            node.id, 'https://services.vcloudexpress.terremark.com/api/v0.8/vapp/14031')
         self.assertEqual(node.name, 'testerpart2')
         self.assertEqual(node.state, NodeState.RUNNING)
         self.assertEqual(node.public_ips, [])
@@ -88,13 +91,15 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
 
     def setUp(self):
         VCloudNodeDriver.connectionCls.host = 'test'
-        VCloudNodeDriver.connectionCls.conn_classes = (None, VCloud_1_5_MockHttp)
+        VCloudNodeDriver.connectionCls.conn_classes = (
+            None, VCloud_1_5_MockHttp)
         VCloud_1_5_MockHttp.type = None
         self.driver = VCloud_1_5_NodeDriver(*VCLOUD_PARAMS)
 
     def test_list_images(self):
         ret = self.driver.list_images()
-        self.assertEqual('https://vm-vcloud/api/vAppTemplate/vappTemplate-ac1bc027-bf8c-4050-8643-4971f691c158', ret[0].id)
+        self.assertEqual(
+            'https://vm-vcloud/api/vAppTemplate/vappTemplate-ac1bc027-bf8c-4050-8643-4971f691c158', ret[0].id)
 
     def test_list_sizes(self):
         ret = self.driver.list_sizes()
@@ -102,7 +107,8 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
 
     def test_networks(self):
         ret = self.driver.networks
-        self.assertEqual(ret[0].get('href'), 'https://vm-vcloud/api/network/dca8b667-6c8f-4c3e-be57-7a9425dba4f4')
+        self.assertEqual(
+            ret[0].get('href'), 'https://vm-vcloud/api/network/dca8b667-6c8f-4c3e-be57-7a9425dba4f4')
 
     def test_create_node(self):
         image = self.driver.list_images()[0]
@@ -114,50 +120,54 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
             ex_vdc='MyVdc',
             ex_network='vCloud - Default',
             cpus=2,
-            )
+        )
         self.assertTrue(isinstance(node, Node))
-        self.assertEqual('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', node.id)
+        self.assertEqual(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', node.id)
         self.assertEqual('testNode', node.name)
 
     def test_create_node_clone(self):
         image = self.driver.list_nodes()[0]
         node = self.driver.create_node(name='testNode', image=image)
         self.assertTrue(isinstance(node, Node))
-        self.assertEqual('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', node.id)
+        self.assertEqual(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', node.id)
         self.assertEqual('testNode', node.name)
 
     def test_list_nodes(self):
         ret = self.driver.list_nodes()
         node = ret[0]
-        self.assertEqual(node.id, 'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a')
+        self.assertEqual(
+            node.id, 'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a')
         self.assertEqual(node.name, 'testNode')
         self.assertEqual(node.state, NodeState.RUNNING)
         self.assertEqual(node.public_ips, ['65.41.67.2'])
         self.assertEqual(node.private_ips, ['65.41.67.2'])
         self.assertEqual(node.extra, {'vdc': 'MyVdc',
-            'vms': [{
-            'id': 'https://vm-vcloud/api/vApp/vm-dd75d1d3-5b7b-48f0-aff3-69622ab7e045',
-            'name': 'testVm',
-            'state': NodeState.RUNNING,
-            'public_ips': ['65.41.67.2'],
-            'private_ips': ['65.41.67.2'],
-            'os_type': 'rhel5_64Guest'
-        }]})
+                                      'vms': [{
+                                          'id': 'https://vm-vcloud/api/vApp/vm-dd75d1d3-5b7b-48f0-aff3-69622ab7e045',
+                                          'name': 'testVm',
+                                          'state': NodeState.RUNNING,
+                                          'public_ips': ['65.41.67.2'],
+                                          'private_ips': ['65.41.67.2'],
+                                          'os_type': 'rhel5_64Guest'
+                                      }]})
         node = ret[1]
-        self.assertEqual(node.id, 'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b')
+        self.assertEqual(
+            node.id, 'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b')
         self.assertEqual(node.name, 'testNode2')
         self.assertEqual(node.state, NodeState.RUNNING)
         self.assertEqual(node.public_ips, ['192.168.0.103'])
         self.assertEqual(node.private_ips, ['192.168.0.100'])
         self.assertEqual(node.extra, {'vdc': 'MyVdc',
-            'vms': [{
-            'id': 'https://vm-vcloud/api/vApp/vm-dd75d1d3-5b7b-48f0-aff3-69622ab7e046',
-            'name': 'testVm2',
-            'state': NodeState.RUNNING,
-            'public_ips': ['192.168.0.103'],
-            'private_ips': ['192.168.0.100'],
-            'os_type': 'rhel5_64Guest'
-            }]})
+                                      'vms': [{
+                                          'id': 'https://vm-vcloud/api/vApp/vm-dd75d1d3-5b7b-48f0-aff3-69622ab7e046',
+                                          'name': 'testVm2',
+                                          'state': NodeState.RUNNING,
+                                          'public_ips': ['192.168.0.103'],
+                                          'private_ips': ['192.168.0.100'],
+                                          'os_type': 'rhel5_64Guest'
+                                      }]})
 
     def test_reboot_node(self):
         node = self.driver.list_nodes()[0]
@@ -175,24 +185,35 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
         self.driver._validate_vm_names(['tc-mybuild-b1'])
         self.driver._validate_vm_names(None)
         # invalid inputs
-        self.assertRaises(ValueError, self.driver._validate_vm_names, ['invalid.host'])
-        self.assertRaises(ValueError, self.driver._validate_vm_names, ['inv-alid.host'])
-        self.assertRaises(ValueError, self.driver._validate_vm_names, ['hostnametoooolong'])
-        self.assertRaises(ValueError, self.driver._validate_vm_names, ['host$name'])
+        self.assertRaises(
+            ValueError, self.driver._validate_vm_names, ['invalid.host'])
+        self.assertRaises(
+            ValueError, self.driver._validate_vm_names, ['inv-alid.host'])
+        self.assertRaises(
+            ValueError, self.driver._validate_vm_names, ['hostnametoooolong'])
+        self.assertRaises(
+            ValueError, self.driver._validate_vm_names, ['host$name'])
 
     def test_change_vm_names(self):
-        self.driver._change_vm_names('/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', ['changed1', 'changed2'])
+        self.driver._change_vm_names(
+            '/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6a', ['changed1', 'changed2'])
 
     def test_is_node(self):
-        self.assertTrue(self.driver._is_node(Node('testId', 'testNode', state=0, public_ips=[], private_ips=[], driver=self.driver)))
-        self.assertFalse(self.driver._is_node(NodeImage('testId', 'testNode', driver=self.driver)))
+        self.assertTrue(self.driver._is_node(
+            Node('testId', 'testNode', state=0, public_ips=[], private_ips=[], driver=self.driver)))
+        self.assertFalse(self.driver._is_node(
+            NodeImage('testId', 'testNode', driver=self.driver)))
 
     def test_ex_undeploy(self):
-        node = self.driver.ex_undeploy_node(Node('https://test/api/vApp/undeployTest', 'testNode', state=0, public_ips=[], private_ips=[], driver=self.driver))
+        node = self.driver.ex_undeploy_node(
+            Node('https://test/api/vApp/undeployTest', 'testNode', state=0,
+                 public_ips=[], private_ips=[], driver=self.driver))
         self.assertEqual(node.state, NodeState.TERMINATED)
 
     def test_ex_undeploy_with_error(self):
-        node = self.driver.ex_undeploy_node(Node('https://test/api/vApp/undeployErrorTest', 'testNode', state=0, public_ips=[], private_ips=[], driver=self.driver))
+        node = self.driver.ex_undeploy_node(
+            Node('https://test/api/vApp/undeployErrorTest', 'testNode',
+                 state=0, public_ips=[], private_ips=[], driver=self.driver))
         self.assertEqual(node.state, NodeState.TERMINATED)
 
     def test_ex_find_node(self):
@@ -204,8 +225,10 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
         self.assertEqual(node, None)
 
     def test_ex_add_vm_disk__with_invalid_values(self):
-        self.assertRaises(ValueError, self.driver.ex_add_vm_disk, 'dummy', 'invalid value')
-        self.assertRaises(ValueError, self.driver.ex_add_vm_disk, 'dummy', '-1')
+        self.assertRaises(
+            ValueError, self.driver.ex_add_vm_disk, 'dummy', 'invalid value')
+        self.assertRaises(
+            ValueError, self.driver.ex_add_vm_disk, 'dummy', '-1')
 
     def test_ex_add_vm_disk(self):
         self.driver.ex_add_vm_disk('https://test/api/vApp/vm-test', '20')
@@ -218,8 +241,10 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
         self.driver.ex_set_vm_cpu('https://test/api/vApp/vm-test', 4)
 
     def test_ex_set_vm_memory__with_invalid_values(self):
-        self.assertRaises(ValueError, self.driver.ex_set_vm_memory, 'dummy', 777)
-        self.assertRaises(ValueError, self.driver.ex_set_vm_memory, 'dummy', -1024)
+        self.assertRaises(
+            ValueError, self.driver.ex_set_vm_memory, 'dummy', 777)
+        self.assertRaises(
+            ValueError, self.driver.ex_set_vm_memory, 'dummy', -1024)
 
     def test_ex_set_vm_memory(self):
         self.driver.ex_set_vm_memory('https://test/api/vApp/vm-test', 1024)
@@ -227,7 +252,8 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
     def test_vdcs(self):
         vdcs = self.driver.vdcs
         self.assertEqual(len(vdcs), 1)
-        self.assertEqual(vdcs[0].id, 'https://vm-vcloud/api/vdc/3d9ae28c-1de9-4307-8107-9356ff8ba6d0')
+        self.assertEqual(
+            vdcs[0].id, 'https://vm-vcloud/api/vdc/3d9ae28c-1de9-4307-8107-9356ff8ba6d0')
         self.assertEqual(vdcs[0].name, 'MyVdc')
         self.assertEqual(vdcs[0].allocation_model, 'AllocationPool')
         self.assertEqual(vdcs[0].storage.limit, 5120000)
@@ -241,7 +267,8 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
         self.assertEqual(vdcs[0].memory.units, 'MB')
 
     def test_ex_list_nodes(self):
-        self.assertEqual(len(self.driver.ex_list_nodes()), len(self.driver.list_nodes()))
+        self.assertEqual(
+            len(self.driver.ex_list_nodes()), len(self.driver.list_nodes()))
 
     def test_ex_list_nodes__masked_exception(self):
         """
@@ -251,41 +278,55 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin):
         self.assertRaises(AnotherError, self.driver.ex_list_nodes, (brokenVdc))
 
     def test_ex_power_off(self):
-        node = Node('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b', 'testNode', NodeState.RUNNING, [], [], self.driver)
+        node = Node(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b',
+            'testNode', NodeState.RUNNING, [], [], self.driver)
         self.driver.ex_power_off_node(node)
 
     def test_ex_query(self):
-        results = self.driver.ex_query('user', filter='name==jrambo', page=2, page_size=30, sort_desc='startDate')
+        results = self.driver.ex_query(
+            'user', filter='name==jrambo', page=2, page_size=30, sort_desc='startDate')
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0]['type'], 'UserRecord')
         self.assertEqual(results[0]['name'], 'jrambo')
         self.assertEqual(results[0]['isLdapUser'], 'true')
 
     def test_ex_get_control_access(self):
-        node = Node('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b', 'testNode', NodeState.RUNNING, [], [], self.driver)
+        node = Node(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b',
+            'testNode', NodeState.RUNNING, [], [], self.driver)
         control_access = self.driver.ex_get_control_access(node)
-        self.assertEqual(control_access.everyone_access_level, ControlAccess.AccessLevel.READ_ONLY)
+        self.assertEqual(
+            control_access.everyone_access_level, ControlAccess.AccessLevel.READ_ONLY)
         self.assertEqual(len(control_access.subjects), 1)
         self.assertEqual(control_access.subjects[0].type, 'group')
         self.assertEqual(control_access.subjects[0].name, 'MyGroup')
-        self.assertEqual(control_access.subjects[0].id, 'https://vm-vcloud/api/admin/group/b8202c48-7151-4e61-9a6c-155474c7d413')
-        self.assertEqual(control_access.subjects[0].access_level, ControlAccess.AccessLevel.FULL_CONTROL)
+        self.assertEqual(control_access.subjects[
+                         0].id, 'https://vm-vcloud/api/admin/group/b8202c48-7151-4e61-9a6c-155474c7d413')
+        self.assertEqual(control_access.subjects[
+                         0].access_level, ControlAccess.AccessLevel.FULL_CONTROL)
 
     def test_ex_set_control_access(self):
-        node = Node('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b', 'testNode', NodeState.RUNNING, [], [], self.driver)
+        node = Node(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b',
+            'testNode', NodeState.RUNNING, [], [], self.driver)
         control_access = ControlAccess(node, None, [Subject(
-            name =  'MyGroup',
-            type = 'group',
-            access_level = ControlAccess.AccessLevel.FULL_CONTROL)])
+            name='MyGroup',
+            type='group',
+            access_level=ControlAccess.AccessLevel.FULL_CONTROL)])
         self.driver.ex_set_control_access(node, control_access)
 
     def test_ex_get_metadata(self):
-        node = Node('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b', 'testNode', NodeState.RUNNING, [], [], self.driver)
+        node = Node(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b',
+            'testNode', NodeState.RUNNING, [], [], self.driver)
         metadata = self.driver.ex_get_metadata(node)
-        self.assertEqual(metadata, {'owners':'msamia@netsuite.com'})
+        self.assertEqual(metadata, {'owners': 'msamia@netsuite.com'})
 
     def test_ex_set_metadata_entry(self):
-        node = Node('https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b', 'testNode', NodeState.RUNNING, [], [], self.driver)
+        node = Node(
+            'https://vm-vcloud/api/vApp/vapp-8c57a5b6-e61b-48ca-8a78-3b70ee65ef6b',
+            'testNode', NodeState.RUNNING, [], [], self.driver)
         self.driver.ex_set_metadata_entry(node, 'foo', 'bar')
 
 
@@ -293,9 +334,11 @@ class VCloud_5_1_Tests(unittest.TestCase, TestCaseMixin):
 
     def setUp(self):
         VCloudNodeDriver.connectionCls.host = 'test'
-        VCloudNodeDriver.connectionCls.conn_classes = (None, VCloud_1_5_MockHttp)
+        VCloudNodeDriver.connectionCls.conn_classes = (
+            None, VCloud_1_5_MockHttp)
         VCloud_1_5_MockHttp.type = None
-        self.driver = VCloudNodeDriver(*VCLOUD_PARAMS, **{'api_version': '5.1'})
+        self.driver = VCloudNodeDriver(
+            *VCLOUD_PARAMS, **{'api_version': '5.1'})
 
         self.assertTrue(isinstance(self.driver, VCloud_5_1_NodeDriver))
 
@@ -335,14 +378,14 @@ class VCloud_5_1_Tests(unittest.TestCase, TestCaseMixin):
                     ex_vm_memory=value
                 )
             except ValueError:
-               pass
+                pass
             else:
-               self.fail('Exception was not thrown')
-
+                self.fail('Exception was not thrown')
 
     def test_list_images(self):
         ret = self.driver.list_images()
-        self.assertEqual('https://vm-vcloud/api/vAppTemplate/vappTemplate-ac1bc027-bf8c-4050-8643-4971f691c158', ret[0].id)
+        self.assertEqual(
+            'https://vm-vcloud/api/vAppTemplate/vappTemplate-ac1bc027-bf8c-4050-8643-4971f691c158', ret[0].id)
 
 
 class TerremarkMockHttp(MockHttp):
@@ -371,7 +414,8 @@ class TerremarkMockHttp(MockHttp):
         return (httplib.OK, body, headers, httplib.responses[httplib.OK])
 
     def _api_v0_8_vdc_224_action_instantiateVAppTemplate(self, method, url, body, headers):
-        body = self.fixtures.load('api_v0_8_vdc_224_action_instantiateVAppTemplate.xml')
+        body = self.fixtures.load(
+            'api_v0_8_vdc_224_action_instantiateVAppTemplate.xml')
         return (httplib.OK, body, headers, httplib.responses[httplib.OK])
 
     def _api_v0_8_vapp_14031_action_deploy(self, method, url, body, headers):
@@ -383,7 +427,8 @@ class TerremarkMockHttp(MockHttp):
         return (httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED])
 
     def _api_v0_8_vapp_14031_power_action_powerOn(self, method, url, body, headers):
-        body = self.fixtures.load('api_v0_8_vapp_14031_power_action_powerOn.xml')
+        body = self.fixtures.load(
+            'api_v0_8_vapp_14031_power_action_powerOn.xml')
         return (httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED])
 
     def _api_v0_8_vapp_14031(self, method, url, body, headers):
@@ -398,7 +443,8 @@ class TerremarkMockHttp(MockHttp):
         return (httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED])
 
     def _api_v0_8_vapp_14031_power_action_poweroff(self, method, url, body, headers):
-        body = self.fixtures.load('api_v0_8_vapp_14031_power_action_poweroff.xml')
+        body = self.fixtures.load(
+            'api_v0_8_vapp_14031_power_action_poweroff.xml')
         return (httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED])
 
     def _api_v0_8_task_11001(self, method, url, body, headers):
@@ -407,6 +453,7 @@ class TerremarkMockHttp(MockHttp):
 
 
 class AnotherErrorMember(Exception):
+
     """
     helper class for the synthetic exception
     """
@@ -417,6 +464,7 @@ class AnotherErrorMember(Exception):
     def get(self, foo):
         return 'ACCESS_TO_RESOURCE_IS_FORBIDDEN_1'
 
+
 class AnotherError(Exception):
     pass
 
@@ -426,8 +474,8 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
     fixtures = ComputeFileFixtures('vcloud_1_5')
 
     def request(self, method, url, body=None, headers=None, raw=False):
-        self.assertTrue(url.startswith('/api/'), ('"%s" is invalid. Needs to ' \
-                        'start with "/api". The passed URL should be just ' \
+        self.assertTrue(url.startswith('/api/'), ('"%s" is invalid. Needs to '
+                        'start with "/api". The passed URL should be just '
                         'the path, not full URL.', url))
         super(VCloud_1_5_MockHttp, self).request(method, url, body, headers,
                                                  raw)
@@ -442,15 +490,18 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_org_96726c78_4ae3_402f_b08b_7a78c6903d2a(self, method, url, body, headers):
-        body = self.fixtures.load('api_org_96726c78_4ae3_402f_b08b_7a78c6903d2a.xml')
+        body = self.fixtures.load(
+            'api_org_96726c78_4ae3_402f_b08b_7a78c6903d2a.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_network_dca8b667_6c8f_4c3e_be57_7a9425dba4f4(self, method, url, body, headers):
-        body = self.fixtures.load('api_network_dca8b667_6c8f_4c3e_be57_7a9425dba4f4.xml')
+        body = self.fixtures.load(
+            'api_network_dca8b667_6c8f_4c3e_be57_7a9425dba4f4.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0(self, method, url, body, headers):
-        body = self.fixtures.load('api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0.xml')
+        body = self.fixtures.load(
+            'api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vdc_brokenVdc(self, method, url, body, headers):
@@ -462,7 +513,8 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
         raise AnotherError(m)
 
     def _api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_instantiateVAppTemplate(self, method, url, body, headers):
-        body = self.fixtures.load('api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_instantiateVAppTemplate.xml')
+        body = self.fixtures.load(
+            'api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_instantiateVAppTemplate.xml')
         return httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_power_action_powerOn(self, method, url, body, headers):
@@ -470,41 +522,50 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
 
     # Clone
     def _api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_cloneVApp(self, method, url, body, headers):
-        body = self.fixtures.load('api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_cloneVApp.xml')
+        body = self.fixtures.load(
+            'api_vdc_3d9ae28c_1de9_4307_8107_9356ff8ba6d0_action_cloneVApp.xml')
         return httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED]
 
     def _api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_networkConnectionSection(self, method, url, body, headers):
-        body = self.fixtures.load('api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
+        body = self.fixtures.load(
+            'api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
         return httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a(self, method, url, body, headers):
         status = httplib.OK
         if method == 'GET':
-            body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a.xml')
+            body = self.fixtures.load(
+                'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a.xml')
             status = httplib.OK
         elif method == 'DELETE':
-            body = self.fixtures.load('api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
+            body = self.fixtures.load(
+                'api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
             status = httplib.ACCEPTED
         return status, body, headers, httplib.responses[status]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b(self, method, url, body, headers):
-        body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b.xml')
+        body = self.fixtures.load(
+            'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6c(self, method, url, body, headers):
-        body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6c.xml')
+        body = self.fixtures.load(
+            'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6c.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045(self, method, url, body, headers):
-        body = self.fixtures.load('put_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
+        body = self.fixtures.load(
+            'put_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
         return httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED]
 
     def _api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection(self, method, url, body, headers):
         if method == 'GET':
-            body = self.fixtures.load('get_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
+            body = self.fixtures.load(
+                'get_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
             status = httplib.OK
         else:
-            body = self.fixtures.load('put_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
+            body = self.fixtures.load(
+                'put_api_vApp_vm_dd75d1d3_5b7b_48f0_aff3_69622ab7e045_guestCustomizationSection.xml')
             status = httplib.ACCEPTED
         return status, body, headers, httplib.responses[status]
 
@@ -512,15 +573,18 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
         return self._api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b_power_action_all(method, url, body, headers)
 
     def _api_task_b034df55_fe81_4798_bc81_1f0fd0ead450(self, method, url, body, headers):
-        body = self.fixtures.load('api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
+        body = self.fixtures.load(
+            'api_task_b034df55_fe81_4798_bc81_1f0fd0ead450.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_catalog_cddb3cb2_3394_4b14_b831_11fbc4028da4(self, method, url, body, headers):
-        body = self.fixtures.load('api_catalog_cddb3cb2_3394_4b14_b831_11fbc4028da4.xml')
+        body = self.fixtures.load(
+            'api_catalog_cddb3cb2_3394_4b14_b831_11fbc4028da4.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_catalogItem_3132e037_759b_4627_9056_ca66466fa607(self, method, url, body, headers):
-        body = self.fixtures.load('api_catalogItem_3132e037_759b_4627_9056_ca66466fa607.xml')
+        body = self.fixtures.load(
+            'api_catalogItem_3132e037_759b_4627_9056_ca66466fa607.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_undeployTest(self, method, url, body, headers):
@@ -551,7 +615,8 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_vapp_access_to_resource_forbidden(self, method, url, body, headers):
-        raise Exception(ET.fromstring(self.fixtures.load('api_vApp_vapp_access_to_resource_forbidden.xml')))
+        raise Exception(
+            ET.fromstring(self.fixtures.load('api_vApp_vapp_access_to_resource_forbidden.xml')))
 
     def _api_vApp_vm_test(self, method, url, body, headers):
         body = self.fixtures.load('api_vApp_vm_test.xml')
@@ -559,28 +624,34 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
 
     def _api_vApp_vm_test_virtualHardwareSection_disks(self, method, url, body, headers):
         if method == 'GET':
-            body = self.fixtures.load('get_api_vApp_vm_test_virtualHardwareSection_disks.xml')
+            body = self.fixtures.load(
+                'get_api_vApp_vm_test_virtualHardwareSection_disks.xml')
             status = httplib.OK
         else:
-            body = self.fixtures.load('put_api_vApp_vm_test_virtualHardwareSection_disks.xml')
+            body = self.fixtures.load(
+                'put_api_vApp_vm_test_virtualHardwareSection_disks.xml')
             status = httplib.ACCEPTED
         return status, body, headers, httplib.responses[status]
 
     def _api_vApp_vm_test_virtualHardwareSection_cpu(self, method, url, body, headers):
         if method == 'GET':
-            body = self.fixtures.load('get_api_vApp_vm_test_virtualHardwareSection_cpu.xml')
+            body = self.fixtures.load(
+                'get_api_vApp_vm_test_virtualHardwareSection_cpu.xml')
             status = httplib.OK
         else:
-            body = self.fixtures.load('put_api_vApp_vm_test_virtualHardwareSection_cpu.xml')
+            body = self.fixtures.load(
+                'put_api_vApp_vm_test_virtualHardwareSection_cpu.xml')
             status = httplib.ACCEPTED
         return status, body, headers, httplib.responses[status]
 
     def _api_vApp_vm_test_virtualHardwareSection_memory(self, method, url, body, headers):
         if method == 'GET':
-            body = self.fixtures.load('get_api_vApp_vm_test_virtualHardwareSection_memory.xml')
+            body = self.fixtures.load(
+                'get_api_vApp_vm_test_virtualHardwareSection_memory.xml')
             status = httplib.OK
         else:
-            body = self.fixtures.load('put_api_vApp_vm_test_virtualHardwareSection_memory.xml')
+            body = self.fixtures.load(
+                'put_api_vApp_vm_test_virtualHardwareSection_memory.xml')
             status = httplib.ACCEPTED
         return status, body, headers, httplib.responses[status]
 
@@ -589,7 +660,8 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b_power_action_all(self, method, url, body, headers):
         assert method == 'POST'
-        body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_power_action_all.xml')
+        body = self.fixtures.load(
+            'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_power_action_all.xml')
         return httplib.ACCEPTED, body, headers, httplib.responses[httplib.ACCEPTED]
 
     def _api_query(self, method, url, body, headers):
@@ -614,20 +686,25 @@ class VCloud_1_5_MockHttp(MockHttp, unittest.TestCase):
             return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b_controlAccess(self, method, url, body, headers):
-        body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_controlAccess.xml')
+        body = self.fixtures.load(
+            'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_controlAccess.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6b_action_controlAccess(self, method, url, body, headers):
         body = str(body)
         self.assertTrue(method == 'POST')
-        self.assertTrue('<IsSharedToEveryone>false</IsSharedToEveryone>' in body)
-        self.assertTrue('<Subject href="https://vm-vcloud/api/admin/group/b8202c48-7151-4e61-9a6c-155474c7d413" />' in body)
+        self.assertTrue(
+            '<IsSharedToEveryone>false</IsSharedToEveryone>' in body)
+        self.assertTrue(
+            '<Subject href="https://vm-vcloud/api/admin/group/b8202c48-7151-4e61-9a6c-155474c7d413" />' in body)
         self.assertTrue('<AccessLevel>FullControl</AccessLevel>' in body)
-        body = self.fixtures.load('api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_controlAccess.xml')
+        body = self.fixtures.load(
+            'api_vApp_vapp_8c57a5b6_e61b_48ca_8a78_3b70ee65ef6a_controlAccess.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
     def _api_admin_group_b8202c48_7151_4e61_9a6c_155474c7d413(self, method, url, body, headers):
-        body = self.fixtures.load('api_admin_group_b8202c48_7151_4e61_9a6c_155474c7d413.xml')
+        body = self.fixtures.load(
+            'api_admin_group_b8202c48_7151_4e61_9a6c_155474c7d413.xml')
         return httplib.OK, body, headers, httplib.responses[httplib.OK]
 
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_voxel.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_voxel.py b/libcloud/test/compute/test_voxel.py
index bcc41fb..e8ea8b0 100644
--- a/libcloud/test/compute/test_voxel.py
+++ b/libcloud/test/compute/test_voxel.py
@@ -25,6 +25,7 @@ from libcloud.test.file_fixtures import ComputeFileFixtures
 
 from libcloud.test.secrets import VOXEL_PARAMS
 
+
 class VoxelTest(unittest.TestCase):
 
     def setUp(self):
@@ -79,8 +80,10 @@ class VoxelTest(unittest.TestCase):
         self.assertEqual(locations[0].name, 'Amsterdam')
 
     def test_create_node_invalid_disk_size(self):
-        image = NodeImage(id=1, name='Ubuntu 8.10 (intrepid)', driver=self.driver)
-        size = NodeSize(1, '256 slice', None, None, None, None, driver=self.driver)
+        image = NodeImage(
+            id=1, name='Ubuntu 8.10 (intrepid)', driver=self.driver)
+        size = NodeSize(
+            1, '256 slice', None, None, None, None, driver=self.driver)
         location = NodeLocation(id=1, name='Europe', country='England',
                                 driver=self.driver)
 
@@ -95,8 +98,10 @@ class VoxelTest(unittest.TestCase):
 
     def test_create_node(self):
         VoxelMockHttp.type = 'CREATE_NODE'
-        image = NodeImage(id=1, name='Ubuntu 8.10 (intrepid)', driver=self.driver)
-        size = NodeSize(1, '256 slice', 1024, 500, None, None, driver=self.driver)
+        image = NodeImage(
+            id=1, name='Ubuntu 8.10 (intrepid)', driver=self.driver)
+        size = NodeSize(
+            1, '256 slice', 1024, 500, None, None, driver=self.driver)
         location = NodeLocation(id=1, name='Europe', country='England',
                                 driver=self.driver)
 
@@ -110,18 +115,21 @@ class VoxelTest(unittest.TestCase):
 
     def test_reboot_node(self):
         VoxelMockHttp.type = 'REBOOT_NODE'
-        node = Node(id=72258, name=None, state=None, public_ips=None, private_ips=None,
-                    driver=self.driver)
+        node = Node(
+            id=72258, name=None, state=None, public_ips=None, private_ips=None,
+            driver=self.driver)
 
         self.assertTrue(node.reboot())
 
     def test_destroy_node(self):
         VoxelMockHttp.type = 'DESTROY_NODE'
-        node = Node(id=72258, name=None, state=None, public_ips=None, private_ips=None,
-                    driver=self.driver)
+        node = Node(
+            id=72258, name=None, state=None, public_ips=None, private_ips=None,
+            driver=self.driver)
 
         self.assertTrue(node.destroy())
 
+
 class VoxelMockHttp(MockHttp):
 
     fixtures = ComputeFileFixtures('voxel')

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/compute/test_vpsnet.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_vpsnet.py b/libcloud/test/compute/test_vpsnet.py
index 5868e1a..9053a46 100644
--- a/libcloud/test/compute/test_vpsnet.py
+++ b/libcloud/test/compute/test_vpsnet.py
@@ -24,6 +24,8 @@ from libcloud.test import MockHttp
 from libcloud.test.compute import TestCaseMixin
 
 from libcloud.test.secrets import VPSNET_PARAMS
+from libcloud.test.file_fixtures import ComputeFileFixtures
+
 
 class VPSNetTests(unittest.TestCase, TestCaseMixin):
 
@@ -90,9 +92,8 @@ class VPSNetTests(unittest.TestCase, TestCaseMixin):
         self.assertTrue(isinstance(ret, bool))
 
 
-
 class VPSNetMockHttp(MockHttp):
-
+    fixtures = ComputeFileFixtures('vpsnet')
 
     def _nodes_api10json_sizes(self, method, url, body, headers):
         body = """[{"slice":{"virtual_machine_id":8592,"id":12256,"consumer_id":0}},
@@ -198,10 +199,13 @@ class VPSNetMockHttp(MockHttp):
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
     def _available_clouds_api10json_templates(self, method, url, body, headers):
-        body = """[{"cloud":{"system_templates":[{"id":9,"label":"Ubuntu 8.04 x64"},{"id":10,"label":"CentOS 5.2 x64"},{"id":11,"label":"Gentoo 2008.0 x64"},{"id":18,"label":"Ubuntu 8.04 x64 LAMP"},{"id":19,"label":"Ubuntu 8.04 x64 MySQL"},{"id":20,"label":"Ubuntu 8.04 x64 Postfix"},{"id":21,"label":"Ubuntu 8.04 x64 Apache"},{"id":22,"label":"CentOS 5.2 x64 MySQL"},{"id":23,"label":"CentOS 5.2 x64 LAMP"},{"id":24,"label":"CentOS 5.2 x64 HAProxy"},{"id":25,"label":"CentOS 5.2 x64 Postfix"},{"id":26,"label":"CentOS 5.2 x64 Varnish"},{"id":27,"label":"CentOS 5.2 x64 Shoutcast"},{"id":28,"label":"CentOS 5.2 x64 Apache"},{"id":40,"label":"cPanel"},{"id":42,"label":"Debian 5.0 (Lenny) x64"},{"id":58,"label":"Django on Ubuntu 8.04 (x86)"},{"id":59,"label":"Drupal 5 on Ubuntu 8.04 (x86)"},{"id":60,"label":"Drupal 6 on Ubuntu 8.04 (x86)"},{"id":61,"label":"Google App Engine on Ubuntu 8.04 (x86)"},{"id":62,"label":"LAMP on Ubuntu 8.04 (x86)"},{"id":63,"label":"LAPP on Ubuntu 8.04 (x86)"},{"id
 ":64,"label":"MediaWiki on Ubuntu 8.04 (x86)"},{"id":65,"label":"MySQL on Ubuntu 8.04 (x86)"},{"id":66,"label":"phpBB on Ubuntu 8.04 (x86)"},{"id":67,"label":"PostgreSQL on Ubuntu 8.04 (x86)"},{"id":68,"label":"Rails on Ubuntu 8.04 (x86)"},{"id":69,"label":"Tomcat on Ubuntu 8.04 (x86)"},{"id":70,"label":"Wordpress on Ubuntu 8.04 (x86)"},{"id":71,"label":"Joomla on Ubuntu 8.04 (x86)"},{"id":72,"label":"Ubuntu 8.04 Default Install (turnkey)"},{"id":128,"label":"CentOS Optimised"},{"id":129,"label":"Optimised CentOS + Apache + MySQL + PHP"},{"id":130,"label":"Optimised CentOS + Apache + MySQL + Ruby"},{"id":131,"label":"Optimised CentOS + Apache + MySQL + Ruby + PHP"},{"id":132,"label":"Debian Optimised"},{"id":133,"label":"Optimised Debian + Apache + MySQL + PHP"},{"id":134,"label":"Optimised Debian + NGINX + MySQL + PHP"},{"id":135,"label":"Optimised Debian + Lighttpd + MySQL + PHP"},{"id":136,"label":"Optimised Debian + Apache + MySQL + Ruby + PHP"},{"id":137,"label":"Optimised Debi
 an + Apache + MySQL + Ruby"},{"id":138,"label":"Optimised Debian + NGINX + MySQL + Ruby + PHP"},{"id":139,"label":"Optimised Debian + NGINX + MySQL + Ruby"},{"id":140,"label":"Optimised Debian + Apache + MySQL + PHP + Magento"},{"id":141,"label":"Optimised Debian + NGINX + MySQL + PHP + Magento"},{"id":142,"label":"Optimised Debian + Lighttpd + MySQL + PHP + Wordpress"}],"id":2,"label":"USA VPS Cloud"}},{"cloud":{"system_templates":[{"id":15,"label":"Ubuntu 8.04 x64"},{"id":16,"label":"CentOS 5.2 x64"},{"id":17,"label":"Gentoo 2008.0 x64"},{"id":29,"label":"Ubuntu 8.04 x64 LAMP"},{"id":30,"label":"Ubuntu 8.04 x64 MySQL"},{"id":31,"label":"Ubuntu 8.04 x64 Postfix"},{"id":32,"label":"Ubuntu 8.04 x64 Apache"},{"id":33,"label":"CentOS 5.2 x64 MySQL"},{"id":34,"label":"CentOS 5.2 x64 LAMP"},{"id":35,"label":"CentOS 5.2 x64 HAProxy"},{"id":36,"label":"CentOS 5.2 x64 Postfix"},{"id":37,"label":"CentOS 5.2 x64 Varnish"},{"id":38,"label":"CentOS 5.2 x64 Shoutcast"},{"id":39,"label":"CentOS 5
 .2 x64 Apache"},{"id":41,"label":"cPanel"},{"id":43,"label":"Debian 5.0 (Lenny) x64"},{"id":44,"label":"Django on Ubuntu 8.04 (x86)"},{"id":45,"label":"Drupal 5 on Ubuntu 8.04 (x86)"},{"id":46,"label":"Drupal 6 on Ubuntu 8.04 (x86)"},{"id":47,"label":"Google App Engine on Ubuntu 8.04 (x86)"},{"id":48,"label":"LAMP on Ubuntu 8.04 (x86)"},{"id":49,"label":"LAPP on Ubuntu 8.04 (x86)"},{"id":50,"label":"MediaWiki on Ubuntu 8.04 (x86)"},{"id":51,"label":"MySQL on Ubuntu 8.04 (x86)"},{"id":52,"label":"phpBB on Ubuntu 8.04 (x86)"},{"id":53,"label":"PostgreSQL on Ubuntu 8.04 (x86)"},{"id":54,"label":"Rails on Ubuntu 8.04 (x86)"},{"id":55,"label":"Tomcat on Ubuntu 8.04 (x86)"},{"id":56,"label":"Wordpress on Ubuntu 8.04 (x86)"},{"id":57,"label":"Joomla on Ubuntu 8.04 (x86)"},{"id":73,"label":"Ubuntu 8.04 Default Install (turnkey)"},{"id":148,"label":"CentOS Optimised"},{"id":149,"label":"Optimised CentOS + Apache + MySQL + PHP"},{"id":150,"label":"Optimised CentOS + Apache + MySQL + Ruby"},{"
 id":151,"label":"Optimised CentOS + Apache + MySQL + Ruby + PHP"},{"id":152,"label":"Debian Optimised"},{"id":153,"label":"Optimised Debian + Apache + MySQL + PHP"},{"id":154,"label":"Optimised Debian + NGINX + MySQL + PHP"},{"id":155,"label":"Optimised Debian + Lighttpd + MySQL + PHP"},{"id":156,"label":"Optimised Debian + Apache + MySQL + Ruby + PHP"},{"id":157,"label":"Optimised Debian + Apache + MySQL + Ruby"},{"id":158,"label":"Optimised Debian + NGINX + MySQL + Ruby + PHP"},{"id":159,"label":"Optimised Debian + NGINX + MySQL + Ruby"},{"id":160,"label":"Optimised Debian + Lighttpd + MySQL + PHP + Wordpress"}],"id":3,"label":"UK VPS Cloud"}}]"""
+        body = self.fixtures.load('_available_clouds_api10json_templates.json')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
     def _available_clouds_api10json_create(self, method, url, body, headers):
-        body = """[{"cloud":{"system_templates":[{"id":9,"label":"Ubuntu 8.04 x64"}],"id":2,"label":"USA VPS Cloud"}}]"""
+        body = """
+        [{"cloud":{"system_templates":[{"id":9,"label":"Ubuntu 8.04 x64"}],"id":2,"label":"USA VPS Cloud"}}]
+        """
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
 if __name__ == '__main__':

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/dns/test_linode.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_linode.py b/libcloud/test/dns/test_linode.py
index dd5981c..b688130 100644
--- a/libcloud/test/dns/test_linode.py
+++ b/libcloud/test/dns/test_linode.py
@@ -30,7 +30,7 @@ from libcloud.test.secrets import DNS_PARAMS_LINODE
 class LinodeTests(unittest.TestCase):
     def setUp(self):
         LinodeDNSDriver.connectionCls.conn_classes = (
-                None, LinodeMockHttp)
+            None, LinodeMockHttp)
         LinodeMockHttp.use_param = 'api_action'
         LinodeMockHttp.type = None
         self.driver = LinodeDNSDriver(*DNS_PARAMS_LINODE)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/dns/test_rackspace.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_rackspace.py b/libcloud/test/dns/test_rackspace.py
index d3ca78e..589aaa1 100644
--- a/libcloud/test/dns/test_rackspace.py
+++ b/libcloud/test/dns/test_rackspace.py
@@ -34,7 +34,7 @@ class RackspaceUSTests(unittest.TestCase):
 
     def setUp(self):
         self.klass.connectionCls.conn_classes = (
-                None, RackspaceMockHttp)
+            None, RackspaceMockHttp)
         RackspaceMockHttp.type = None
         self.driver = self.klass(*DNS_PARAMS_RACKSPACE)
         self.driver.connection.poll_interval = 0.0
@@ -50,9 +50,9 @@ class RackspaceUSTests(unittest.TestCase):
         driver.list_zones()
 
         self.assertEqual(kwargs['ex_force_auth_token'],
-            driver.connection.auth_token)
+                         driver.connection.auth_token)
         self.assertEqual('/v1.0/11111',
-            driver.connection.request_path)
+                         driver.connection.request_path)
 
     def test_force_auth_url_kwargs(self):
         kwargs = {
@@ -62,9 +62,9 @@ class RackspaceUSTests(unittest.TestCase):
         driver = self.klass(*DNS_PARAMS_RACKSPACE, **kwargs)
 
         self.assertEqual(kwargs['ex_force_auth_url'],
-            driver.connection._ex_force_auth_url)
+                         driver.connection._ex_force_auth_url)
         self.assertEqual(kwargs['ex_force_auth_version'],
-            driver.connection._auth_version)
+                         driver.connection._auth_version)
 
     def test_gets_auth_2_0_endpoint(self):
         kwargs = {'ex_force_auth_version': '2.0_password'}
@@ -201,8 +201,8 @@ class RackspaceUSTests(unittest.TestCase):
         except Exception:
             e = sys.exc_info()[1]
             self.assertEqual(str(e), 'Validation errors: Domain TTL is ' +
-                                      'required and must be greater than ' +
-                                      'or equal to 300')
+                                     'required and must be greater than ' +
+                                     'or equal to 300')
         else:
             self.fail('Exception was not thrown')
 
@@ -301,19 +301,20 @@ class RackspaceUSTests(unittest.TestCase):
         domain = 'foo.bar'
         name = 'test'
         self.assertEqual(self.driver._to_full_record_name(domain, name),
-                          'test.foo.bar')
+                         'test.foo.bar')
 
     def test_to_full_record_name_name_not_provided(self):
         domain = 'foo.bar'
         name = None
         self.assertEqual(self.driver._to_full_record_name(domain, name),
-                          'foo.bar')
+                         'foo.bar')
 
 
 class RackspaceUKTests(RackspaceUSTests):
     klass = RackspaceUKDNSDriver
     endpoint_url = 'https://lon.dns.api.rackspacecloud.com/v1.0/11111'
 
+
 class RackspaceMockHttp(MockHttp):
     fixtures = DNSFileFixtures('rackspace')
     base_headers = {'content-type': 'application/json'}
@@ -400,8 +401,7 @@ class RackspaceMockHttp(MockHttp):
         return (httplib.OK, body, self.base_headers,
                 httplib.responses[httplib.OK])
 
-    def _v1_0_11111_domains_12345678_records_28536_RECORD_DOES_NOT_EXIST(self,
-            method, url, body, headers):
+    def _v1_0_11111_domains_12345678_records_28536_RECORD_DOES_NOT_EXIST(self, method, url, body, headers):
         body = self.fixtures.load('does_not_exist.json')
         return (httplib.NOT_FOUND, body, self.base_headers,
                 httplib.responses[httplib.NOT_FOUND])
@@ -412,8 +412,7 @@ class RackspaceMockHttp(MockHttp):
         return (httplib.OK, body, self.base_headers,
                 httplib.responses[httplib.OK])
 
-    def _v1_0_11111_status_288795f9_e74d_48be_880b_a9e36e0de61e_CREATE_ZONE(self,
-            method, url, body, headers):
+    def _v1_0_11111_status_288795f9_e74d_48be_880b_a9e36e0de61e_CREATE_ZONE(self, method, url, body, headers):
         # Async status - create_zone
         body = self.fixtures.load('create_zone_success.json')
         return (httplib.OK, body, self.base_headers,

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/dns/test_route53.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_route53.py b/libcloud/test/dns/test_route53.py
index acd8fb1..220166e 100644
--- a/libcloud/test/dns/test_route53.py
+++ b/libcloud/test/dns/test_route53.py
@@ -214,31 +214,25 @@ class Route53MockHttp(MockHttp):
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
     def _2012_02_29_hostedzone_47234_rrset_ZONE_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
+                                                               url, body, headers):
         body = self.fixtures.load('zone_does_not_exist.xml')
         return (httplib.NOT_FOUND, body,
                 {}, httplib.responses[httplib.NOT_FOUND])
 
     def _2012_02_29_hostedzone_4444_ZONE_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
+                                                        url, body, headers):
         body = self.fixtures.load('zone_does_not_exist.xml')
         return (httplib.NOT_FOUND, body,
                 {}, httplib.responses[httplib.NOT_FOUND])
 
     def _2012_02_29_hostedzone_47234_ZONE_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
-        body = self.fixtures.load('zone_does_not_exist.xml')
-        return (httplib.NOT_FOUND, body,
-                {}, httplib.responses[httplib.NOT_FOUND])
-
-    def _2012_02_29_hostedzone_47234_rrset_ZONE_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
+                                                         url, body, headers):
         body = self.fixtures.load('zone_does_not_exist.xml')
         return (httplib.NOT_FOUND, body,
                 {}, httplib.responses[httplib.NOT_FOUND])
 
     def _2012_02_29_hostedzone_47234_rrset_RECORD_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
+                                                                 url, body, headers):
         if method == "POST":
             body = self.fixtures.load('invalid_change_batch.xml')
             return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.BAD_REQUEST])
@@ -246,7 +240,7 @@ class Route53MockHttp(MockHttp):
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
     def _2012_02_29_hostedzone_47234_RECORD_DOES_NOT_EXIST(self, method,
-                                              url, body, headers):
+                                                           url, body, headers):
         body = self.fixtures.load('get_zone.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/dns/test_zerigo.py
----------------------------------------------------------------------
diff --git a/libcloud/test/dns/test_zerigo.py b/libcloud/test/dns/test_zerigo.py
index 16aa827..f74d1ec 100644
--- a/libcloud/test/dns/test_zerigo.py
+++ b/libcloud/test/dns/test_zerigo.py
@@ -30,7 +30,7 @@ from libcloud.test.secrets import DNS_PARAMS_ZERIGO
 class ZerigoTests(unittest.TestCase):
     def setUp(self):
         ZerigoDNSDriver.connectionCls.conn_classes = (
-                None, ZerigoMockHttp)
+            None, ZerigoMockHttp)
         ZerigoMockHttp.type = None
         self.driver = ZerigoDNSDriver(*DNS_PARAMS_ZERIGO)
 
@@ -136,7 +136,7 @@ class ZerigoTests(unittest.TestCase):
 
         try:
             self.driver.get_record(zone_id='12345678',
-                                            record_id='28536')
+                                   record_id='28536')
         except RecordDoesNotExistError:
             pass
         else:

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/file_fixtures.py
----------------------------------------------------------------------
diff --git a/libcloud/test/file_fixtures.py b/libcloud/test/file_fixtures.py
index cf96542..42e3d36 100644
--- a/libcloud/test/file_fixtures.py
+++ b/libcloud/test/file_fixtures.py
@@ -29,6 +29,7 @@ FIXTURES_ROOT = {
     'openstack': 'compute/fixtures/openstack',
 }
 
+
 class FileFixtures(object):
     def __init__(self, fixtures_type, sub_dir=''):
         script_dir = os.path.abspath(os.path.split(__file__)[0])
@@ -49,27 +50,32 @@ class FileFixtures(object):
         else:
             raise IOError(path)
 
+
 class ComputeFileFixtures(FileFixtures):
     def __init__(self, sub_dir=''):
         super(ComputeFileFixtures, self).__init__(fixtures_type='compute',
                                                   sub_dir=sub_dir)
 
+
 class StorageFileFixtures(FileFixtures):
     def __init__(self, sub_dir=''):
         super(StorageFileFixtures, self).__init__(fixtures_type='storage',
                                                   sub_dir=sub_dir)
 
+
 class LoadBalancerFileFixtures(FileFixtures):
     def __init__(self, sub_dir=''):
         super(LoadBalancerFileFixtures, self).__init__(fixtures_type='loadbalancer',
-                                                  sub_dir=sub_dir)
+                                                       sub_dir=sub_dir)
+
 
 class DNSFileFixtures(FileFixtures):
     def __init__(self, sub_dir=''):
         super(DNSFileFixtures, self).__init__(fixtures_type='dns',
                                               sub_dir=sub_dir)
 
+
 class OpenStackFixtures(FileFixtures):
-  def __init__(self, sub_dir=''):
-      super(OpenStackFixtures, self).__init__(fixtures_type='openstack',
+    def __init__(self, sub_dir=''):
+        super(OpenStackFixtures, self).__init__(fixtures_type='openstack',
                                                 sub_dir=sub_dir)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_brightbox.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_brightbox.py b/libcloud/test/loadbalancer/test_brightbox.py
index f1a2daa..2509d13 100644
--- a/libcloud/test/loadbalancer/test_brightbox.py
+++ b/libcloud/test/loadbalancer/test_brightbox.py
@@ -63,7 +63,9 @@ class BrightboxLBTests(unittest.TestCase):
         members = [Member('srv-lv426', None, None)]
 
         balancer = self.driver.create_balancer(name='lb2', port=80,
-            protocol='http', algorithm=Algorithm.ROUND_ROBIN, members=members)
+                                               protocol='http',
+                                               algorithm=Algorithm.ROUND_ROBIN,
+                                               members=members)
 
         self.assertEqual(balancer.name, 'lb2')
         self.assertEqual(balancer.port, 80)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_cloudstack.py b/libcloud/test/loadbalancer/test_cloudstack.py
index 1ed0493..a54c177 100644
--- a/libcloud/test/loadbalancer/test_cloudstack.py
+++ b/libcloud/test/loadbalancer/test_cloudstack.py
@@ -9,7 +9,6 @@ from libcloud.utils.py3 import httplib
 from libcloud.utils.py3 import urlparse
 from libcloud.utils.py3 import parse_qsl
 
-from libcloud.common.types import LibcloudError
 from libcloud.loadbalancer.types import Provider
 from libcloud.loadbalancer.providers import get_driver
 from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm
@@ -19,6 +18,7 @@ from libcloud.test import unittest
 from libcloud.test import MockHttpTestCase
 from libcloud.test.file_fixtures import LoadBalancerFileFixtures
 
+
 class CloudStackLBTests(unittest.TestCase):
     def setUp(self):
         CloudStackLBDriver.connectionCls.conn_classes = \
@@ -45,7 +45,7 @@ class CloudStackLBTests(unittest.TestCase):
         try:
             cls('key', 'secret', True, 'localhost', '/path')
         except Exception:
-             self.fail('host and path provided but driver raised an exception')
+            self.fail('host and path provided but driver raised an exception')
 
     def test_list_supported_algorithms(self):
         algorithms = self.driver.list_supported_algorithms()
@@ -84,6 +84,7 @@ class CloudStackLBTests(unittest.TestCase):
             self.assertTrue(isinstance(member, Member))
             self.assertEqual(member.balancer, balancer)
 
+
 class CloudStackMockHttp(MockHttpTestCase):
     fixtures = LoadBalancerFileFixtures('cloudstack')
     fixture_tag = 'default'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_elb.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_elb.py b/libcloud/test/loadbalancer/test_elb.py
index 68b6ac4..12ecb5b 100644
--- a/libcloud/test/loadbalancer/test_elb.py
+++ b/libcloud/test/loadbalancer/test_elb.py
@@ -66,8 +66,9 @@ class ElasticLBTests(unittest.TestCase):
         members = [Member('srv-lv426', None, None)]
 
         balancer = self.driver.create_balancer(name='lb2', port=80,
-            protocol='http', algorithm=Algorithm.ROUND_ROBIN,
-            members=members)
+                                               protocol='http',
+                                               algorithm=Algorithm.ROUND_ROBIN,
+                                               members=members)
 
         self.assertEqual(balancer.name, 'lb2')
         self.assertEqual(balancer.port, 80)

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_gce.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_gce.py b/libcloud/test/loadbalancer/test_gce.py
index b60977f..89c11e1 100644
--- a/libcloud/test/loadbalancer/test_gce.py
+++ b/libcloud/test/loadbalancer/test_gce.py
@@ -26,7 +26,7 @@ from libcloud.loadbalancer.drivers.gce import (GCELBDriver)
 from libcloud.test.common.test_google import GoogleAuthMockHttp
 from libcloud.test.compute.test_gce import GCEMockHttp
 
-from libcloud.test import MockHttpTestCase, LibcloudTestCase
+from libcloud.test import LibcloudTestCase
 
 from libcloud.test.secrets import GCE_PARAMS, GCE_KEYWORD_PARAMS
 
@@ -111,10 +111,10 @@ class GCELoadBalancerTest(LibcloudTestCase):
         balancer = self.driver.get_balancer('lcforwardingrule')
         member = self.driver._node_to_member(node, balancer)
         # Detach member first
-        detach_member = balancer.detach_member(member)
+        balancer.detach_member(member)
         self.assertEqual(len(balancer.list_members()), 1)
         # Attach Node
-        attach_node = balancer.attach_compute_node(node)
+        balancer.attach_compute_node(node)
         self.assertEqual(len(balancer.list_members()), 2)
 
     def test_detach_attach_member(self):
@@ -127,11 +127,11 @@ class GCELoadBalancerTest(LibcloudTestCase):
         self.assertEqual(len(balancer.list_members()), 2)
 
         # Remove a member and check that it now has 1 member
-        detach_member = balancer.detach_member(member)
+        balancer.detach_member(member)
         self.assertEqual(len(balancer.list_members()), 1)
 
         # Reattach member and check that it has 2 members again
-        attach_member = balancer.attach_member(member)
+        balancer.attach_member(member)
         self.assertEqual(len(balancer.list_members()), 2)
 
     def test_balancer_list_members(self):

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a73a3bd8/libcloud/test/loadbalancer/test_gogrid.py
----------------------------------------------------------------------
diff --git a/libcloud/test/loadbalancer/test_gogrid.py b/libcloud/test/loadbalancer/test_gogrid.py
index 3aa4f63..3e32a37 100644
--- a/libcloud/test/loadbalancer/test_gogrid.py
+++ b/libcloud/test/loadbalancer/test_gogrid.py
@@ -28,11 +28,12 @@ from libcloud.loadbalancer.drivers.gogrid import GoGridLBDriver
 from libcloud.test import MockHttpTestCase
 from libcloud.test.file_fixtures import LoadBalancerFileFixtures
 
+
 class GoGridTests(unittest.TestCase):
 
     def setUp(self):
         GoGridLBDriver.connectionCls.conn_classes = (None,
-                GoGridLBMockHttp)
+                                                     GoGridLBMockHttp)
         GoGridLBMockHttp.type = None
         self.driver = GoGridLBDriver('user', 'key')
 
@@ -59,12 +60,14 @@ class GoGridTests(unittest.TestCase):
 
     def test_create_balancer(self):
         balancer = self.driver.create_balancer(name='test2',
-                port=80,
-                protocol='http',
-                algorithm=Algorithm.ROUND_ROBIN,
-                members=(Member(None, '10.1.0.10', 80),
-                    Member(None, '10.1.0.11', 80))
-                )
+                                               port=80,
+                                               protocol='http',
+                                               algorithm=Algorithm.ROUND_ROBIN,
+                                               members=(
+                                                   Member(
+                                                       None, '10.1.0.10', 80),
+                                                   Member(None, '10.1.0.11', 80))
+                                               )
 
         self.assertEqual(balancer.name, 'test2')
         self.assertEqual(balancer.id, '123')
@@ -76,15 +79,16 @@ class GoGridTests(unittest.TestCase):
 
         try:
             self.driver.create_balancer(name='test2',
-                    port=80,
-                    protocol='http',
-                    algorithm=Algorithm.ROUND_ROBIN,
-                    members=(Member(None, '10.1.0.10', 80),
-                             Member(None, '10.1.0.11', 80))
-                    )
+                                        port=80,
+                                        protocol='http',
+                                        algorithm=Algorithm.ROUND_ROBIN,
+                                        members=(Member(None, '10.1.0.10', 80),
+                                                 Member(None, '10.1.0.11', 80))
+                                        )
         except LibcloudError:
             e = sys.exc_info()[1]
-            self.assertTrue(str(e).find('tried to add a member with an IP address not assigned to your account') != -1)
+            self.assertTrue(
+                str(e).find('tried to add a member with an IP address not assigned to your account') != -1)
         else:
             self.fail('Exception was not thrown')
 
@@ -114,7 +118,7 @@ class GoGridTests(unittest.TestCase):
         self.assertEqual(len(members1), 3)
         self.assertEqual(len(members2), 3)
         self.assertEqual(expected_members,
-                set(["%s:%s" % (member.ip, member.port) for member in members1]))
+                         set(["%s:%s" % (member.ip, member.port) for member in members1]))
         self.assertEquals(members1[0].balancer, balancer)
 
     def test_balancer_attach_compute_node(self):
@@ -150,6 +154,7 @@ class GoGridTests(unittest.TestCase):
         self.assertTrue(ret1)
         self.assertTrue(ret2)
 
+
 class GoGridLBMockHttp(MockHttpTestCase):
     fixtures = LoadBalancerFileFixtures('gogrid')