Merge branch 'master' of https://github.com/gvlproject/cloudbridge

cloudbridge/cloud/base/services.py

@@ -157,7 +157,6 @@ class BaseRegionService(
 
 
 class BaseNetworkingService(NetworkingService, BaseCloudService):
-
     def __init__(self, provider):
         super(BaseNetworkingService, self).__init__(provider)
 
@@ -224,8 +223,7 @@ class BaseFloatingIPService(
 
 
 class BaseRouterService(
-        BasePageableObjectMixin, RouterService, BaseCloudService):
-
+    BasePageableObjectMixin, RouterService, BaseCloudService):
     def __init__(self, provider):
         super(BaseRouterService, self).__init__(provider)
 
@@ -242,7 +240,6 @@ class BaseRouterService(
 
 
 class BaseGatewayService(
-        GatewayService, BaseCloudService):
-
+    GatewayService, BaseCloudService):
     def __init__(self, provider):
         super(BaseGatewayService, self).__init__(provider)

cloudbridge/cloud/interfaces/resources.py

@@ -884,7 +884,6 @@ class Network(ObjectLifeCycleMixin, CloudResource):
 
 
 class SubnetState(object):
-
     """
     Standard states for a subnet.
 
@@ -1099,7 +1098,6 @@ class Router(CloudResource):
 
 
 class GatewayState(object):
-
     """
     Standard states for a gateway.
 

cloudbridge/cloud/interfaces/services.py

@@ -547,7 +547,6 @@ class ImageService(PageableObjectMixin, CloudService):
 
 
 class NetworkingService(CloudService):
-
     """
     Base service interface for networking.
 
@@ -859,7 +858,6 @@ class FloatingIPService(PageableObjectMixin, CloudService):
 
 
 class RouterService(PageableObjectMixin, CloudService):
-
     """
     Manage networking router actions and resources.
     """
@@ -927,7 +925,6 @@ class RouterService(PageableObjectMixin, CloudService):
 
 
 class GatewayService(CloudService):
-
     """
     Manage internet gateway resources.
     """

cloudbridge/cloud/providers/aws/resources.py

@@ -942,7 +942,6 @@ class AWSNetwork(BaseNetwork):
 
 
 class AWSSubnet(BaseSubnet):
-
     # http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeSubnets.html
     _SUBNET_STATE_MAP = {
         'pending': SubnetState.PENDING,
@@ -1029,7 +1028,6 @@ class AWSFloatingIP(BaseFloatingIP):
 
 
 class AWSRouter(BaseRouter):
-
     def __init__(self, provider, route_table):
         super(AWSRouter, self).__init__(provider)
         self._route_table = route_table
@@ -1096,7 +1094,6 @@ class AWSRouter(BaseRouter):
 
 
 class AWSInternetGateway(BaseInternetGateway):
-
     def __init__(self, provider, gateway):
         super(AWSInternetGateway, self).__init__(provider)
         self._gateway = gateway

docs/api_docs/cloud/services.rst

@@ -41,7 +41,7 @@ ImageService
 NetworkingService
 -----------------
 .. autoclass:: cloudbridge.cloud.interfaces.services.NetworkingService
-    :members:
+:members:
 
 NetworkService
 -----------------

docs/topics/contributor_guide.rst

@@ -10,6 +10,6 @@ CloudBridge Provider.
     Design Goals <design_goals.rst>
     Design Decisions <design-decisions.rst>
     Testing <testing.rst>
-    Provider Development Walkthrough <provider_development.rst>
-    Release Process <release_process.rst>
+                         Provider Development Walkthrough <provider_development.rst>
+                         Release Process <release_process.rst>
 

docs/topics/testing.rst

@@ -43,7 +43,7 @@ Specific environment and infrastructure
 If you’d like to run the tests on a specific environment only, say Python 2.7,
 against a specific infrastructure, say aws, use a command like this:
 ``tox -e py27-aws``. The available provider names are listed in the
-`ProviderList`_ class (e.g., ``aws`` or ``openstack``).  
+`ProviderList`_ class (e.g., ``aws`` or ``openstack``).
 
 Specific test cases
 ~~~~~~~~~~~~~~~~~~~~

test/helpers/__init__.py

@@ -179,7 +179,6 @@ def get_uuid():
 
 
 class ProviderTestBase(unittest.TestCase):
-
     _provider = None
 
     def setUp(self):
@@ -205,7 +204,7 @@ class ProviderTestBase(unittest.TestCase):
         provider_class = factory.get_provider_class(provider_name,
                                                     get_mock=use_mock_drivers)
         config = {'default_wait_interval':
-                  self.get_provider_wait_interval(provider_class),
+                      self.get_provider_wait_interval(provider_class),
                   'default_result_limit': 1}
         return provider_class(config)