Fixed pylint warnings - avoid use of keyword id, fix up format string

error, remove deprecated method call

cloudbridge/providers/base.py

@@ -126,16 +126,16 @@ class BaseMachineImage(MachineImage):
                     "Image is in state: {0} which is a terminal state and cannot be waited on.".format(state))
             else:
                 log.debug(
-                    "Image is in state '{0}'. Waiting another {1} seconds to reach state a ready state...".format(
+                    "Image is in state '{0}'. Waiting another {1} seconds to reach a ready state...".format(
                         state,
                         time_left))
                 time.sleep(interval)
             self.refresh()
 
         raise MachineImageWaitException(
-            "Waited too long for image to become ready. Image Id: %s is still in state: %s".format(
-                self.image_id,
+            "Waited too long for image to become ready. Image: {0}({1}) is still in state: {2}".format(
                 self.name,
+                self.image_id,
                 self.image_state))
 
 

cloudbridge/providers/ec2/services.py

@@ -48,11 +48,11 @@ class EC2ImageService(ImageService):
     def __init__(self, provider):
         self.provider = provider
 
-    def get_image(self, id):
+    def get_image(self, image_id):
         """
         Returns an Image given its id
         """
-        image = self.provider.ec2_conn.get_image(id)
+        image = self.provider.ec2_conn.get_image(image_id)
         if image:
             return EC2MachineImage(self.provider, image)
         else:
@@ -90,9 +90,12 @@ class EC2ComputeService(ComputeService):
             instance_type,
             InstanceType) else instance_type
         zone_name = zone.name if isinstance(zone, PlacementZone) else zone
-        keypair_name = keypair.name if isinstance(keypair, KeyPair) else keypair
+        keypair_name = keypair.name if isinstance(
+            keypair,
+            KeyPair) else keypair
         if security_groups:
-            if isinstance(security_groups, list) and isinstance(security_groups[0], SecurityGroup):
+            if isinstance(security_groups, list) and isinstance(
+                    security_groups[0], SecurityGroup):
                 security_groups_list = [sg.name for sg in security_groups]
             else:
                 security_groups_list = security_groups

cloudbridge/providers/interfaces/services.py

@@ -26,7 +26,7 @@ class ComputeService(ProviderService):
     Base interface for compute service supported by a provider
     """
 
-    def get_instance(self, id):
+    def get_instance(self, instance_id):
         """
         Returns an instance given its id.
 
@@ -130,7 +130,7 @@ class VolumeService(ProviderService):
     Base interface for a Volume Service
     """
 
-    def get_volume(self, id):
+    def get_volume(self, volume_id):
         """
         Returns a volume given its id.
 
@@ -187,7 +187,7 @@ class ImageService(ProviderService):
     Base interface for an Image Service
     """
 
-    def get_image(self, id):
+    def get_image(self, image_id):
         """
         Returns an Image given its id
 
@@ -224,7 +224,7 @@ class ObjectStoreService(ProviderService):
     Base interface for an Object Storage Service
     """
 
-    def get_container(self, id):
+    def get_container(self, container_id):
         """
         Returns a container given its id
 

cloudbridge/providers/openstack/services.py

@@ -51,11 +51,11 @@ class OpenStackImageService(ImageService):
     def __init__(self, provider):
         self.provider = provider
 
-    def get_image(self, id):
+    def get_image(self, image_id):
         """
         Returns an Image given its id
         """
-        image = self.provider.nova.images.get(id)
+        image = self.provider.nova.images.get(image_id)
         if image:
             return OpenStackMachineImage(self.provider, image)
         else:
@@ -73,7 +73,8 @@ class OpenStackImageService(ImageService):
         List all images.
         """
         images = self.provider.nova.images.list()
-        return [OpenStackMachineImage(self.provider, image) for image in images]
+        return [OpenStackMachineImage(self.provider, image)
+                for image in images]
 
 
 class OpenStackInstanceTypesService(InstanceTypesService):
@@ -82,10 +83,12 @@ class OpenStackInstanceTypesService(InstanceTypesService):
         self.provider = provider
 
     def list(self):
-        return [OpenStackInstanceType(f) for f in self.provider.nova.flavors.list()]
+        return [OpenStackInstanceType(f)
+                for f in self.provider.nova.flavors.list()]
 
     def find_by_name(self, name):
-        return next((itype for itype in self.list() if itype.name == name), None)
+        return next(
+            (itype for itype in self.list() if itype.name == name), None)
 
 
 class OpenStackComputeService(ComputeService):
@@ -104,9 +107,12 @@ class OpenStackComputeService(ComputeService):
             instance_type,
             InstanceType) else self.instance_types.find_by_name(instance_type).id
         zone_name = zone.name if isinstance(zone, PlacementZone) else zone
-        keypair_name = keypair.name if isinstance(keypair, KeyPair) else keypair
+        keypair_name = keypair.name if isinstance(
+            keypair,
+            KeyPair) else keypair
         if security_groups:
-            if isinstance(security_groups, list) and isinstance(security_groups[0], SecurityGroup):
+            if isinstance(security_groups, list) and isinstance(
+                    security_groups[0], SecurityGroup):
                 security_groups_list = [sg.name for sg in security_groups]
             else:
                 security_groups_list = security_groups
@@ -129,7 +135,8 @@ class OpenStackComputeService(ComputeService):
         List all instances.
         """
         instances = self.provider.nova.servers.list()
-        return [OpenStackInstance(self.provider, instance) for instance in instances]
+        return [OpenStackInstance(self.provider, instance)
+                for instance in instances]
 
     def list_regions(self):
         """
@@ -140,9 +147,9 @@ class OpenStackComputeService(ComputeService):
         regions = self.provider.nova.availability_zones.list(detailed=False)
         return [OpenStackRegion(self.provider, region) for region in regions]
 
-    def get_instance(self, id):
+    def get_instance(self, instance_id):
         """
         Returns an instance given its id.
         """
-        os_instance = self.provider.nova.servers.get(id)
-        return OpenStackInstance(self.provider, os_instance)
+        os_instance = self.provider.nova.servers.get(instance_id)
+        return OpenStackInstance(self.provider, os_instance)

test/test_provider_factory.py

@@ -29,8 +29,8 @@ class ProviderFactoryTestCase(unittest.TestCase):
         Searching for a provider with a known name or version should return a valid implementation
         """
         self.assertTrue(CloudProviderFactory().find_provider_impl(factory.ProviderList.EC2))
-        self.assertEquals(CloudProviderFactory().find_provider_impl(factory.ProviderList.EC2, version=1),
-                          "cloudbridge.providers.ec2.EC2CloudProviderV1")
+        self.assertEqual(CloudProviderFactory().find_provider_impl(factory.ProviderList.EC2, version=1),
+                         "cloudbridge.providers.ec2.EC2CloudProviderV1")
 
     def test_find_provider_impl_invalid(self):
         """