Fix flake8 style errors

cloudbridge/cloud/base/services.py

@@ -4,7 +4,6 @@ Base implementation for services available through a provider
 import logging
 
 from cloudbridge.cloud.interfaces.resources import Router
-
 from cloudbridge.cloud.interfaces.services import BucketService
 from cloudbridge.cloud.interfaces.services import CloudService
 from cloudbridge.cloud.interfaces.services import ComputeService

cloudbridge/cloud/providers/aws/helpers.py

@@ -1,5 +1,6 @@
 """A set of AWS-specific helper methods used by the framework."""
 import logging as log
+
 from boto3.resources.params import create_request_parameters
 
 from botocore import xform_name

cloudbridge/cloud/providers/aws/services.py

@@ -37,7 +37,6 @@ import requests
 
 from .helpers import BotoEC2Service
 from .helpers import BotoS3Service
-
 from .resources import AWSBucket
 from .resources import AWSFloatingIP
 from .resources import AWSInstance

cloudbridge/cloud/providers/gce/provider.py

@@ -42,11 +42,14 @@ class GCPResourceUrl(object):
              'id': '6662746501848591938',
              'creationTimestamp': '2017-10-13T12:53:17.445-07:00',
              'name': 'testsubnet-2',
-             'network': 'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/global/networks/testnet',
+             'network':
+                     'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/global/networks/testnet',
              'ipCidrRange': '10.128.0.0/20',
              'gatewayAddress': '10.128.0.1',
-             'region': 'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/regions/us-central1',
-             'selfLink': 'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/regions/us-central1/subnetworks/testsubnet-2',
+             'region':
+                     'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/regions/us-central1',
+             'selfLink':
+                     'https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/regions/us-central1/subnetworks/testsubnet-2',
              'privateIpGoogleAccess': false}
         """
         discovery_object = getattr(self._connection, self._resource)()
@@ -132,9 +135,9 @@ class GCPResources(object):
 
         Example:
             If the input url is the following
-            
+
             https://www.googleapis.com/compute/v1/projects/galaxy-on-gcp/regions/us-central1/subnetworks/testsubnet-2
-            
+
             then parse_url will return a GCPResourceURL and the parameters
             field of the returned object will look like:
 

cloudbridge/cloud/providers/gce/resources.py

@@ -30,6 +30,7 @@ from cloudbridge.cloud.base.resources import BaseVolume
 from cloudbridge.cloud.base.resources import ServerPagedResultList
 from cloudbridge.cloud.interfaces.resources import InstanceState
 from cloudbridge.cloud.interfaces.resources import MachineImageState
+from cloudbridge.cloud.interfaces.resources import NetworkState
 from cloudbridge.cloud.interfaces.resources import RouterState
 from cloudbridge.cloud.interfaces.resources import SnapshotState
 from cloudbridge.cloud.interfaces.resources import VolumeState
@@ -306,7 +307,8 @@ class GCEFirewallsDelegate(object):
                             .execute())
             self._provider.wait_for_operation(response)
             # TODO: process the response and handle errors.
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return False
         finally:
             self._update_list_response()
@@ -404,7 +406,8 @@ class GCEFirewallsDelegate(object):
                                     firewall=firewall['name'])
                             .execute())
             self._provider.wait_for_operation(response)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return False
         # TODO: process the response and handle errors.
         return True
@@ -1239,7 +1242,8 @@ class GCENetwork(BaseNetwork):
             if 'error' in response:
                 return False
             self._provider.wait_for_operation(response)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return False
         return True
 
@@ -1282,7 +1286,7 @@ class GCEFloatingIP(BaseFloatingIP):
                     url = provider.parse_url(target['instance'])
                     try:
                         self._target_instance = url.get_resource()
-                    except:
+                    except googleapiclient.errors.HttpError:
                         self._target_instance = GCEFloatingIP._DEAD_INSTANCE
                 else:
                     cb.log.warning('Address "%s" is forwarded to a %s',
@@ -1829,7 +1833,8 @@ class GCSBucket(BaseBucket):
             if 'error' in response:
                 return None
             return GCSObject(self._provider, self, response)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
     def list(self, limit=None, marker=None, prefix=None):
@@ -1857,7 +1862,8 @@ class GCSBucket(BaseBucket):
             return ServerPagedResultList('nextPageToken' in response,
                                          response.get('nextPageToken'),
                                          False, data=objects)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return ServerPagedResultList(False, None, False, data=[])
 
     def delete(self, delete_contents=False):
@@ -1892,5 +1898,6 @@ class GCSBucket(BaseBucket):
             if 'error' in response:
                 return None
             return response
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None

cloudbridge/cloud/providers/gce/services.py

@@ -330,7 +330,8 @@ class GCERegionService(BaseRegionService):
                                region=region_id)
                           .execute())
         # Handle the case when region_id is not valid
-        except googleapiclient.errors.HttpError:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
         if region:
             return GCERegion(self.provider, region)
@@ -624,7 +625,8 @@ class GCENetworkService(BaseNetworkService):
                 for network in response['items']:
                     networks.append(GCENetwork(self.provider, network))
             return networks
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return []
 
     def _create(self, name, create_subnetworks):
@@ -654,7 +656,8 @@ class GCENetworkService(BaseNetworkService):
             self.provider.wait_for_operation(response)
             networks = self.list(filter='name eq %s' % name)
             return None if len(networks) == 0 else networks[0]
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
     def create(self, name):
@@ -682,7 +685,8 @@ class GCENetworkService(BaseNetworkService):
             # TODO: if network_id is given, filter out IPs that are assigned to
             # resources in a different network.
             return ips
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return []
 
     def create_floating_ip(self, region=None):
@@ -704,7 +708,8 @@ class GCENetworkService(BaseNetworkService):
             for ip in ips:
                 if ip.id == response['targetId']:
                     return ip
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
     def routers(self, region=None):
@@ -717,7 +722,8 @@ class GCENetworkService(BaseNetworkService):
                                            region=region):
                 routers.append(GCERouter(self.provider, router))
             return routers
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return []
 
     def create_router(self, name=None, network=None, region=None):
@@ -742,7 +748,8 @@ class GCENetworkService(BaseNetworkService):
             for router in routers:
                 if router.id == response['targetId']:
                     return router
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
 
@@ -812,7 +819,8 @@ class GCESubnetService(BaseSubnetService):
             for subnet in subnets:
                 if subnet.id == response['targetId']:
                     return subnet
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
     def get_or_create_default(self, zone=None):
@@ -1091,7 +1099,8 @@ class GCSObjectStoreService(BaseObjectStoreService):
                                    bucket_id)
                 return None
             return GCSBucket(self.provider, response)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None
 
     def find(self, name, limit=None, marker=None):
@@ -1126,7 +1135,8 @@ class GCSObjectStoreService(BaseObjectStoreService):
             return ServerPagedResultList('nextPageToken' in response,
                                          response.get('nextPageToken'),
                                          False, data=buckets)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return ServerPagedResultList(False, None, False, data=[])
 
     def create(self, name, location=None):
@@ -1146,5 +1156,6 @@ class GCSObjectStoreService(BaseObjectStoreService):
             if 'error' in response:
                 return None
             return GCSBucket(self.provider, response)
-        except:
+        except googleapiclient.errors.HttpError as http_error:
+            cb.log.warning('googleapiclient.errors.HttpError: %s', http_error)
             return None

cloudbridge/cloud/providers/openstack/provider.py

@@ -1,7 +1,6 @@
 """Provider implementation based on OpenStack Python clients for OpenStack."""
 
 import inspect
-
 import os
 
 from cinderclient import client as cinder_client

cloudbridge/cloud/providers/openstack/resources.py

@@ -3,7 +3,6 @@ DataTypes used by this provider
 """
 import inspect
 import ipaddress
