tests: Update devlxd request source identification

Signed-off-by: hamistao <[email protected]>
canonical · Sep 13, 2024 · 9e187da · 9e187da
1 parent 09d91a0
commit 9e187da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/devlxd-container b/tests/devlxd-container
@@ -114,7 +114,9 @@ kill -9 "${monitorPID}"
 
 # If the guest retrieved the image from the host, the host should emit an "image-retrieved" lifecycle event. The
 # requestor address tells us that this was definitely the guest.
-[ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.address')" = "@devlxd" ]
+# Newer LXD versions use the protocol instead of the requestor address to distinguish devlxd requests
+[ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.address')" = "@devlxd" ] || \
+  [ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.protocol')" = "devlxd" ]
 rm monitor.json
 
 echo "==> Deleting container"

diff --git a/tests/devlxd-vm b/tests/devlxd-vm
@@ -124,7 +124,8 @@ if hasNeededAPIExtension devlxd_images_vm; then
 
   # If the guest retrieved the image from the host, the host should emit an "image-retrieved" lifecycle event. The
   # requestor address tells us that this was definitely the guest.
-  [ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.address')" = "@devlxd" ]
+  [ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.address')" = "@devlxd" ] || \
+    [ "$(grep -wF 'image-retrieved' monitor.json | jq -r '.metadata.requestor.protocol')" = "devlxd" ]
   rm monitor.json
 fi