Merge ~lloydwaltersj/maas:image-deployment-data into maas:master

[Jack Lloyd-Walters]

Add deployment information to boot resources

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1616/consoleText
COMMIT: 3a8d73cfb8628de67530edf6d73d3ebbb7c46bd8

review: Needs Fixing

[Jack Lloyd-Walters (lloydwaltersj)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1617/consoleText
COMMIT: dc80b0ccfc25d1c77d93d893f68f005e93321416

review: Needs Fixing

[Adam Collard (adam-collard)]

review: Needs Fixing

d5ce368... by Jack Lloyd-Walters on 2022-12-14

Replace with events

5896d87... by Jack Lloyd-Walters on 2022-12-14

formatting and linting

fc6df1e... by Jack Lloyd-Walters on 2022-12-14

add type hinting and linting

88e1b84... by Jack Lloyd-Walters on 2022-12-14

Fix tests raising errors

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1627/consoleText
COMMIT: fc6df1e7bd9324a979cf07cb944967e892e3cc45

review: Needs Fixing

bdef783... by Jack Lloyd-Walters on 2022-12-14

fix status change test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 88e1b84eb5da9cdadd27ea9ba2c2a020a43fbdf7

review: Approve

[Adam Collard (adam-collard)]

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: bdef783c5d5dd1ed96cc9ab234bb93ff5800b37a

review: Approve

6054bb3... by Jack Lloyd-Walters on 2022-12-14

remove layering violation

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 6054bb33c2141e121d0eb41a3691453f1641679d

review: Approve

600e0f7... by Jack Lloyd-Walters on 2022-12-16

remove unused column from database

4448eb7... by Jack Lloyd-Walters on 2022-12-16

fix restAPI issues

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1650/consoleText
COMMIT: 600e0f7bf05013340516e3766dbad939c806ae08

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4448eb7bb7ee9310c4eb4b280550f365436e7093

review: Approve

[Adam Collard (adam-collard)]

nit picks

review: Approve

f128bd4... by Jack Lloyd-Walters on 2023-01-04

respond to comments

29626a8... by Jack Lloyd-Walters on 2023-01-04

remove erroneous code

[MAAS Lander (maas-lander)]

UNIT TESTS
-b image-deployment-data lp:~lloydwaltersj/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 29626a824458f9ec2de1b6b2d1959cc5e5fc5c4c

review: Approve

diff --git a/src/maasserver/api/boot_resources.py b/src/maasserver/api/boot_resources.py
index 6100c89..770fdf1 100644
--- a/src/maasserver/api/boot_resources.py
+++ b/src/maasserver/api/boot_resources.py
@@ -108,6 +108,7 @@ def boot_resource_to_dict(resource, with_sets=False):
         "name": resource.name,
         "architecture": resource.architecture,
         "resource_uri": reverse("boot_resource_handler", args=[resource.id]),
+        "last_deployed": resource.get_last_deploy(),
     }
     dict_representation.update(resource.extra)
     if with_sets:
diff --git a/src/maasserver/api/tests/test_boot_resources.py b/src/maasserver/api/tests/test_boot_resources.py
index a8ac72c..a4e0dc5 100644
--- a/src/maasserver/api/tests/test_boot_resources.py
+++ b/src/maasserver/api/tests/test_boot_resources.py
@@ -101,6 +101,9 @@ class TestHelpers(APITestCase.ForUser):
             get_boot_resource_uri(resource),
             dict_representation["resource_uri"],
         )
+        self.assertEqual(
+            resource.get_last_deploy(), dict_representation["last_deployed"]
+        )
         self.assertFalse("sets" in dict_representation)
 
     def test_boot_resource_to_dict_with_sets(self):
diff --git a/src/maasserver/models/bootresource.py b/src/maasserver/models/bootresource.py
index 3ec9528..7fbb860 100644
--- a/src/maasserver/models/bootresource.py
+++ b/src/maasserver/models/bootresource.py
@@ -1,9 +1,9 @@
-# Copyright 2014-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2022 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Boot Resource."""
 
-
+from datetime import datetime
 from operator import attrgetter
 
 from django.core.exceptions import ValidationError
@@ -16,7 +16,6 @@ from django.db.models import (
     Prefetch,
     Sum,
 )
