Improve Linode create_image

Author: micafer

libcloud/compute/drivers/linode.py

@@ -409,6 +409,43 @@ def ex_list_disks(self, node):
 
         return [self._to_disk(obj) for obj in data]
 
+    def ex_get_primary_disk(self, node):
+        """
+        Return the disk configured as the node's root device.
+
+        The first configuration profile is used, matching the configuration
+        selected by default by Linode when none is explicitly specified.
+
+        :param node: Node whose primary disk should be returned. (required)
+        :type node: :class:`Node`
+
+        :rtype: :class:`LinodeDisk`
+        """
+        if not isinstance(node, Node):
+            raise LinodeExceptionV4("Invalid node instance")
+
+        configs = self._paginated_request(
+            "/v4/linode/instances/%s/configs" % node.id, "data"
+        )
+        if not configs:
+            raise LinodeExceptionV4("Node has no configuration profiles")
+
+        config = configs[0]
+        root_device = config.get("root_device") or "/dev/sda"
+        device_name = root_device.rsplit("/", 1)[-1]
+        device = config.get("devices", {}).get(device_name) or {}
+        disk_id = device.get("disk")
+
+        if disk_id is None:
+            raise LinodeExceptionV4("Node root device is not backed by a disk")
+
+        disks = self.ex_list_disks(node)
+        for disk in disks:
+            if str(disk.id) == str(disk_id):
+                return disk
+
+        raise LinodeExceptionV4("Node root disk was not found")
+
     def ex_create_disk(
         self,
         size,
@@ -748,11 +785,10 @@ def create_image(
         name,
         description=None,
     ):
-        """Creates a private image from a LinodeDisk.
-         Images are limited to three per account.
+        """Creates a private image from a Node's primary disk.
 
-        :param node: LinodeDisk to create the image from (required)
-        :type node: :class:`LinodeDisk`
+        :param node: Node to create the image from (required)
+        :type node: :class:`Node`
 
         :keyword name: A name for the image.\
         Defaults to the name of the disk \
@@ -766,10 +802,10 @@ def create_image(
         :rtype: :class:`NodeImage`
         """
 
-        disk = node
-        if not isinstance(disk, LinodeDisk):
-            raise LinodeExceptionV4("Invalid disk instance")
+        if not isinstance(node, Node):
+            raise LinodeExceptionV4("Invalid node instance")
 
+        disk = self.ex_get_primary_disk(node)
         attr = {"disk_id": int(disk.id), "label": name, "description": description}
 
         response = self.connection.request(

libcloud/test/compute/fixtures/linode_v4/list_configs.json

@@ -0,0 +1,22 @@
+{
+    "data": [
+        {
+            "id": 123456,
+            "label": "My CentOS 7 Disk Profile",
+            "root_device": "/dev/sda",
+            "devices": {
+                "sda": {
+                    "disk": 23517413,
+                    "volume": null
+                },
+                "sdb": {
+                    "disk": 66517499,
+                    "volume": null
+                }
+            }
+        }
+    ],
+    "page": 1,
+    "pages": 1,
+    "results": 1
+}

libcloud/test/compute/test_linode_v4.py

@@ -412,16 +412,20 @@ def test_ex_get_volume(self):
 
     def test_create_image(self):
         node = Node("22344420", None, None, None, None, driver=self.driver)
-        disk = self.driver.ex_list_disks(node)[0]
-        image = self.driver.create_image(disk, name="Test", description="Test Image")
+        image = self.driver.create_image(node, name="Test", description="Test Image")
         self.assertIsInstance(image, NodeImage)
         self.assertEqual(image.name, "Test")
         self.assertEqual(image.extra["description"], "Test Image")
 
+    def test_ex_get_primary_disk(self):
+        node = Node("22344420", None, None, None, None, driver=self.driver)
+        disk = self.driver.ex_get_primary_disk(node)
+        self.assertIsInstance(disk, LinodeDisk)
+        self.assertEqual(disk.id, "23517413")
+
     def test_delete_image(self):
         node = Node("22344420", None, None, None, None, driver=self.driver)
-        disk = self.driver.ex_list_disks(node)[0]
-        image = self.driver.create_image(disk, name="Test", description="Test Image")
+        image = self.driver.create_image(node, name="Test", description="Test Image")
         result = self.driver.delete_image(image)
         self.assertTrue(result)
 
@@ -561,6 +565,10 @@ def _v4_linode_instances_22344420_disks(self, method, url, body, headers):
             body = self.fixtures.load("create_disk.json")
             return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _v4_linode_instances_22344420_configs(self, method, url, body, headers):
+        body = self.fixtures.load("list_configs.json")
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
     def _v4_linode_instances_22344420_disks_23517413(self, method, url, body, headers):
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])