PR#66: Parse CMD_LINE_ARGS and add CMD_LINE_ENVS - testcloud

František Zatloukal • 3 years ago

88c1a89

conf/domain-template.jinja

file modified

+6 -5

		`@@ -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>`

conf/settings-example.py

file modified

+2 -1

		`@@ -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`

testcloud/config.py

file modified

		`@@ -126,6 +126,7 @@`
		`# Customize as needed :)`

		`CMD_LINE_ARGS = []`
		`+ CMD_LINE_ENVS = {}`

		`# timeout, in seconds for instance boot process`
		`BOOT_TIMEOUT = 30`

testcloud/instance.py

file modified

+11

		`@@ -374,6 +374,17 @@`
		`'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>"`