From 223e685cf5d2244d8c8f40b0a89e0a349d59c636 Mon Sep 17 00:00:00 2001
From: Alan Hanson <alan@oxide.computer>
Date: Sun, 26 Jun 2022 05:40:47 +0000
Subject: [PATCH 1/2] Script to populate a lab host with images

---
 tools/populate/populate-images.sh | 100 ++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100755 tools/populate/populate-images.sh

diff --git a/tools/populate/populate-images.sh b/tools/populate/populate-images.sh
new file mode 100755
index 00000000000..df073eed2a1
--- /dev/null
+++ b/tools/populate/populate-images.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Populate an Oxide lab host running Omicron with images from server catacomb.
+
+res=0
+echo "Populating debian"
+oxide api /images --method POST --input - <<EOF
+{
+  "name": "debian",
+  "description": "debian",
+  "block_size": 512,
+  "distribution": {
+    "name": "debian",
+    "version": "11"
+  },
+  "source": {
+      "type": "url",
+      "url": "http://[fd00:1122:3344:101::1]:8080/media/debian/debian-11-nocloud-amd64-20220503-998.raw"
+  }
+}
+EOF
+if [[ $? -ne 0 ]]; then
+    echo "Making image debian failed"
+    res=1
+else
+    echo "debian image created"
+fi
+
+
+echo "Populating focal"
+oxide api /images --method POST --input - <<EOF
+{
+  "name": "focal",
+  "description": "focal",
+  "block_size": 512,
+  "distribution": {
+    "name": "focal",
+    "version": "1"
+  },
+  "source": {
+      "type": "url",
+      "url": "http://[fd00:1122:3344:101::1]:8080/media/cloud/focal-server-cloudimg-amd64.raw"
+  }
+}
+EOF
+if [[ $? -ne 0 ]]; then
+    echo "Making image debian failed"
+    res=1
+else
+    echo "debian image created"
+fi
+
+echo "Populating ubuntu"
+oxide api /images --method POST --input - <<EOF
+{
+  "name": "ubuntu",
+  "description": "ubuntu",
+  "block_size": 512,
+  "distribution": {
+    "name": "ubuntu",
+    "version": "22.04"
+  },
+  "source": {
+      "type": "url",
+      "url": "http://[fd00:1122:3344:101::1]:8080/media/ubuntu/ubuntu-22.04-live-server-amd64.iso"
+  }
+}
+EOF
+if [[ $? -ne 0 ]]; then
+    echo "Making image debian failed"
+    res=1
+else
+    echo "debian image created"
+fi
+
+if [[ $res -ne 0 ]]; then
+    echo ""
+    echo "Failed creating some images"
+    echo ""
+else
+    echo "✔ All images populated"
+fi
+
+# A sanity check to see if access is working to catacomb
+curl_test=$(curl -w '%{http_code}\n' -s -o /dev/null http://[fd00:1122:3344:101::1]:8080/media/test.txt)
+if [[ $curl_test -ne 200 ]]; then
+    echo "To use these images, you need to have network access"
+    echo "to the catacomb lab system at fd00:1122:3344:101::1 port 8080"
+    echo ""
+    echo "For example, I run this from the system \"sock\" to set up a tunnel:"
+    echo "ssh -L [fd00:1122:3344:101::1]:8080:catacomb:80 catacomb"
+    echo "Leave that running in a different window while access is required"
+    echo ""
+    echo "Test of curl to catacomb failed"
+    echo "curl http://[fd00:1122:3344:101::1]:8080/media/test.txt"
+    res=1
+else
+    echo "✔ Curl test to catacomb worked"
+fi
+exit $res

From b0a5ace2fb85f21430fc388ba240dd0e1e7c0697 Mon Sep 17 00:00:00 2001
From: Alan Hanson <alan@oxide.computer>
Date: Tue, 28 Jun 2022 18:31:50 +0000
Subject: [PATCH 2/2] PR comments

---
 tools/populate/populate-images.sh | 50 ++++++++-----------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/tools/populate/populate-images.sh b/tools/populate/populate-images.sh
index df073eed2a1..9f845e09e05 100755
--- a/tools/populate/populate-images.sh
+++ b/tools/populate/populate-images.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
-
 # Populate an Oxide lab host running Omicron with images from server catacomb.
 
+set -eu
+CATACOMB_TUNNEL="[fd00:1122:3344:101::1]:8080"
 res=0
 echo "Populating debian"
 oxide api /images --method POST --input - <<EOF
@@ -15,17 +16,10 @@ oxide api /images --method POST --input - <<EOF
   },
   "source": {
       "type": "url",
-      "url": "http://[fd00:1122:3344:101::1]:8080/media/debian/debian-11-nocloud-amd64-20220503-998.raw"
+      "url": "http://${CATACOMB_TUNNEL}/media/debian/debian-11-nocloud-amd64-20220503-998.raw"
   }
 }
 EOF
