Merge ~mpontillo/maas:subnet-details-show-containers--bug-1761269 into maas:master

[Mike Pontillo]

LP: #1761269 - Show containers as containers (instead of as devices) on subnet details page

[MAAS Lander (maas-lander)]

UNIT TESTS
-b subnet-details-show-containers--bug-1761269 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ca0beb2121af373a2b4089971940b6a2cd586141

review: Approve

[Newell Jensen (newell-jensen)]

LGTM

review: Approve

[Andres Rodriguez (andreserl)]

review: Approve

diff --git a/src/maasserver/models/staticipaddress.py b/src/maasserver/models/staticipaddress.py
index 2da4093..837045d 100644
--- a/src/maasserver/models/staticipaddress.py
+++ b/src/maasserver/models/staticipaddress.py
@@ -938,6 +938,7 @@ class StaticIPAddress(CleanSave, TimestampedModel):
                     "node_type": node.node_type,
                     "fqdn": node.fqdn,
                     "hostname": node.hostname,
+                    "is_container": node.parent_id is not None,
                 }
                 if iface is not None:
                     data["node_summary"]["via"] = iface.get_name()
diff --git a/src/maasserver/static/js/angular/controllers/subnet_details.js b/src/maasserver/static/js/angular/controllers/subnet_details.js
index c9c4ed8..67fb620 100644
--- a/src/maasserver/static/js/angular/controllers/subnet_details.js
+++ b/src/maasserver/static/js/angular/controllers/subnet_details.js
@@ -141,7 +141,11 @@ angular.module('MAAS').controller('SubnetDetailsController', [
         // Return the name of the node type for the given IP.
         $scope.getUsageForIP = function(ip) {
             if(angular.isObject(ip.node_summary)) {
+                var isContainer = ip.node_summary.is_container;
                 var nodeType = ip.node_summary.node_type;
+                if(nodeType === 1 && isContainer === true) {
+                    return "Container";
+                }
                 var str = NODE_TYPES[nodeType];
                 if(angular.isString(str)) {
                     return str;
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js b/src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js
index 174d07b..9b3a838 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js
@@ -325,6 +325,15 @@ describe("SubnetDetailsController", function() {
             expect($scope.getUsageForIP(ipAddress)).toBe('BMC');
         });
 
+        it("handles containers", function() {
+            makeControllerResolveSetActiveItem();
+            var ip = {};
+            ip.node_summary = {};
+            ip.node_summary.node_type = 1;
+            ip.node_summary.is_container = true;
+            expect($scope.getUsageForIP(ip)).toBe('Container');
+        });
+
         it("handles DNS records", function() {
             makeControllerResolveSetActiveItem();
             var ipAddress = {