-from django.utils import timezone
 
 from maasserver.enum import (
     BOOT_RESOURCE_FILE_TYPE,
@@ -516,16 +515,6 @@ class BootResource(CleanSave, TimestampedModel):
         """Return rtype text as displayed to the user."""
         return BOOT_RESOURCE_TYPE_CHOICES_DICT[self.rtype]
 
-    @property
-    def last_deployed(self) -> timezone.datetime:
-        """Returns the most recent time of deplyment for an image."""
-        # Mock data: Generates a random time based on the hash of the
-        # resource name.
-        ms_py = 3153600000000
-        return timezone.datetime(2022, 6, 1) + timezone.timedelta(
-            microseconds=hash(self.name) % ms_py
-        )
-
     def clean(self):
         """Validate the model.
 
@@ -591,6 +580,23 @@ class BootResource(CleanSave, TimestampedModel):
                 return resource_set
         return None
 
+    def get_last_deploy(self) -> datetime:
+        from maasserver.models.event import Event
+        from provisioningserver.events import EVENT_TYPES
+
+        deploy_msg = f"deployed {self.name}/{self.architecture}"
+        try:
+            return (
+                Event.objects.filter(
+                    type__name=EVENT_TYPES.IMAGE_DEPLOYED,
+                    description=deploy_msg,
+                )
+                .latest("created")
+                .created
+            )
+        except Event.DoesNotExist:
+            pass
+
     def split_arch(self):
         return self.architecture.split("/")
 
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index e1c6923..e9766d6 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2021 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2022 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Node objects."""
@@ -1789,11 +1789,21 @@ class Node(CleanSave, TimestampedModel):
         self.update_status(NODE_STATUS.DEPLOYED)
         if self.enable_hw_sync:
             self.last_sync = datetime.now()
+        self.update_deployment_time()
         self.save()
 
         # Create a status message for DEPLOYED.
         Event.objects.create_node_event(self, EVENT_TYPES.DEPLOYED)
 
+    def update_deployment_time(self) -> None:
+        from maasserver.models.event import Event
+
+        Event.objects.create_node_event(
+            self,
+            EVENT_TYPES.IMAGE_DEPLOYED,
+            event_description=f"deployed {self.osystem}/{self.distro_series}/{self.architecture}",
+        )
+
     def ip_addresses(self, ifaces=None):
         """IP addresses allocated to this node.
 
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 3aba41b..4cf6669 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -4823,9 +4823,12 @@ class TestNode(MAASServerTestCase):
         self.disable_node_query()
         node = factory.make_Node(status=NODE_STATUS.DEPLOYING)
         node.end_deployment()
-        event = Event.objects.get(node=node)
+        events = Event.objects.filter(node=node)
         self.assertEqual(NODE_STATUS.DEPLOYED, reload_object(node).status)
-        self.assertEqual(event.type.name, EVENT_TYPES.DEPLOYED)
+        self.assertEqual(
+            {event.type.name for event in events},
+            {EVENT_TYPES.IMAGE_DEPLOYED, EVENT_TYPES.DEPLOYED},
+        )
 
     def test_end_deployment_sets_first_last_sync_value(self):
         self.disable_node_query()
diff --git a/src/maasserver/websockets/handlers/bootresource.py b/src/maasserver/websockets/handlers/bootresource.py
index 908af1e..fa4b17c 100644
--- a/src/maasserver/websockets/handlers/bootresource.py
+++ b/src/maasserver/websockets/handlers/bootresource.py
@@ -5,6 +5,8 @@
 
 
 from collections import defaultdict
+from datetime import datetime
+from typing import Optional
 
 from distro_info import UbuntuDistroInfo
 from django.core.exceptions import ValidationError
@@ -376,7 +378,9 @@ class BootResourceHandler(Handler):
                     count += 1
         return count
 
-    def pick_latest_datetime(self, time, other_time):
+    def pick_latest_datetime(
+        self, time: datetime, other_time: datetime
+    ) -> datetime:
         """Return the datetime that is the latest."""
         if time is None:
             return other_time
@@ -410,7 +414,9 @@ class BootResourceHandler(Handler):
                 return False
         return True
 
-    def get_last_update_for_resources(self, resources):
+    def get_last_update_for_resources(
+        self, resources: list[BootResource]
+    ) -> datetime:
         """Return the latest updated time for all resources."""
         last_update = None
         for resource in resources:
@@ -431,6 +437,19 @@ class BootResourceHandler(Handler):
             for resource in resources
         )
 
+    def get_last_deployed_for_resources(
+        self, resources: list[BootResource]
+    ) -> Optional[datetime]:
+        """Return the most recent deploy time for all resources."""
+        last_deployed = None
+        for resource in resources:
+            this_deploy = resource.get_last_deploy()
+            if this_deploy is not None:
+                last_deployed = self.pick_latest_datetime(
+                    last_deployed, this_deploy
+                )
+        return last_deployed
+
     def get_progress_for_resources(self, resources):
         """Return the overall progress for all resources."""
         size = 0
@@ -479,6 +498,7 @@ class BootResourceHandler(Handler):
         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)
+        last_deployed = self.get_last_deployed_for_resources(group)
 
         # Set the computed attributes on the first resource as that will
         # be the only one returned to the UI.
@@ -489,6 +509,7 @@ class BootResourceHandler(Handler):
         resource.size = human_readable_bytes(unique_size)
         resource.last_update = last_update
         resource.number_of_nodes = number_of_nodes
+        resource.last_deployed = last_deployed
         resource.complete = complete
         if not complete:
             if progress > 0:
@@ -599,7 +620,9 @@ class BootResourceHandler(Handler):
                 ),
                 "lastDeployed": resource.last_deployed.strftime(
                     "%a, %d %b. %Y %H:%M:%S"
-                ),
+                )
+                if resource.last_deployed
+                else None,
             }
             for resource in self.combine_resources(
                 BootResource.objects.filter(bootloader_type=None)
diff --git a/src/maasserver/websockets/handlers/tests/test_bootresource.py b/src/maasserver/websockets/handlers/tests/test_bootresource.py
index d1f401b..96c773f 100644
--- a/src/maasserver/websockets/handlers/tests/test_bootresource.py
+++ b/src/maasserver/websockets/handlers/tests/test_bootresource.py
@@ -364,6 +364,32 @@ class TestBootResourcePoll(MAASServerTestCase, PatchOSInfoMixin):
         resource = response["resources"][0]
         self.assertEqual(version, resource["title"])
 
+    def test_shows_last_deployment_time(self) -> None:
+        owner = factory.make_admin()
+        handler = BootResourceHandler(owner, {}, None)
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED
+        )
+        os_name, series = resource.name.split("/")
+        # The polled datetime only has granularity of order seconds
+        start_time = datetime.datetime.now().replace(microsecond=0)
+        node = factory.make_Node(
+            status=NODE_STATUS.DEPLOYED,
+            osystem=os_name,
+            distro_series=series,
+            architecture=resource.architecture,
+        )
+        node.end_deployment()
+        response = handler.poll({})
+        resource = response["resources"][0]
+        self.assertIn("lastDeployed", resource)
+        self.assertGreaterEqual(
+            datetime.datetime.strptime(
+                resource["lastDeployed"], "%a, %d %b. %Y %H:%M:%S"
+            ),
+            start_time,
+        )
+
     def test_shows_number_of_nodes_deployed_for_resource(self):
         owner = factory.make_admin()
         handler = BootResourceHandler(owner, {}, None)
diff --git a/src/provisioningserver/events.py b/src/provisioningserver/events.py
index 6d6cceb..bffd6ae 100644
--- a/src/provisioningserver/events.py
+++ b/src/provisioningserver/events.py
@@ -147,6 +147,7 @@ class EVENT_TYPES:
     READY = "READY"
     DEPLOYING = "DEPLOYING"
     DEPLOYED = "DEPLOYED"
+    IMAGE_DEPLOYED = "IMAGE_DEPLOYED"
     RELEASING = "RELEASING"
     RELEASED = "RELEASED"
     ENTERING_RESCUE_MODE = "ENTERING_RESCUE_MODE"
@@ -411,6 +412,9 @@ EVENT_DETAILS = {
     EVENT_TYPES.READY: EventDetail(description="Ready", level=INFO),
     EVENT_TYPES.DEPLOYING: EventDetail(description="Deploying", level=INFO),
     EVENT_TYPES.DEPLOYED: EventDetail(description="Deployed", level=INFO),
+    EVENT_TYPES.IMAGE_DEPLOYED: EventDetail(
+        description="Image Deployed", level=INFO
+    ),
     EVENT_TYPES.RELEASING: EventDetail(description="Releasing", level=INFO),
     EVENT_TYPES.RELEASED: EventDetail(description="Released", level=INFO),
     EVENT_TYPES.ENTERING_RESCUE_MODE: EventDetail(