Final Azure

.travis.yml

@@ -13,221 +13,221 @@ matrix:
     - os: osx
   include:
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_block_store_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_block_store_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_block_store_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py27-aws TOX_TEST=test_cloud_factory
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py27-azure TOX_TEST=test_cloud_factory
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py27-openstack TOX_TEST=test_cloud_factory
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py27-aws TOX_TEST=test_cloud_helpers
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py27-azure TOX_TEST=test_cloud_helpers
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py27-openstack TOX_TEST=test_cloud_helpers
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_compute_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_compute_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_compute_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_interface
+      env: TOX_ENV=py27-aws TOX_TEST=test_interface
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_interface
+      env: TOX_ENV=py27-azure TOX_TEST=test_interface
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_interface
+      env: TOX_ENV=py27-openstack TOX_TEST=test_interface
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_network_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_network_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_network_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_network_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_network_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_network_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py27-aws TOX_TEST=test_object_life_cycle
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py27-azure TOX_TEST=test_object_life_cycle
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py27-openstack TOX_TEST=test_object_life_cycle
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_object_store_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_object_store_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_object_store_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_region_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_region_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_region_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_region_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_region_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_region_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_security_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_security_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_security_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_security_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_security_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_security_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_vm_types_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_vm_types_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_vm_types_service
     - python: 2.7
-      env: TOX_ENV=py27-aws TOX_TEST=test.test_image_service
+      env: TOX_ENV=py27-aws TOX_TEST=test_image_service
     - python: 2.7
-      env: TOX_ENV=py27-azure TOX_TEST=test.test_image_service
+      env: TOX_ENV=py27-azure TOX_TEST=test_image_service
     - python: 2.7
-      env: TOX_ENV=py27-openstack TOX_TEST=test.test_image_service
+      env: TOX_ENV=py27-openstack TOX_TEST=test_image_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_block_store_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_block_store_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_block_store_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py36-aws TOX_TEST=test_cloud_factory
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py36-azure TOX_TEST=test_cloud_factory
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=py36-openstack TOX_TEST=test_cloud_factory
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py36-aws TOX_TEST=test_cloud_helpers
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py36-azure TOX_TEST=test_cloud_helpers
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=py36-openstack TOX_TEST=test_cloud_helpers
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_compute_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_compute_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_compute_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_compute_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_interface
+      env: TOX_ENV=py36-aws TOX_TEST=test_interface
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_interface
+      env: TOX_ENV=py36-azure TOX_TEST=test_interface
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_interface
+      env: TOX_ENV=py36-openstack TOX_TEST=test_interface
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_network_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_network_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_network_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_network_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_network_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_network_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py36-aws TOX_TEST=test_object_life_cycle
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py36-azure TOX_TEST=test_object_life_cycle
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=py36-openstack TOX_TEST=test_object_life_cycle
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_object_store_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_object_store_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_object_store_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_region_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_region_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_region_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_region_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_region_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_region_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_security_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_security_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_security_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_security_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_security_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_security_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_vm_types_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_vm_types_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_vm_types_service
     - python: 3.6
-      env: TOX_ENV=py36-aws TOX_TEST=test.test_image_service
+      env: TOX_ENV=py36-aws TOX_TEST=test_image_service
     - python: 3.6
-      env: TOX_ENV=py36-azure TOX_TEST=test.test_image_service
+      env: TOX_ENV=py36-azure TOX_TEST=test_image_service
     - python: 3.6
-      env: TOX_ENV=py36-openstack TOX_TEST=test.test_image_service
+      env: TOX_ENV=py36-openstack TOX_TEST=test_image_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_block_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_block_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_block_store_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_block_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=pypy-aws TOX_TEST=test_cloud_factory
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=pypy-azure TOX_TEST=test_cloud_factory
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_cloud_factory
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_cloud_factory
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=pypy-aws TOX_TEST=test_cloud_helpers
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=pypy-azure TOX_TEST=test_cloud_helpers
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_cloud_helpers
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_cloud_helpers
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_compute_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_compute_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_compute_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_compute_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_compute_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_compute_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_interface
+      env: TOX_ENV=pypy-aws TOX_TEST=test_interface
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_interface
+      env: TOX_ENV=pypy-azure TOX_TEST=test_interface
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_interface
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_interface
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_network_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_network_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_network_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_network_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_network_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_network_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=pypy-aws TOX_TEST=test_object_life_cycle
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=pypy-azure TOX_TEST=test_object_life_cycle
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_object_life_cycle
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_object_life_cycle
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_object_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_object_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_object_store_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_object_store_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_region_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_region_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_region_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_region_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_region_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_region_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_security_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_security_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_security_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_security_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_security_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_security_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_vm_types_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_vm_types_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_vm_types_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_vm_types_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-aws TOX_TEST=test.test_image_service
+      env: TOX_ENV=pypy-aws TOX_TEST=test_image_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-azure TOX_TEST=test.test_image_service
+      env: TOX_ENV=pypy-azure TOX_TEST=test_image_service
     - python: pypy-5.3.1
