Merge ~rodsmith/maas-cert-server:fix-iperf-setup into maas-cert-server:master

[Rod Smith]

Fix iperf3 target setting and MAAS version detection in preseed

The iperf3 target setting was not working when MAAS was installed via snaps. This MR fixes the problem, albeit by requiring the iperf.conf file to be copied somewhere that the snap can read. This will need to be documented in MANIACS.

To support snaps, and earlier merge changed the preseed's method of detecting the MAAS version. This change has proven to be unreliable. This MR reverts to a (slightly altered) earlier method. This method works when MAAS is installed via Debian packages, but not via snaps; but as we're deprecating installation of MAAS via snaps for certification, this seems like an acceptable compromise.

[Adrian Lane (alanec)]

LGMT-

review: Approve

diff --git a/debian/changelog b/debian/changelog
index df8bb27..583aa46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+maas-cert-server (0.6.3-0ppa1) focal; urgency=medium
+
+  * Add support in preseed for taking iperf target data from snap directory.
+  * Reverted to a (slightly altered) older version of determining the MAAS
+    version in preseed, since the new version was unreliable. Neither version
+    works when MAAS is installed via a snap.
+
+ -- Rod Smith <[e-mail]>  Fri, 23 Apr 2021 16:08:10 -0400
+
 maas-cert-server (0.6.2-0ppa1) focal; urgency=medium
 
   * Increased default size of LXD container in lxc-setup from 30 GB to
diff --git a/preseed/curtin_userdata_cert b/preseed/curtin_userdata_cert
index 623887c..2facb12 100644
--- a/preseed/curtin_userdata_cert
+++ b/preseed/curtin_userdata_cert
@@ -1,21 +1,28 @@
-# Get maas version
+# Get maas version & iperf3 targets
 {{py:
 from subprocess import check_output
 from shlex import split
 import json
 import netifaces as ni
+
+maas_version = "unknown"
 try:
-    cache_output = check_output(['maas', 'admin', 'version', 'read']).decode('utf-8')
+    cache_output = check_output(['apt-cache', 'policy', 'maas']).decode('utf-8')
 except:
-    maas_version = "unknown"
-else:
-    maas_version = json.loads(cache_output)['version'] + "-" + json.loads(cache_output)['subversion']
+    cache_output = ""
+for line in cache_output.splitlines():
+    line = line.strip()
+    if 'Installed:' in line:
+        maas_version = line.split('Installed:')[1].strip()
 try:
-    f = open('/etc/maas-cert-server/iperf.conf', 'r')
-    test_target_iperf = f.readline().rstrip()
-    f.close()
+    with open('/etc/maas-cert-server/iperf.conf', 'r') as f:
+        test_target_iperf = f.readline().rstrip()
 except IOError:
-    test_target_iperf = "gateway"
+    try:
+        with open('/var/snap/maas/current/iperf.conf', 'r') as f:
+            test_target_iperf = f.readline().rstrip()
+    except IOError:
+        test_target_iperf = "gateway"
 iface = ni.gateways()['default'][ni.AF_INET][1];
 maas_ip = ni.ifaddresses(iface)[ni.AF_INET][0]['addr']
 }}
@@ -121,13 +128,9 @@ anchor_bucket:
   - &iperf
       #!/bin/sh
       echo "Setting up iperf...";
-      /bin/sed -i '/^#TEST_TARGET_FTP /s/^#//' /etc/xdg/canonical-certification.conf;
-      /bin/sed -i '/^#TEST_USER /s/^#//' /etc/xdg/canonical-certification.conf;
-      /bin/sed -i '/^#TEST_PASS /s/^#//' /etc/xdg/canonical-certification.conf;
       /bin/sed -i '/^#TEST_TARGET_IPERF /s/^#//' /etc/xdg/canonical-certification.conf;
       if [ "{{test_target_iperf}}" = "gateway" ] ; then
-          maas_ip=$(/sbin/ip route | awk '/default/ { print $3 }');
-          sed -i 's/ your-iperf-server.example.com/'"$maas_ip"'/g' /etc/xdg/canonical-certification.conf;
+          sed -i 's/ your-iperf-server.example.com/{{maas_ip}}/g' /etc/xdg/canonical-certification.conf;
       else
           sed -i 's/ your-iperf-server.example.com/{{test_target_iperf}}/g' /etc/xdg/canonical-certification.conf;
       fi;