Auto-applied pep8 on save. Fixed other pep8 violations.

README.md

@@ -11,5 +11,5 @@ config = Bunch(access_key='a_key',
                secret_key='s_key')
 
 provider = CloudProviderFactory().create_provider(ProviderList.EC2, config)
-print provider.Security.list_key_pairs()
+print provider.security.list_key_pairs()
 ```

cloudbridge/providers/ec2/__init__.py

@@ -27,11 +27,14 @@ class EC2CloudProviderV1(CloudProvider):
             self.ec2_port = config.get('ec2_port', '')
             self.ec2_conn_path = config.get('ec2_conn_path', '/')
         else:
-            self.a_key = config.access_key if hasattr(config, 'access_key') and config.access_key else os.environ.get('EC2_ACCESS_KEY', None)
-            self.s_key = config.secret_key if hasattr(config, 'secret_key') and config.secret_key else os.environ.get('EC2_ACCESS_KEY', None)
+            self.a_key = config.access_key if hasattr(
+                config, 'access_key') and config.access_key else os.environ.get('EC2_ACCESS_KEY', None)
+            self.s_key = config.secret_key if hasattr(
+                config, 'secret_key') and config.secret_key else os.environ.get('EC2_ACCESS_KEY', None)
             self.is_secure = config.is_secure if hasattr(config, 'is_secure') else True
             self.region_name = config.region_name if hasattr(config, 'region_name') else 'us-east-1'
-            self.region_endpoint = config.region_endpoint if hasattr(config, 'region_endpoint') else 'ec2.us-east-1.amazonaws.com'
+            self.region_endpoint = config.region_endpoint if hasattr(
+                config, 'region_endpoint') else 'ec2.us-east-1.amazonaws.com'
             self.ec2_port = config.ec2_port if hasattr(config, 'ec2_port') else ''
             self.ec2_conn_path = config.ec2_conn_path if hasattr(config, 'ec2_conn_path') else "/"
 
@@ -39,7 +42,7 @@ class EC2CloudProviderV1(CloudProvider):
 
         # self.Compute = EC2ComputeService(self)
         # self.Images = EC2ImageService(self)
-        self.Security = EC2SecurityService(self)
+        self.security = EC2SecurityService(self)
         # self.BlockStore = EC2BlockStore(self)
         # self.ObjectStore = EC2ObjectStore(self)
 
@@ -61,6 +64,7 @@ class EC2CloudProviderV1(CloudProvider):
 
 
 class EC2SecurityService(SecurityService):
+
     def __init__(self, provider):
         self.provider = provider
 

cloudbridge/providers/interfaces.py

@@ -1,4 +1,5 @@
 class CloudProviderServiceType():
+
     """
     Defines possible service types that
     are offered by providers. Providers can implement the
@@ -9,15 +10,17 @@ class CloudProviderServiceType():
     """
     COMPUTE = 'compute'
     IMAGE = 'image'
-    SECURITY =  'security'
-    VOLUME =  'volume'
-    OBJECTSTORE =  'objectstore'
+    SECURITY = 'security'
+    VOLUME = 'volume'
+    OBJECTSTORE = 'objectstore'
 
 
 class CloudProvider():
+
     """
     Base interface for a cloud provider
     """
+
     def __init__(self, config):
         """
         Create a new provider implementation given a dictionary of configuration
@@ -49,8 +52,7 @@ class CloudProvider():
         raise NotImplementedError(
             'has_service not implemented by this provider')
 
-
-    def Compute(self):
+    def compute(self):
         """
         Provides access to all compute related services in this provider.
 
@@ -60,7 +62,7 @@ class CloudProvider():
         raise NotImplementedError(
             'CloudProvider.Compute not implemented by this provider')
 
-    def Image(self):
+    def image(self):
         """
         Provides access to all Image related services in this provider.
         (e.g. Glance in Openstack)
@@ -71,7 +73,7 @@ class CloudProvider():
         raise NotImplementedError(
             'CloudProvider.Images not implemented by this provider')
 
-    def Security(self):
+    def security(self):
         """
         Provides access to keypair management and firewall control
 
@@ -81,7 +83,7 @@ class CloudProvider():
         raise NotImplementedError(
             'CloudProvider.Security not implemented by this provider')
 
-    def Volume(self):
+    def volume(self):
         """
         Provides access to the volume/elastic block store services in this
         provider.
@@ -92,7 +94,7 @@ class CloudProvider():
         raise NotImplementedError(
             'CloudProvider.VolumeService not implemented by this provider')
 
-    def ObjectStore(self):
+    def object_store(self):
         """
         Provides access to object storage services in this provider.
 
@@ -104,10 +106,12 @@ class CloudProvider():
 
 
 class ComputeService():
+
     """
     Base interface for compute service supported by a provider
     """
-    def Provider(self):
+
+    def provider(self):
         """
         Returns the provider instance associated with this service.
 
@@ -179,10 +183,12 @@ class ComputeService():
 
 
 class VolumeService():
+
     """
     Base interface for a Volume Service
     """
-    def Provider(self):
+
+    def provider(self):
         """
         Returns the provider instance associated with this Service
 
@@ -244,10 +250,12 @@ class VolumeService():
 
 
 class ImageService():
+
     """
     Base interface for an Image Service
     """
-    def Provider(self):
+
+    def provider(self):
         """
         Returns the provider instance associated with this service
 
@@ -298,10 +306,12 @@ class ImageService():
 
 
 class ObjectStoreService():
+
     """
     Base interface for an Object Storage Service
     """
-    def Provider(self):
+
+    def provider(self):
         """
         Returns the provider instance associated with this service
 
@@ -352,10 +362,12 @@ class ObjectStoreService():
 
 
 class SecurityService():
+
     """
     Base interface for an Image Service
     """
-    def Provider(self):
+
+    def provider(self):
         """
         Returns the provider instance associated with this service
 
@@ -387,6 +399,7 @@ class SecurityService():
 
 
 class Instance():
+
     def instance_id(self):
         """
         Get the instance identifier.
@@ -510,6 +523,7 @@ class Instance():
 
 
 class Volume():
+
     def attach(self, instance_id, device):
         """
         Attach this volume to an instance.
@@ -574,6 +588,7 @@ class Volume():
 
 
 class Snapshot():
+
     def create_volume(self, placement, size=None, volume_type=None, iops=None):
         """
         Create a new Volume from this Snapshot.
@@ -637,6 +652,7 @@ class Snapshot():
 
 
 class Region():
+
     def name(self):
         raise NotImplementedError(
             'name not implemented by this provider')
@@ -647,6 +663,7 @@ class Region():
 
 
 class KeyPair():
+
     def __init__(self, name, material=None):
         self.name = name
         self.material = material
@@ -666,6 +683,7 @@ class KeyPair():
 
 
 class SecurityGroup():
+
     def name(self):
         """
         Return the name of this security group.
@@ -678,9 +696,11 @@ class SecurityGroup():
 
 
 class ContainerProvider():
+
     """
     Represents a container instance, such as Docker or LXC
     """
+
     def create_container(self):
         raise NotImplementedError(
             'create_container not implemented by this provider')
@@ -691,9 +711,11 @@ class ContainerProvider():
 
 
 class DeploymentProvider():
+
     """
     Represents a deployment provider, such as Ansible or Shell script provider
     """
+
     def deploy(self, target):
         """
         Deploys on given target, where target is an Instance or Container

example.py

@@ -6,4 +6,4 @@ config = Bunch(access_key='<ak>',
                secret_key='<sk>')
 
 provider = CloudProviderFactory().create_provider(ProviderList.EC2, config)
-print provider.Security.list_key_pairs()
+print provider.security.list_key_pairs()

tests/TestProviderSecurityService.py

@@ -9,6 +9,7 @@ from cloudbridge.providers.factory import CloudProviderFactory
 from cloudbridge.providers.factory import ProviderList
 from cloudbridge.providers import interfaces
 
+
 class TestProviderSecurityService(unittest.TestCase):
 
     def setUp(self):
@@ -16,6 +17,7 @@ class TestProviderSecurityService(unittest.TestCase):
         self.provider = CloudProviderFactory().create_provider(ProviderList.EC2, config)
 
     def test_list_key_pairs(self):
-        key_pairs = self.provider.Security.list_key_pairs()
+        key_pairs = self.provider.security.list_key_pairs()
         # Assume there's always one keypair at least
-        assert(isinstance(key_pairs[0], interfaces.KeyPair))
+        self.assertIsInstance(key_pairs[0], interfaces.KeyPair)
+        self.assertIsNotNone(key_pairs[0].name)