From e2dd85c8d77d14b37e285f6b637793c83b81f73e Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Fri, 1 Apr 2022 10:04:25 +0100
Subject: [PATCH] Update lds tag script

---
 do_lds_azs.sh | 52 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/do_lds_azs.sh b/do_lds_azs.sh
index 8096759..e17db22 100755
--- a/do_lds_azs.sh
+++ b/do_lds_azs.sh
@@ -1,30 +1,46 @@
 #!/bin/bash
 
 juju_status=$(mktemp)
+juju_models=$(mktemp)
 
-juju status --format json > "${juju_status}"
+juju models --format json > "${juju_models}"
 
-for phys_mach in $(jq -rc  ".machines | keys[]" "${juju_status}")
-do
+models=$(jq -r .models[].\"short-name\" "${juju_models}")
 
-    az=$(jq -rc ".machines.\"${phys_mach}\".hardware" "${juju_status}" | sed 's/.*availability-zone=//g')
-    hostname=$(jq -r ".machines.\"${phys_mach}\".hostname" "${juju_status}")
+for model in ${models} ; do
 
-    landscape-api add-tags-to-computers title:"${hostname}" "${az}"
+    juju status -m "${model}" --format json > "${juju_status}"
 
-    containers=$(jq -rc ".machines.\"${phys_mach}\" | (select(.containers != null ) | .containers | to_entries[] | .value.hostname)" "${juju_status}")
+    for phys_mach in $(jq -rc  ".machines | keys[]" "${juju_status}") ; do
 
-    for container in ${containers}
-    do
+        az=$(jq -rc ".machines.\"${phys_mach}\".hardware" "${juju_status}" | sed 's/.*availability-zone=//g')
+        hostname=$(jq -r ".machines.\"${phys_mach}\".hostname" "${juju_status}")
 
-        landscape-api add-tags-to-computers title:"${container}" "${az}"
-        if [[ "${container}" == *"lxd"* ]] ; then
-            landscape-api add-tags-to-computers title:"${container}" lxd
-        fi
-        if [[ "${container}" == *"kvm"* ]] ; then
-            landscape-api add-tags-to-computers title:"${container}" kvm
-        fi
+        landscape-api add-tags-to-computers title:"${hostname}" "${az}"
+        landscape-api add-tags-to-computers title:"${hostname}" "${model}-model"
+
+        containers=$(jq -rc ".machines.\"${phys_mach}\" | (select(.containers != null ) | .containers | to_entries[] | .value.hostname)" "${juju_status}")
+
+        for container in ${containers}
+        do
+
+            landscape-api add-tags-to-computers title:"${container}" "${az}"
+            landscape-api add-tags-to-computers title:"${container}" "${model}-model"
+            if [[ "${container}" == *"lxd"* ]] ; then
+                landscape-api add-tags-to-computers title:"${container}" lxd
+            fi
+            if [[ "${container}" == *"kvm"* ]] ; then
+                landscape-api add-tags-to-computers title:"${container}" kvm
+            fi
+
+        done
+
+        # Tags that have been grabbed from MAAS
+        tags=$(jq .machines.\""${phys_mach}"\".hardware "${juju_status}" | sed 's/.*tags=\(.*\)\ .*/\1/g' | tr "," " ")
+
+        for tag in ${tags} ; do
+            landscape-api add-tags-to-computers title:"${hostname}" "${tag}"
+        done
 
     done
-    
-done 
+done