Renamed image_id to id. Temporarily disabled openstack

block_device_mappings.

cloudbridge/cloud/base.py

@@ -181,10 +181,9 @@ class BaseInstance(BaseObjectLifeCycleMixin, Instance):
 
 class BaseLaunchConfig(LaunchConfig):
 
-    block_devices = []
-
     def __init__(self, provider):
         self.provider = provider
+        self.block_devices = []
 
     class BlockDeviceMapping(object):
         """
@@ -194,7 +193,7 @@ class BaseLaunchConfig(LaunchConfig):
         def __init__(self, dest_type, source=None, is_root=None,
                      size=None, delete_on_terminate=None):
             self.dest_type = dest_type
-            self.source = dest_type
+            self.source = source
             self.is_root = is_root
             self.size = size
             self.delete_on_terminate = delete_on_terminate
@@ -267,7 +266,7 @@ class BaseMachineImage(BaseObjectLifeCycleMixin, MachineImage):
 
     def __repr__(self):
         return "<CB-{0}: {1} ({2})>".format(self.__class__.__name__,
-                                            self.image_id, self.name)
+                                            self.id, self.name)
 
 
 class BaseVolume(BaseObjectLifeCycleMixin, Volume):

cloudbridge/cloud/interfaces/resources.py

@@ -293,7 +293,7 @@ class MachineImage(ObjectLifeCycleMixin):
     __metaclass__ = ABCMeta
 
     @abstractproperty
-    def image_id(self):
+    def id(self):
         """
         Get the image identifier.
 

cloudbridge/cloud/providers/aws/resources.py

@@ -41,7 +41,7 @@ class AWSMachineImage(BaseMachineImage):
             self._ec2_image = image
 
     @property
-    def image_id(self):
+    def id(self):
         """
         Get the image identifier.
 
@@ -86,7 +86,7 @@ class AWSMachineImage(BaseMachineImage):
         Refreshes the state of this instance by re-querying the cloud provider
         for its latest state.
         """
-        image = self._provider.images.get(self.image_id)
+        image = self._provider.images.get(self.id)
         if image:
             self._ec2_image = image._ec2_image
         else:

cloudbridge/cloud/providers/openstack/resources.py

@@ -44,7 +44,7 @@ class OpenStackMachineImage(BaseMachineImage):
             self._os_image = os_image
 
     @property
-    def image_id(self):
+    def id(self):
         """
         Get the image identifier.
         """
@@ -80,7 +80,7 @@ class OpenStackMachineImage(BaseMachineImage):
         Refreshes the state of this instance by re-querying the cloud provider
         for its latest state.
         """
-        image = self._provider.images.get(self.image_id)
+        image = self._provider.images.get(self.id)
         if image:
             self._os_image = image._os_image
         else:

cloudbridge/cloud/providers/openstack/services.py

@@ -451,7 +451,7 @@ class OpenStackInstanceService(BaseInstanceService):
         """
         Creates a new virtual machine instance.
         """
-        image_id = image.image_id if isinstance(image, MachineImage) else image
+        image_id = image.id if isinstance(image, MachineImage) else image
         instance_size = instance_type.name if \
             isinstance(instance_type, InstanceType) else \
             self.provider.compute.instance_types.find_by_name(instance_type).id
@@ -467,7 +467,7 @@ class OpenStackInstanceService(BaseInstanceService):
         else:
             security_groups_list = None
         if launch_config:
-            bdm = self._to_block_device_mapping(launch_config)
+            bdm = None  # self._to_block_device_mapping(launch_config)
         else:
             bdm = None
 

test/test_provider_compute_service.py

@@ -126,9 +126,10 @@ class ProviderComputeServiceTestCase(ProviderTestBase):
                                         source=img, size=-1)
 
                 # block_devices should be empty so far
-                self.assertFalse(
-                    lc.block_devices, "No block devices should have been added"
-                    " to mappings list since the configuration was invalid")
+                self.assertListEqual(
+                    lc.block_devices, [], "No block devices should have been"
+                    " added to mappings list since the configuration was"
+                    " invalid")
 
                 # Add a new volume
                 lc.add_block_device(LaunchConfig.DestinationType.VOLUME,

test/test_provider_image_service.py

@@ -50,14 +50,13 @@ class ProviderImageServiceTestCase(ProviderTestBase):
                     name)
 
                 get_img = self.provider.images.get(
-                    test_image.image_id)
+                    test_image.id)
                 self.assertTrue(
-                    found_images[0].image_id ==
-                    get_img.image_id == test_image.image_id,
+                    found_images[0].id == get_img.id == test_image.id,
                     "Ids returned by list: {0} and get: {1} are not as "
-                    " expected: {2}" .format(found_images[0].image_id,
-                                             get_img.image_id,
-                                             test_image.image_id))
+                    " expected: {2}" .format(found_images[0].id,
+                                             get_img.id,
+                                             test_image.id))
                 self.assertTrue(
                     found_images[0].name ==
                     get_img.name == test_image.name,