-      env: TOX_ENV=pypy-openstack TOX_TEST=test.test_image_service
+      env: TOX_ENV=pypy-openstack TOX_TEST=test_image_service
 before_install:
     - |
       case "$TRAVIS_EVENT_TYPE" in
@@ -262,7 +262,7 @@ install:
     - pip install coveralls
     - pip install codecov
 script:
-    - tox -e $TOX_ENV -- -s -v --tests $TOX_TEST
+    - travis_wait 30 tox -e $TOX_ENV -- -s --tests test.$TOX_TEST
 after_script:
     - |
       case "$TRAVIS_EVENT_TYPE" in
@@ -283,4 +283,3 @@ after_script:
            coveralls & codecov & wait
            ;;
       esac
-

cloudbridge/cloud/interfaces/resources.py

@@ -2187,7 +2187,7 @@ class BucketObject(CloudResource):
         pass
 
     @abstractmethod
-    def generate_url(self, expires_in=3600):
+    def generate_url(self, expires_in):
         """
         Generate a URL to this object.
 

cloudbridge/cloud/providers/azure/services.py

@@ -57,9 +57,9 @@ class AzureVMFirewallService(BaseVMFirewallService):
         try:
             fws = self.provider.azure_client.get_vm_firewall(fw_id)
             return AzureVMFirewall(self.provider, fws)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def list(self, limit=None, marker=None):
@@ -270,9 +270,9 @@ class AzureVolumeService(BaseVolumeService):
         try:
             volume = self.provider.azure_client.get_disk(volume_id)
             return AzureVolume(self.provider, volume)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def find(self, **kwargs):
@@ -354,9 +354,9 @@ class AzureSnapshotService(BaseSnapshotService):
         try:
             snapshot = self.provider.azure_client.get_snapshot(ss_id)
             return AzureSnapshot(self.provider, snapshot)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def find(self, **kwargs):
@@ -725,9 +725,9 @@ class AzureInstanceService(BaseInstanceService):
         try:
             vm = self.provider.azure_client.get_vm(instance_id)
             return AzureInstance(self.provider, vm)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def find(self, **kwargs):
@@ -756,9 +756,9 @@ class AzureImageService(BaseImageService):
         try:
             image = self.provider.azure_client.get_image(image_id)
             return AzureMachineImage(self.provider, image)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def find(self, **kwargs):
@@ -840,9 +840,9 @@ class AzureNetworkService(BaseNetworkService):
         try:
             network = self.provider.azure_client.get_network(network_id)
             return AzureNetwork(self.provider, network)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def list(self, limit=None, marker=None):
@@ -939,9 +939,9 @@ class AzureSubnetService(BaseSubnetService):
             azure_subnet = self.provider.azure_client.get_subnet(subnet_id)
             return AzureSubnet(self.provider,
                                azure_subnet) if azure_subnet else None
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def list(self, network=None, limit=None, marker=None):
@@ -964,12 +964,12 @@ class AzureSubnetService(BaseSubnetService):
                     result_list.extend(self.provider.azure_client.list_subnets(
                         net.id
                     ))
-                except CloudError as cloudError:
-                    message = cloudError.message
+                except CloudError as cloud_error:
+                    message = cloud_error.message
                     if "not found" in message and "virtualNetworks" in message:
-                        log.exception(cloudError)
+                        log.exception(cloud_error)
                     else:
-                        raise cloudError
+                        raise cloud_error
         subnets = [AzureSubnet(self.provider, subnet)
                    for subnet in result_list]
 
@@ -1040,9 +1040,9 @@ class AzureRouterService(BaseRouterService):
         try:
             route = self.provider.azure_client.get_route_table(router_id)
             return AzureRouter(self.provider, route)
-        except (CloudError, InvalidValueException) as cloudError:
+        except (CloudError, InvalidValueException) as cloud_error:
             # Azure raises the cloud error if the resource not available
-            log.exception(cloudError)
+            log.exception(cloud_error)
             return None
 
     def find(self, **kwargs):

setup.cfg

@@ -8,8 +8,8 @@ omit =
 with-coverage=1
 cover-branches=1
 cover-package=cloudbridge
-processes=5
-process-timeout=2700
+processes=10
+process-timeout=3000
 match=^[Tt]est 
 # Don't capture stdout - print immediately
 nocapture=1