test: make test configurable

Create test.cfg in the source tree for this. Currently, ./check does
that with hardcoded values. I may change that later if need be, but
this is simple for now.

5 files changed, 25 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index b36d6fb..246e261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 subplot.html
 subplot.pdf
+test.cfg
 test.log
 test.md
 test.py
diff --git a/check b/check
index 72acaa7..0fdede0 100755
--- a/check
+++ b/check
@@ -38,6 +38,15 @@ cat subplot/*.yaml roles/*/subplot.yaml > "$dir/subplot.yaml"
 # Fix private key permissions. git doesn't preserve them.
 chmod 0600 ssh/id
 
+# Create configuration for the test VMs used by the test suite.
+cat > test.cfg <<EOF
+name: debian-ansible-test
+base_image: "$HOME/tmp/debian-10-openstack-amd64.qcow2"
+username: debian
+cpus: 2
+memory: 1024
+EOF
+
 $hideok python3 test.py --log test.log "$@"
 
 echo "Everything seems to be in order."
diff --git a/subplot/subplot.py b/subplot/subplot.py
index c9c3cdc..1570d27 100644
--- a/subplot/subplot.py
+++ b/subplot/subplot.py
@@ -11,14 +11,23 @@ def create_vm(ctx):
     QemuSystem = globals()["QemuSystem"]
     srcdir = globals()["srcdir"]
 
-    name = "debian-ansible-test"
-    base_image = "/home/liw/tmp/debian-10-openstack-amd64.qcow2"
+    MiB = 1024 ** 2
     GiB = 1024 ** 3
-    disk_size = 10 * GiB
+
+    cfg = yaml.safe_load(open(os.path.join(srcdir, "test.cfg")))
+    name = cfg["name"]
+    base_image = cfg["base_image"]
+    username = cfg["username"]
+    cpus = cfg["cpus"]
+    memory = cfg["memory"] * MiB
+
+    # We use a hard-coded test key that we have in the source tree.
     pubkey = open(os.path.join(srcdir, "ssh", "id.pub")).read().strip()
-    memory = 1 * GiB
-    cpus = 2
-    username = "debian"
+
+    # We hard code the disk image size, since we don't expect scenarios to have
+    # any specific size needs, and also, the qcow2 image format is only as big
+    # as the data put into the disk, so we can choose a size that fits all.
+    disk_size = 10 * GiB
 
     logging.info("starting a VM using qemu-system")
     logging.info(f"  name    : {name}")
diff --git a/test.config b/test.config
deleted file mode 100644
index e1a73bb..0000000
--- a/test.config
+++ /dev/null
@@ -1 +0,0 @@
-image: /home/liw/tmp/debian-10-openstack-amd64.qcow2
diff --git a/test.key b/test.key
deleted file mode 100644
index 347f335..0000000
--- a/test.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAQEAozhFGOsofrh7iVBOGqFOevAZ6UADRK9J78HhbZ3XGxjwDJ8/f3Ov
-XIELh+hhjWM1DlK+0qxEpEXJwoTiLlzHuA/HEqX8J5yApXkCvWNDamZNVqSDKpsP5gcaix
-KXFz2VaL3IGGumDzWuf8qtcJ3TAvVcpWAahLNEvV4HdQZBXL0bnnTYhc9cVSkWYGAKtwdm
-CBX5MkpTTFQpkHV300jF1s6Vbf6upDSP7xp2WrIzZ4CAKVV1mjpIrZx+zvszsv1Xfm+Zg4
-nekRFbmfehreiXHylzM5h4zkNhUBL+z/lr40/J1VeTzZKhyrwjzDgyd1CAI2mfU+Jgybax
-HQZ+Ke2ZTQAAA8iH8gOIh/IDiAAAAAdzc2gtcnNhAAABAQCjOEUY6yh+uHuJUE4aoU568B
-npQANEr0nvweFtndcbGPAMnz9/c69cgQuH6GGNYzUOUr7SrESkRcnChOIuXMe4D8cSpfwn
-nICleQK9Y0NqZk1WpIMqmw/mBxqLEpcXPZVovcgYa6YPNa5/yq1wndMC9VylYBqEs0S9Xg
-d1BkFcvRuedNiFz1xVKRZgYAq3B2YIFfkySlNMVCmQdXfTSMXWzpVt/q6kNI/vGnZasjNn
-gIApVXWaOkitnH7O+zOy/Vd+b5mDid6REVuZ96Gt6JcfKXMzmHjOQ2FQEv7P+WvjT8nVV5
-PNkqHKvCPMODJ3UIAjaZ9T4mDJtrEdBn4p7ZlNAAAAAwEAAQAAAQEAkRQ6Lu0PgJvgiuxL
-kFYjGRmEHpUckpewg6F1C+dJxTdEYCPI4DPnArVdl39R/sfY6BNatI4VMWMq9HEDTqx/hb
-bYf1X0rQzqOKs4aTjrOo8WXVY7lMphtlhIGqf6jtjZjlFqo3JEF67inYp84eYXIsEPiZvD
-1oI2LpB+1mEqBhBSHHxl76X6OHeMINFYylQwTg+0DUIriv4qBOQ0iLIfyM8ERlGWigWe5M
-hR9hReX1o+adDfmRQyF3wPyeYpuv/RGZIGN8xpHr/CK8arUGtV8QrJAXdt0o0jLdX/Ulv7
-kwOZFXN2e5xA6HvvigdgNkGtXscPy9ELHtcnEVD++ihFgQAAAIB3c54FGhbxOTpy758TWv
-Zrx3XKEpgWr981ym0H9ponp2qC0lnpEQFcHCz1gmjVOnrTWgJYlAfa/cp++LqHOsGtyD/F
-OafdI+RsByiQHDcBAZjceIySnw2XEzNyAC/kKEhS91/UsB9xnAx49A9eBkEyq3tSr6DU6d
-BrUey3Oc1pXQAAAIEA0MS7tlxQahMzXkgid39Xun4bG3lhzSsLwB8vaInz2BQW+wj8yFyV
-A8UTgSMDAZfgq9IaVtunlYuItMxVa3f5xtCX7lA3QNEmQuTPDUy6DA4MJMsA21/qTNDnjA
-wl+PTiZ2r8O2yCfNaJ2oct8d+q5WHvC+oJQZPt13xFK7nbAKEAAACBAMglfRedYwqBVxIS
-sCLGEnVbSFsi3/futfhEenEW1+rMhuEqApyxiq/Fo82ZJZjQPcOz0wt4Re3nYK0dqVtKnw
-iHDPIZhyU/l2s5IBfbidgmunrS7DJva6GGVQnPnGt15AsRVSCLjktMUo9qtOzc/FoEPpLS
-G1zC/u0llRa+tF0tAAAADGxpd0BleG9sb2JlMQECAwQFBg==
------END OPENSSH PRIVATE KEY-----