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

[Blake Rouse]

Combine all subarchitectures or boot resources, so only one line is show in the UI per release/architecture.

[Julian Edwards (julian-edwards)]

The code change looks fine, approving on that basis.

However, I think we need to see which HWE images were imported as it gives a clue to the admin which hardware he's able to use with the current imported set. In particular, I think there needs to be a stronger indication that what HWE images you have here directly affects the architecture drop-downs on the node edit page.

review: Approve

[Christian Reis (kiko)]

Yes, Blake and I discussed whether it was more sensible to just show the subarchitecture here. We figured that the cleaner interface was better but it would be nice to have a way to unfold and see that detail (which should be done in a separate bug if agreed).

=== modified file 'src/maasserver/views/images.py'
--- src/maasserver/views/images.py	2014-10-17 00:25:31 +0000
+++ src/maasserver/views/images.py	2014-11-04 17:44:28 +0000
@@ -461,15 +461,6 @@
             self.add_resource_template_attributes(resource)
         return resources
 
-    def is_hwe_resource(self, resource):
-        """Return True if the resource is an Ubuntu HWE resource."""
-        if resource.rtype != BOOT_RESOURCE_TYPE.SYNCED:
-            return False
-        if not resource.name.startswith('ubuntu/'):
-            return False
-        arch, subarch = resource.split_arch()
-        return subarch.startswith('hwe-')
-
     def pick_latest_datetime(self, time, other_time):
         """Return the datetime that is the latest."""
         if time is None:
@@ -536,19 +527,20 @@
             return 0
         return 100.0 * (size / float(total_size))
 
-    def hwes_to_resource(self, hwes):
-        """Convert the list of hwes into one resource to be used in the UI."""
-        # Calculate all of the values using all of the hwe resources for
-        # this combination of resources.
-        last_update = self.get_last_update_for_resources(hwes)
-        unique_size = self.calculate_unique_size_for_resources(hwes)
-        number_of_nodes = self.get_number_of_nodes_for_resources(hwes)
-        complete = self.are_all_resources_complete(hwes)
-        progress = self.get_progress_for_resources(hwes)
+    def resource_group_to_resource(self, group):
+        """Convert the list of resources into one resource to be used in
+        the UI."""
+        # Calculate all of the values using all of the resources for
+        # this combination.
+        last_update = self.get_last_update_for_resources(group)
+        unique_size = self.calculate_unique_size_for_resources(group)
+        number_of_nodes = self.get_number_of_nodes_for_resources(group)
+        complete = self.are_all_resources_complete(group)
+        progress = self.get_progress_for_resources(group)
 
         # Set the computed attributes on the first resource as that will
         # be the only one returned to the UI.
-        resource = hwes[0]
+        resource = group[0]
         resource.arch, resource.subarch = resource.split_arch()
         resource.title = self.get_resource_title(resource)
         resource.complete = complete
@@ -564,10 +556,10 @@
                 resource.status = "Queued for download"
                 resource.downloading = False
         else:
-            # See if all the hwe resources exist on all the clusters.
-            cluster_has_hwes = any(
-                hwe in hwes for hwe in self.cluster_resources)
-            if cluster_has_hwes:
+            # See if all the resources exist on all the clusters.
+            cluster_has_resources = any(
+                res in group for res in self.cluster_resources)
+            if cluster_has_resources:
                 resource.status = "Complete"
                 resource.downloading = False
             else:
@@ -580,30 +572,25 @@
                     resource.downloading = False
         return resource
 
-    def combine_hwe_resources(self, resources):
-        """Return a list of resources removing the duplicate hwe resources."""
-        none_hwe_resources = []
-        hwe_resources = defaultdict(list)
+    def combine_resources(self, resources):
+        """Return a list of resources combining all of subarchitecture
+        resources into one resource."""
+        resource_group = defaultdict(list)
         for resource in resources:
-            if not self.is_hwe_resource(resource):
-                self.add_resource_template_attributes(resource)
-                none_hwe_resources.append(resource)
-            else:
-                arch = resource.split_arch()[0]
-                key = '%s/%s' % (resource.name, arch)
-                hwe_resources[key].append(resource)
-        combined_hwes = [
-            self.hwes_to_resource(hwes)
-            for _, hwes in hwe_resources.items()
+            arch = resource.split_arch()[0]
+            key = '%s/%s' % (resource.name, arch)
+            resource_group[key].append(resource)
+        return [
+            self.resource_group_to_resource(group)
+            for _, group in resource_group.items()
             ]
-        return none_hwe_resources + combined_hwes
 
     def ajax(self, request, *args, **kwargs):
         """Return all resources in a json object.
 
         This is used by the image model list on the client side to update
         the status of images."""
-        resources = self.combine_hwe_resources(BootResource.objects.all())
+        resources = self.combine_resources(BootResource.objects.all())
         json_resources = [
             dict(
                 id=resource.id,

=== modified file 'src/maasserver/views/tests/test_images.py'
--- src/maasserver/views/tests/test_images.py	2014-10-16 20:41:45 +0000
+++ src/maasserver/views/tests/test_images.py	2014-11-04 17:44:28 +0000
@@ -690,11 +690,11 @@
         json_resource = json_obj['resources'][0]
         self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
 
-    def test_combines_hwe_resources_into_one_resource(self):
+    def test_combines_subarch_resources_into_one_resource(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         for subarch in subarches:
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -705,11 +705,11 @@
             1, len(json_obj['resources']),
             'More than one resource was returned.')
 
-    def test_combined_hwe_resource_calculates_unique_size(self):
+    def test_combined_subarch_resource_calculates_unique_size(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         largefile = factory.make_LargeFile()
         for subarch in subarches:
             resource = factory.make_BootResource(
@@ -723,13 +723,13 @@
         self.assertEqual(
             format_size(largefile.total_size), json_resource['size'])
 
-    def test_combined_hwe_resource_calculates_number_of_nodes_deployed(self):
+    def test_combined_subarch_resource_calculates_num_of_nodes_deployed(self):
         self.client_log_in()
         osystem = 'ubuntu'
         series = factory.make_name('series')
         name = '%s/%s' % (osystem, series)
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         for subarch in subarches:
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -749,11 +749,11 @@
         json_resource = json_obj['resources'][0]
         self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
 
-    def test_combined_hwe_resource_calculates_complete_True(self):
+    def test_combined_subarch_resource_calculates_complete_True(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         resources = [
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -768,11 +768,11 @@
         json_resource = json_obj['resources'][0]
         self.assertTrue(json_resource['complete'])
 
-    def test_combined_hwe_resource_calculates_complete_False(self):
+    def test_combined_subarch_resource_calculates_complete_False(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         incomplete_subarch = subarches.pop()
         factory.make_BootResource(
             rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -786,11 +786,11 @@
         json_resource = json_obj['resources'][0]
         self.assertFalse(json_resource['complete'])
 
-    def test_combined_hwe_resource_calculates_progress(self):
+    def test_combined_subarch_resource_calculates_progress(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         largefile = factory.make_LargeFile()
         largefile.total_size = largefile.total_size * 2
         largefile.save()
@@ -805,11 +805,11 @@
         json_resource = json_obj['resources'][0]
         self.assertEqual("Downloading  50%", json_resource['status'])
 
-    def test_combined_hwe_resource_shows_queued_if_no_progress(self):
+    def test_combined_subarch_resource_shows_queued_if_no_progress(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         largefile = factory.make_LargeFile(content="")
         for subarch in subarches:
             resource = factory.make_BootResource(
@@ -822,11 +822,11 @@
         json_resource = json_obj['resources'][0]
         self.assertEqual("Queued for download", json_resource['status'])
 
-    def test_combined_hwe_resource_shows_complete_status(self):
+    def test_combined_subarch_resource_shows_complete_status(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         resources = [
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -841,11 +841,11 @@
         json_resource = json_obj['resources'][0]
         self.assertEqual("Complete", json_resource['status'])
 
-    def test_combined_hwe_resource_shows_waiting_for_cluster_to_sync(self):
+    def test_combined_subarch_resource_shows_waiting_for_cluster_to_sync(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         for subarch in subarches:
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,
@@ -859,11 +859,11 @@
         self.assertEqual(
             "Waiting for clusters to sync", json_resource['status'])
 
-    def test_combined_hwe_resource_shows_clusters_syncing(self):
+    def test_combined_subarch_resource_shows_clusters_syncing(self):
         self.client_log_in()
         name = 'ubuntu/%s' % factory.make_name('series')
         arch = factory.make_name('arch')
-        subarches = [factory.make_name('hwe') for _ in range(3)]
+        subarches = [factory.make_name('subarch') for _ in range(3)]
         for subarch in subarches:
             factory.make_usable_boot_resource(
                 rtype=BOOT_RESOURCE_TYPE.SYNCED,