Added new elements to delete event

README.md

@@ -92,7 +92,6 @@ _prometheus_multiproc_dir_ environment variable. This is done automatically.
 python run_gunicorn.py
 ```
 
-
 ## Configuration environment variables
 
 ```

api/host.py

@@ -283,29 +283,29 @@ def find_hosts_by_hostname_or_id(account_number, hostname):
 def delete_by_id(host_id_list):
     query = _get_host_list_by_id_list(current_identity.account_number, host_id_list)
 
-    host_ids_to_delete = []
+    hosts_to_delete = []
     for host in query.all():
-        try:
-            host_ids_to_delete.append(host.id)
-        except sqlalchemy.orm.exc.ObjectDeletedError:
-            logger.exception(
-                "Encountered sqlalchemy.orm.exc.ObjectDeletedError exception during delete_by_id operation.  Host was "
-                "already deleted."
-            )
+        hosts_to_delete.append(host)
 
-    if not host_ids_to_delete:
+    if not hosts_to_delete:
         return flask.abort(status.HTTP_404_NOT_FOUND)
 
     with metrics.delete_host_processing_time.time():
         query.delete(synchronize_session="fetch")
     db.session.commit()
 
-    metrics.delete_host_count.inc(len(host_ids_to_delete))
+    metrics.delete_host_count.inc(len(hosts_to_delete))
 
-    logger.debug("Deleted hosts: %s", host_ids_to_delete)
+    logger.debug("Deleted hosts: %s", hosts_to_delete)
 
-    for deleted_host_id in host_ids_to_delete:
-        emit_event(events.delete(deleted_host_id))
+    for deleted_host in hosts_to_delete:
+        try:
+            emit_event(events.delete(deleted_host))
+        except sqlalchemy.orm.exc.ObjectDeletedError:
+            logger.exception(
+                "Encountered sqlalchemy.orm.exc.ObjectDeletedError exception during delete_by_id operation.  Host was "
+                "already deleted."
+            )
 
 
 @api_operation

app/events.py

@@ -4,14 +4,34 @@
 from marshmallow import fields
 from marshmallow import Schema
 
+from app.logging import threadctx
+from app.models import CanonicalFacts
+from app.validators import verify_uuid_format
+
 logger = logging.getLogger(__name__)
 
 
 class HostEvent(Schema):
     id = fields.UUID()
     timestamp = fields.DateTime(format="iso8601")
     type = fields.Str()
+    account = fields.Str(required=True)
+    insights_id = fields.Str(validate=verify_uuid_format)
+    request_id = fields.Str()
 
 
-def delete(id):
-    return HostEvent(strict=True).dumps({"id": id, "timestamp": datetime.utcnow(), "type": "delete"}).data
+def delete(host):
+    return (
+        HostEvent()
+        .dumps(
+            {
+                "timestamp": datetime.utcnow(),
+                "id": host.id,
+                **CanonicalFacts.to_json(host.canonical_facts),
+                "account": host.account,
+                "request_id": threadctx.request_id,
+                "type": "delete",
+            }
+        )
+        .data
+    )

test_api.py

@@ -1107,10 +1107,18 @@ def create_hosts(self):
 
         for host in hosts_to_create:
             host_wrapper = HostWrapper()
+            host_wrapper.id = generate_uuid()
             host_wrapper.account = ACCOUNT
             host_wrapper.display_name = host[0]
-            host_wrapper.insights_id = host[1]
+            host_wrapper.insights_id = generate_uuid()
+            host_wrapper.rhel_machine_id = generate_uuid()
+            host_wrapper.subscription_manager_id = generate_uuid()
+            host_wrapper.satellite_id = generate_uuid()
+            host_wrapper.bios_uuid = generate_uuid()
+            host_wrapper.ip_addresses = ["10.0.0.2"]
             host_wrapper.fqdn = host[2]
+            host_wrapper.mac_addresses = ["aa:bb:cc:dd:ee:ff"]
+            host_wrapper.external_id = generate_uuid()
             host_wrapper.facts = [{"namespace": "ns1", "facts": {"key1": "value1"}}]
 
             response_data = self.post(HOST_URL, [host_wrapper.data()], 207)
@@ -1208,10 +1216,10 @@ def test_invalid_host_id(self):
 
 
 class DeleteHostsTestCase(PreCreatedHostsBaseTestCase):
-    def test_create_then_delete(self):
-        original_id = self.added_hosts[0].id
+    @unittest.mock.patch("app.events.datetime", **{"utcnow.return_value": datetime.utcnow()})
+    def test_create_then_delete(self, datetime_mock):
 
-        url = HOST_URL + "/" + original_id
+        url = HOST_URL + "/" + self.added_hosts[0].id
 
         # Get the host
         self.get(url, 200)
@@ -1226,7 +1234,18 @@ def __call__(self, e):
         # Delete the host
         with unittest.mock.patch("api.host.emit_event", new=MockEmitEvent()) as m:
             self.delete(url, 200, return_response_as_json=False)
-            assert original_id in m.events[0]
+            event = json.loads(m.events[0])
+            timestamp_iso = datetime_mock.utcnow.return_value.isoformat()
+
+            self.assertIsInstance(event, dict)
+            expected_keys = {"timestamp", "type", "id", "account", "insights_id", "request_id"}
+            self.assertEqual(set(event.keys()), expected_keys)
+
+            self.assertEqual(f"{timestamp_iso}+00:00", event["timestamp"])
+            self.assertEqual("delete", event["type"])
+            self.assertEqual(self.added_hosts[0].id, event["id"])
+            self.assertEqual(self.added_hosts[0].insights_id, event["insights_id"])
+            self.assertEqual("-1", event["request_id"])
 
         # Try to get the host again
         response = self.get(url, 200)