-if [[ $? -ne 0 ]]; then
-    echo "Making image debian failed"
-    res=1
-else
-    echo "debian image created"
-fi
-
 
 echo "Populating focal"
 oxide api /images --method POST --input - <<EOF
@@ -39,16 +33,10 @@ oxide api /images --method POST --input - <<EOF
   },
   "source": {
       "type": "url",
-      "url": "http://[fd00:1122:3344:101::1]:8080/media/cloud/focal-server-cloudimg-amd64.raw"
+      "url": "http://${CATACOMB_TUNNEL}/media/cloud/focal-server-cloudimg-amd64.raw"
   }
 }
 EOF
-if [[ $? -ne 0 ]]; then
-    echo "Making image debian failed"
-    res=1
-else
-    echo "debian image created"
-fi
 
 echo "Populating ubuntu"
 oxide api /images --method POST --input - <<EOF
@@ -62,39 +50,25 @@ oxide api /images --method POST --input - <<EOF
   },
   "source": {
       "type": "url",
-      "url": "http://[fd00:1122:3344:101::1]:8080/media/ubuntu/ubuntu-22.04-live-server-amd64.iso"
+      "url": "http://${CATACOMB_TUNNEL}/media/ubuntu/ubuntu-22.04-live-server-amd64.iso"
   }
 }
 EOF
-if [[ $? -ne 0 ]]; then
-    echo "Making image debian failed"
-    res=1
-else
-    echo "debian image created"
-fi
-
-if [[ $res -ne 0 ]]; then
-    echo ""
-    echo "Failed creating some images"
-    echo ""
-else
-    echo "✔ All images populated"
-fi
 
 # A sanity check to see if access is working to catacomb
-curl_test=$(curl -w '%{http_code}\n' -s -o /dev/null http://[fd00:1122:3344:101::1]:8080/media/test.txt)
-if [[ $curl_test -ne 200 ]]; then
+curl_test=$(curl -w '%{http_code}\n' -s -o /dev/null http://${CATACOMB_TUNNEL}/media/test.txt)
+if [[ $curl_test -eq 200 ]]; then
+    echo "✔ Curl test to catacomb worked"
+else
     echo "To use these images, you need to have network access"
-    echo "to the catacomb lab system at fd00:1122:3344:101::1 port 8080"
+    echo "to the catacomb lab system at ${CATACOMB_TUNNEL}"
     echo ""
     echo "For example, I run this from the system \"sock\" to set up a tunnel:"
-    echo "ssh -L [fd00:1122:3344:101::1]:8080:catacomb:80 catacomb"
+    echo "ssh -L ${CATACOMB_TUNNEL}:catacomb:80 catacomb"
     echo "Leave that running in a different window while access is required"
     echo ""
     echo "Test of curl to catacomb failed"
-    echo "curl http://[fd00:1122:3344:101::1]:8080/media/test.txt"
+    echo "curl http://${CATACOMB_TUNNEL}/media/test.txt"
     res=1
-else
-    echo "✔ Curl test to catacomb worked"
 fi
 exit $res