[libvirt] [PATCH v2 4/4] xlconfigtest: add test for channel conversion

[Jim Fehlig]

On 09/22/2016 01:53 PM, Joao Martins wrote:
> Signed-off-by: Joao Martins <joao.m.martins at oracle.com>
> ---
>  tests/xlconfigdata/test-channel-pty.cfg  | 13 ++++++++++++
>  tests/xlconfigdata/test-channel-pty.xml  | 33 +++++++++++++++++++++++++++++++
>  tests/xlconfigdata/test-channel-unix.cfg | 13 ++++++++++++
>  tests/xlconfigdata/test-channel-unix.xml | 34 ++++++++++++++++++++++++++++++++
>  tests/xlconfigtest.c                     |  4 ++++
>  5 files changed, 97 insertions(+)
>  create mode 100644 tests/xlconfigdata/test-channel-pty.cfg
>  create mode 100644 tests/xlconfigdata/test-channel-pty.xml
>  create mode 100644 tests/xlconfigdata/test-channel-unix.cfg
>  create mode 100644 tests/xlconfigdata/test-channel-unix.xml

ACK.

Regards,
Jim

>
> diff --git a/tests/xlconfigdata/test-channel-pty.cfg b/tests/xlconfigdata/test-channel-pty.cfg
> new file mode 100644
> index 0000000..b20e487
> --- /dev/null
> +++ b/tests/xlconfigdata/test-channel-pty.cfg
> @@ -0,0 +1,13 @@
> +name = "XenGuest1"
> +uuid = "45b60f51-88a9-47a8-a3b3-5e66d71b2283"
> +maxmem = 512
> +memory = 512
> +vcpus = 1
> +localtime = 0
> +on_poweroff = "preserve"
> +on_reboot = "restart"
> +on_crash = "preserve"
> +vif = [ "mac=5a:36:0e:be:00:09" ]
> +bootloader = "/usr/bin/pygrub"
> +disk = [ "format=qcow2,vdev=xvda,access=rw,backendtype=qdisk,target=/var/lib/xen/images/debian/disk.qcow2" ]
> +channel = [ "connection=pty,name=org.qemu.guest_agent.0" ]
> diff --git a/tests/xlconfigdata/test-channel-pty.xml b/tests/xlconfigdata/test-channel-pty.xml
> new file mode 100644
> index 0000000..17d0c67
> --- /dev/null
> +++ b/tests/xlconfigdata/test-channel-pty.xml
> @@ -0,0 +1,33 @@
> +<domain type='xen'>
> +  <name>XenGuest1</name>
> +  <uuid>45b60f51-88a9-47a8-a3b3-5e66d71b2283</uuid>
> +  <memory unit='KiB'>524288</memory>
> +  <currentMemory unit='KiB'>524288</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <bootloader>/usr/bin/pygrub</bootloader>
> +  <os>
> +    <type arch='x86_64' machine='xenpv'>linux</type>
> +  </os>
> +  <clock offset='utc' adjustment='reset'/>
> +  <on_poweroff>preserve</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>preserve</on_crash>
> +  <devices>
> +    <disk type='file' device='disk'>
> +      <driver name='qemu' type='qcow2'/>
> +      <source file='/var/lib/xen/images/debian/disk.qcow2'/>
> +      <target dev='xvda' bus='xen'/>
> +    </disk>
> +    <interface type='ethernet'>
> +      <mac address='5a:36:0e:be:00:09'/>
> +    </interface>
> +    <console type='pty'>
> +      <target type='xen' port='0'/>
> +    </console>
> +    <channel type='pty'>
> +      <target type='xen' name='org.qemu.guest_agent.0'/>
> +    </channel>
> +    <input type='mouse' bus='xen'/>
> +    <input type='keyboard' bus='xen'/>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigdata/test-channel-unix.cfg b/tests/xlconfigdata/test-channel-unix.cfg
> new file mode 100644
> index 0000000..ada7001
> --- /dev/null
> +++ b/tests/xlconfigdata/test-channel-unix.cfg
> @@ -0,0 +1,13 @@
> +name = "XenGuest1"
> +uuid = "45b60f51-88a9-47a8-a3b3-5e66d71b2283"
> +maxmem = 512
> +memory = 512
> +vcpus = 1
> +localtime = 0
> +on_poweroff = "preserve"
> +on_reboot = "restart"
> +on_crash = "preserve"
> +vif = [ "mac=5a:36:0e:be:00:09" ]
> +bootloader = "/usr/bin/pygrub"
> +disk = [ "format=qcow2,vdev=xvda,access=rw,backendtype=qdisk,target=/var/lib/xen/images/debian/disk.qcow2" ]
> +channel = [ "connection=socket,path=/path/to/socket,name=org.qemu.guest_agent.0" ]
> diff --git a/tests/xlconfigdata/test-channel-unix.xml b/tests/xlconfigdata/test-channel-unix.xml
> new file mode 100644
> index 0000000..8f4eaa2
> --- /dev/null
> +++ b/tests/xlconfigdata/test-channel-unix.xml
> @@ -0,0 +1,34 @@
> +<domain type='xen'>
> +  <name>XenGuest1</name>
> +  <uuid>45b60f51-88a9-47a8-a3b3-5e66d71b2283</uuid>
> +  <memory unit='KiB'>524288</memory>
> +  <currentMemory unit='KiB'>524288</currentMemory>
> +  <vcpu placement='static'>1</vcpu>
> +  <bootloader>/usr/bin/pygrub</bootloader>
> +  <os>
> +    <type arch='x86_64' machine='xenpv'>linux</type>
> +  </os>
> +  <clock offset='utc' adjustment='reset'/>
> +  <on_poweroff>preserve</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>preserve</on_crash>
> +  <devices>
> +    <disk type='file' device='disk'>
> +      <driver name='qemu' type='qcow2'/>
> +      <source file='/var/lib/xen/images/debian/disk.qcow2'/>
> +      <target dev='xvda' bus='xen'/>
> +    </disk>
> +    <interface type='ethernet'>
> +      <mac address='5a:36:0e:be:00:09'/>
> +    </interface>
> +    <console type='pty'>
> +      <target type='xen' port='0'/>
> +    </console>
> +    <channel type='unix'>
> +      <source mode='bind' path='/path/to/socket'/>
> +      <target type='xen' name='org.qemu.guest_agent.0'/>
> +    </channel>
> +    <input type='mouse' bus='xen'/>
> +    <input type='keyboard' bus='xen'/>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
> index 61a6295..8fc73ee 100644
> --- a/tests/xlconfigtest.c
> +++ b/tests/xlconfigtest.c
> @@ -268,6 +268,10 @@ mymain(void)
>      DO_TEST_FORMAT("paravirt-cmdline-bogus-extra-root", false);
>      DO_TEST("rbd-multihost-noauth");
>  
> +#ifdef LIBXL_HAVE_DEVICE_CHANNEL
> +    DO_TEST("channel-pty");
> +    DO_TEST("channel-unix");
> +#endif
>  #ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST
>      DO_TEST("fullvirt-multiserial");
>  #endif