Merge lp:~blake-rouse/maas/fix-1393953 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Return the correct filename and type for custom image that was imported on the cluster.

[Gavin Panella (allenap)]

Looks good. One question.

review: Approve

=== modified file 'src/provisioningserver/drivers/osystem/custom.py'
--- src/provisioningserver/drivers/osystem/custom.py	2014-09-24 18:47:58 +0000
+++ src/provisioningserver/drivers/osystem/custom.py	2014-12-08 22:51:52 +0000
@@ -16,6 +16,9 @@
     "CustomOS",
     ]
 
+import os
+
+from provisioningserver.config import BOOT_RESOURCES_STORAGE
 from provisioningserver.drivers.osystem import (
     BOOT_IMAGE_PURPOSE,
     OperatingSystem,
@@ -49,3 +52,12 @@
         # Return the same name, since the cluster does not know about the
         # title of the image. The region will fix the title for the UI.
         return release
+
+    def get_xinstall_parameters(self, arch, subarch, release, label):
+        """Returns the xinstall image name and type for given image."""
+        path = os.path.join(
+            BOOT_RESOURCES_STORAGE, 'custom', arch, subarch, release, label)
+        if os.path.exists(os.path.join(path, 'root-dd')):
+            return "root-dd", "dd-tgz"
+        else:
+            return "root-tgz", "tgz"

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_custom.py'
--- src/provisioningserver/drivers/osystem/tests/test_custom.py	2014-09-23 20:44:48 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_custom.py	2014-12-08 22:51:52 +0000
@@ -15,9 +15,11 @@
 __all__ = []
 
 from itertools import product
+import os
 
 from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase
+from provisioningserver.drivers.osystem import custom
 from provisioningserver.drivers.osystem.custom import (
     BOOT_IMAGE_PURPOSE,
     CustomOS,
@@ -26,6 +28,19 @@
 
 class TestCustomOS(MAASTestCase):
 
+    def make_resource_path(self, filename):
+        tmpdir = self.make_dir()
+        arch = factory.make_name('arch')
+        subarch = factory.make_name('subarch')
+        release = factory.make_name('release')
+        label = factory.make_name('label')
+        dirpath = os.path.join(
+            tmpdir, 'custom', arch, subarch, release, label)
+        os.makedirs(dirpath)
+        factory.make_file(dirpath, filename)
+        self.patch(custom, 'BOOT_RESOURCES_STORAGE', tmpdir)
+        return arch, subarch, release, label
+
     def test_get_boot_image_purposes(self):
         osystem = CustomOS()
         archs = [factory.make_name('arch') for _ in range(2)]
@@ -58,3 +73,17 @@
         osystem = CustomOS()
         release = factory.make_name('release')
         self.assertEqual(release, osystem.get_release_title(release))
+
+    def test_get_xinstall_parameters_returns_root_tgz_tgz(self):
+        osystem = CustomOS()
+        arch, subarch, release, label = self.make_resource_path('root-tgz')
+        self.assertItemsEqual(
+            ('root-tgz', 'tgz'),
+            osystem.get_xinstall_parameters(arch, subarch, release, label))
+
+    def test_get_xinstall_parameters_returns_root_dd_dd_tgz(self):
+        osystem = CustomOS()
+        arch, subarch, release, label = self.make_resource_path('root-dd')
+        self.assertItemsEqual(
+            ('root-dd', 'dd-tgz'),
+            osystem.get_xinstall_parameters(arch, subarch, release, label))