-
 import logging
 import os
 
@@ -49,7 +48,6 @@ import novaclient.exceptions as novaex
 from openstack.exceptions import HttpException
 
 import swiftclient
-
 from swiftclient.service import SwiftService, SwiftUploadObject
 
 

setup.py

@@ -21,7 +21,8 @@ with open(os.path.join('cloudbridge', '__init__.py')) as f:
 REQS_BASE = [
     'bunch>=1.0.1',
     'six>=1.10.0',
-    'retrying>=1.3.3'
+    'retrying>=1.3.3',
+    'oslo.i18n>=3.15.3'
 ]
 REQS_AWS = ['boto3']
 REQS_OPENSTACK = [
@@ -31,7 +32,8 @@ REQS_OPENSTACK = [
     'python-cinderclient>=1.9.0',
     'python-swiftclient>=3.2.0',
     'python-neutronclient>=6.0.0',
-    'python-keystoneclient>=3.13.0'
+    'python-keystoneclient>=3.13.0',
+    'requests>=2.14.2'
 ]
 REQS_FULL = REQS_BASE + REQS_AWS + REQS_OPENSTACK
 # httpretty is required with/for moto 1.0.0 or AWS tests fail

test/helpers/__init__.py

@@ -4,7 +4,6 @@ import sys
 import traceback
 import unittest
 import uuid
-
 from contextlib import contextmanager
 
 from cloudbridge.cloud.factory import CloudProviderFactory

test/test_block_store_service.py

@@ -1,6 +1,5 @@
 import time
 import uuid
-
 from test import helpers
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit

test/test_cloud_factory.py

@@ -1,5 +1,4 @@
 import unittest
-
 from test import helpers
 
 from cloudbridge.cloud import factory

test/test_cloud_helpers.py

@@ -1,5 +1,4 @@
 import itertools
-
 from test.helpers import ProviderTestBase
 
 from cloudbridge.cloud.base.resources import ClientPagedResultList

test/test_compute_service.py

@@ -1,5 +1,4 @@
 import ipaddress
-
 from test import helpers
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit

test/test_interface.py

@@ -1,9 +1,7 @@
 import unittest
-
 from test.helpers import ProviderTestBase
 
 import cloudbridge
-
 from cloudbridge.cloud import interfaces
 from cloudbridge.cloud.factory import CloudProviderFactory
 from cloudbridge.cloud.interfaces import TestMockHelperMixin

test/test_network_service.py

@@ -1,5 +1,4 @@
 import test.helpers as helpers
-
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit
 

test/test_object_store_service.py

@@ -2,7 +2,6 @@ import filecmp
 import os
 import tempfile
 import uuid
-
 from datetime import datetime
 from io import BytesIO
 from test import helpers

test/test_vm_types_service.py

@@ -1,5 +1,4 @@
 from test import helpers
-
 from test.helpers import ProviderTestBase
 from test.helpers import standard_interface_tests as sit