Merge ~newell-jensen/maas:lp1721113 into maas:master

[Newell Jensen]

LP: #1721113 -- Group physical block devices in the storage card off of their size and type.

[Andres Rodriguez (andreserl)]

overall looks good to me. I'm not going to block you on it, but you need to add at least one more test before landing, see below!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1721113 lp:~newell-jensen/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/451/consoleText

diff --git a/src/maasserver/static/partials/cards/storage.html b/src/maasserver/static/partials/cards/storage.html
index 8058eab..2085216 100644
--- a/src/maasserver/static/partials/cards/storage.html
+++ b/src/maasserver/static/partials/cards/storage.html
@@ -4,8 +4,9 @@
   <h2 class="u-border--bottom u-border--solid u-padding--bottom u-margin--bottom" data-ng-if="node.storage == 0"><strong>Unknown</strong></h2>
 </header>
 <div class="u-padding--bottom">
-  <div data-ng-repeat="disk in node.disks">
-  <p>Disk {$ $index+1 $}: {$ (disk.size / 1000 / 1000 / 1000).toFixed(1) $} GB</p>
+  <div data-ng-repeat="gs in node.grouped_storages">
+    <p data-ng-if="gs.count === 1">{$ gs.count $}x{$ (gs.size / 1000 / 1000 / 1000).toFixed(0) $}GB ({$ gs.disk_type $}) disk</p>
+    <p data-ng-if="gs.count > 1">{$ gs.count $}x{$ (gs.size / 1000 / 1000 / 1000).toFixed(0) $}GB ({$ gs.disk_type $}) disks</p>
   </div>
 </div>
 <div class="action-card__position-bottom">
diff --git a/src/maasserver/websockets/handlers/node.py b/src/maasserver/websockets/handlers/node.py
index 961bcc6..30a6e21 100644
--- a/src/maasserver/websockets/handlers/node.py
+++ b/src/maasserver/websockets/handlers/node.py
@@ -7,6 +7,7 @@ __all__ = [
     "NodeHandler",
 ]
 
+from collections import Counter
 from itertools import chain
 import logging
 from operator import itemgetter
@@ -162,6 +163,8 @@ class NodeHandler(TimestampedModelHandler):
                     for blockdevice in physical_blockdevices
                     ) / (1000 ** 3))
             data["storage_tags"] = self.get_all_storage_tags(blockdevices)
+            data["grouped_storages"] = self.get_grouped_storages(
+                physical_blockdevices)
 
             data["osystem"] = obj.get_osystem(
                 default=self.default_osystem)
@@ -666,3 +669,25 @@ class NodeHandler(TimestampedModelHandler):
                     "definition." % tag_name)
             tag_obj.node_set.add(node_obj)
             tag_obj.save()
+
+    def get_grouped_storages(self, blockdevices):
+        """Group storage based off of the size and type.
+
+        This is used by the storage card when displaying the grouped disks.
+        """
+        disk_data = [
+            (blockdevice.size, 'hdd' if disk_type == 'rotary' else disk_type)
+            for blockdevice in blockdevices
+            for disk_type in ('ssd', 'hdd', 'rotary', 'iscsi')
+            if disk_type in blockdevice.tags
+        ]
+        grouped_storages = []
+        for disk_type in ('ssd', 'hdd', 'rotary', 'iscsi'):
+            c = Counter(elem[0] for elem in disk_data if elem[1] == disk_type)
+            for size, count in c.items():
+                grouped_storages.append({
+                    "size": size,
+                    "count": count,
+                    "disk_type": disk_type
+                })
+        return grouped_storages
diff --git a/src/maasserver/websockets/handlers/tests/test_machine.py b/src/maasserver/websockets/handlers/tests/test_machine.py
index 1b26af5..050472e 100644
--- a/src/maasserver/websockets/handlers/tests/test_machine.py
+++ b/src/maasserver/websockets/handlers/tests/test_machine.py
@@ -349,6 +349,8 @@ class TestMachineHandler(MAASServerTestCase):
         else:
             data["status_tooltip"] = ""
 
+        data["grouped_storages"] = handler.get_grouped_storages(blockdevices)
+
         if include_summary:
             data = handler.dehydrate_summary_output(node, data)
         return data
@@ -2759,6 +2761,35 @@ class TestMachineHandler(MAASServerTestCase):
             })
         self.assertIsNone(reload_object(link_ip))
 
+    def test_get_grouped_storages_parses_blockdevices(self):
+        user = factory.make_User()
+        node = factory.make_Node(owner=user)
+        size = random.randint(1000, 1000 ** 3)
+        ssd = factory.make_PhysicalBlockDevice(node, tags=['ssd'])
+        hdd = factory.make_PhysicalBlockDevice(node, tags=['hdd'], size=size)
+        rotary = factory.make_PhysicalBlockDevice(
+            node, tags=['rotary'], size=size)
+        iscsi = factory.make_PhysicalBlockDevice(node, tags=['iscsi'])
+        handler = MachineHandler(user, {})
+        self.assertThat(
+            handler.get_grouped_storages([ssd, hdd, rotary, iscsi]),
+            MatchesListwise([
+                MatchesDict({
+                    "count": Equals(1),
+                    "size": Equals(ssd.size),
+                    "disk_type": Equals('ssd')
+                    }),
+                MatchesDict({
+                    "count": Equals(2),
+                    "size": Equals(hdd.size),
+                    "disk_type": Equals('hdd')
+                    }),
+                MatchesDict({
+                    "count": Equals(1),
+                    "size": Equals(iscsi.size),
+                    "disk_type": Equals('iscsi')
+                    })]))
+
 
 class TestMachineHandlerCheckPower(MAASTransactionServerTestCase):