Merge ~ack/maas:default-pool-highlight into maas:master

[Alberto Donato]

LP: #1774023 - Report the default pool as such in the pool listing

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index 6eb9e63..d6ac125 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -994,7 +994,9 @@ sudo maas-rack register --url {$ tabs.controllers.registerUrl $} --secret {$ tab
                         data-ng-repeat="pool in tabs.pools.filtered_items = (pools | orderBy:tabs.pools.predicate:tabs.pools.reverse) track by pool.name"
                         data-ng-class="{'is-active': tabs.pools.isPoolAction(pool)}">
                         <td class="p-table__cell col-3" aria-label="Name">
-                          <span ng-if="!tabs.pools.isPoolAction(pool, 'edit')">{$ pool.name $}</span>
+                          <span ng-if="!tabs.pools.isPoolAction(pool, 'edit')">
+                            {$ pool.name $} <span ng-if="pool.is_default">(default)</span>
+                          </span>
                           <maas-obj-field
                             ng-if="tabs.pools.isPoolAction(pool, 'edit')"
                             type="text" key="name" disable-label="true" subtle="false"
diff --git a/src/maasserver/websockets/handlers/resourcepool.py b/src/maasserver/websockets/handlers/resourcepool.py
index aba12bd..46b1c23 100644
--- a/src/maasserver/websockets/handlers/resourcepool.py
+++ b/src/maasserver/websockets/handlers/resourcepool.py
@@ -64,4 +64,5 @@ class ResourcePoolHandler(TimestampedModelHandler):
         """
         for attr in ['machine_total_count', 'machine_ready_count']:
             data[attr] = getattr(obj, attr)
+        data['is_default'] = obj.is_default()
         return data
diff --git a/src/maasserver/websockets/handlers/tests/test_resourcepool.py b/src/maasserver/websockets/handlers/tests/test_resourcepool.py
index 3de83c6..cc6df3a 100644
--- a/src/maasserver/websockets/handlers/tests/test_resourcepool.py
+++ b/src/maasserver/websockets/handlers/tests/test_resourcepool.py
@@ -25,6 +25,7 @@ class TestResourcePoolHandler(MAASServerTestCase):
             {'id': pool.id,
              'name': pool.name,
              'description': pool.description,
+             'is_default': False,
              'created': dehydrate_datetime(pool.created),
              'updated': dehydrate_datetime(pool.updated),
              'machine_total_count': 0,
@@ -49,6 +50,12 @@ class TestResourcePoolHandler(MAASServerTestCase):
         self.assertEqual(2, result['machine_total_count'])
         self.assertEqual(1, result['machine_ready_count'])
 
+    def test_get_is_default(self):
+        pool = ResourcePool.objects.get_default_resource_pool()
+        handler = ResourcePoolHandler(factory.make_User(), {})
+        result = handler.get({"id": pool.id})
+        self.assertTrue(result['is_default'])
+
     def test_list(self):
         user = factory.make_User()
         handler = ResourcePoolHandler(user, {})