From 88c1a895923b6d2e3afbefcd28ff154ceb597f67 Mon Sep 17 00:00:00 2001
From: František Zatloukal <fzatlouk@redhat.com>
Date: Nov 03 2020 13:29:43 +0000
Subject: Parse CMD_LINE_ARGS and add CMD_LINE_ENVS


Fixes https://pagure.io/testcloud/issue/49

---

diff --git a/conf/domain-template.jinja b/conf/domain-template.jinja
index 7a7f437..0300a9b 100644
--- a/conf/domain-template.jinja
+++ b/conf/domain-template.jinja
@@ -1,8 +1,8 @@
-<domain type='kvm'>
-    <name>{{ domain_name }}</name>
-    <uuid>{{ uuid }}</uuid>
-    <memory unit='KiB'>{{ memory }}</memory>
-    <currentMemory unit='KiB'>{{ memory }}</currentMemory>
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name>{{ domain_name }}</name>
+  <uuid>{{ uuid }}</uuid>
+  <memory unit='KiB'>{{ memory }}</memory>
+  <currentMemory unit='KiB'>{{ memory }}</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
@@ -61,4 +61,5 @@
       <backend model='random'>/dev/urandom</backend>
     </rng>
   </devices>
+  {{ qemu_args }}
 </domain>
diff --git a/conf/settings-example.py b/conf/settings-example.py
index ce0c6c3..3643eab 100644
--- a/conf/settings-example.py
+++ b/conf/settings-example.py
@@ -44,6 +44,7 @@
 ## Customize as needed :)
 
 #CMD_LINE_ARGS = []
+#CMD_LINE_ENVS = {}
 
 # The timeout, in seconds, to wait for an instance to boot before
 # failing the boot process. Setting this to 0 disables waiting and
@@ -64,4 +65,4 @@
 #STOP_RETRY_WAIT = 1
 
 # Desired VM type: False = BIOS, True = UEFI
-#UEFI = False
\ No newline at end of file
+#UEFI = False
diff --git a/testcloud/config.py b/testcloud/config.py
index 966d256..deb53d9 100644
--- a/testcloud/config.py
+++ b/testcloud/config.py
@@ -126,6 +126,7 @@ runcmd:
     # Customize as needed :)
 
     CMD_LINE_ARGS = []
+    CMD_LINE_ENVS = {}
 
     # timeout, in seconds for instance boot process
     BOOT_TIMEOUT = 30
diff --git a/testcloud/instance.py b/testcloud/instance.py
index 111eff4..01719f8 100644
--- a/testcloud/instance.py
+++ b/testcloud/instance.py
@@ -374,6 +374,17 @@ class Instance(object):
                            'uefi_loader': "",
                            'emulator_path': "/usr/bin/qemu-kvm"}
 
+        if config_data.CMD_LINE_ARGS or config_data.CMD_LINE_ENVS:
+            args_envs = "  <qemu:commandline>\n"
+            for qemu_arg in config_data.CMD_LINE_ARGS:
+                args_envs += "    <qemu:arg value='%s'/>\n" % qemu_arg
+
+            for qemu_env in config_data.CMD_LINE_ENVS:
+                args_envs += "    <qemu:env name='%s' value='%s'/>\n" % (qemu_env, config_data.CMD_LINE_ENVS[qemu_env])
+
+            args_envs += "  </qemu:commandline>"
+            instance_values["qemu_args"] = args_envs
+
         if config_data.UEFI:
             instance_values['uefi_loader'] = "<loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader>"