[libvirt] [PATCH v5 4/4] xlconfigtest: add tests for numa cell sibling distances

Jim Fehlig jfehlig at suse.com
Thu Oct 26 23:51:34 UTC 2017


On 10/12/2017 01:31 PM, Wim Ten Have wrote:
> From: Wim ten Have <wim.ten.have at oracle.com>
> 
> Test a bidirectional xen-xl domxml to and from native for numa
> support administration as brought under this patch series.
> 
> Signed-off-by: Wim ten Have <wim.ten.have at oracle.com>
> ---
>   .../test-fullvirt-vnuma-autocomplete.cfg           | 26 +++++++
>   .../test-fullvirt-vnuma-autocomplete.xml           | 85 ++++++++++++++++++++++
>   .../test-fullvirt-vnuma-nodistances.cfg            | 26 +++++++
>   .../test-fullvirt-vnuma-nodistances.xml            | 53 ++++++++++++++
>   .../test-fullvirt-vnuma-partialdist.cfg            | 26 +++++++
>   .../test-fullvirt-vnuma-partialdist.xml            | 60 +++++++++++++++
>   tests/xlconfigdata/test-fullvirt-vnuma.cfg         | 26 +++++++
>   tests/xlconfigdata/test-fullvirt-vnuma.xml         | 81 +++++++++++++++++++++
>   tests/xlconfigtest.c                               |  6 ++

Cool! Thanks for the various configurations to test all the hairy parsing code :-).

Reviewed-by: Jim Fehlig <jfehlig at suse.com>

BTW I should have mentioned it while reviewing 3/4, but we should also have 
tests for the libxl_domain_config generator, now that we have a test suite for 
that. See tests/libxlxml2domconfigtest.c.

Regards,
Jim

>   9 files changed, 389 insertions(+)
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.cfg
>   create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.xml
> 
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg
> new file mode 100644
> index 000000000..edba69a17
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 12
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0,11", "vdistances=10,21,31,41,51,61" ], [ "pnode=1", "size=2048", "vcpus=1,10", "vdistances=21,10,21,31,41,51" ], [ "pnode=2", "size=2048", "vcpus=2,9", "vdistances=31,21,10,21,31,41" ], [ "pnode=3", "size=2048", "vcpus=3,8", "vdistances=41,31,21,10,21,31" ], [ "pnode=4", "size=2048", "vcpus=4,7", "vdistances=51,41,31,21,10,21" ], [ "pnode=5", "size=2048", "vcpus=5-6", "vdistances=61,51,41,31,21,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml
> new file mode 100644
> index 000000000..e3639eb04
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml
> @@ -0,0 +1,85 @@
> +<domain type='xen'>
> +  <name>XenGuest2</name>
> +  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>8388608</memory>
> +  <currentMemory unit='KiB'>8388608</currentMemory>
> +  <vcpu placement='static'>12</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='xenfv'>hvm</type>
> +    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> +    <boot dev='cdrom'/>
> +  </os>
> +  <features>
> +    <acpi/>
> +    <apic/>
> +    <pae/>
> +  </features>
> +  <cpu>
> +    <numa>
> +      <cell id='0' cpus='0,11' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='1' value='21'/>
> +          <sibling id='2' value='31'/>
> +          <sibling id='3' value='41'/>
> +          <sibling id='4' value='51'/>
> +          <sibling id='5' value='61'/>
> +        </distances>
> +      </cell>
> +      <cell id='1' cpus='1,10' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='2' value='21'/>
> +          <sibling id='3' value='31'/>
> +          <sibling id='4' value='41'/>
> +          <sibling id='5' value='51'/>
> +        </distances>
> +      </cell>
> +      <cell id='2' cpus='2,9' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='3' value='21'/>
> +          <sibling id='4' value='31'/>
> +          <sibling id='5' value='41'/>
> +        </distances>
> +      </cell>
> +      <cell id='3' cpus='3,8' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='4' value='21'/>
> +          <sibling id='5' value='31'/>
> +        </distances>
> +      </cell>
> +      <cell id='4' cpus='4,7' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='5' value='21'/>
> +        </distances>
> +      </cell>
> +      <cell id='5' cpus='5-6' memory='2097152' unit='KiB'/>
> +    </numa>
> +  </cpu>
> +  <clock offset='variable' adjustment='0' basis='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>restart</on_crash>
> +  <devices>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> +    <disk type='block' device='disk'>
> +      <driver name='phy' type='raw'/>
> +      <source dev='/dev/HostVG/XenGuest2'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='ide' index='0'/>
> +    <interface type='bridge'>
> +      <mac address='00:16:3e:66:92:9c'/>
> +      <source bridge='xenbr1'/>
> +      <script path='vif-bridge'/>
> +      <model type='e1000'/>
> +    </interface>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> +      <listen type='address' address='127.0.0.1'/>
> +    </graphics>
> +    <video>
> +      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> +    </video>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
> new file mode 100644
> index 000000000..8186edfee
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 8
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0-1", "vdistances=10,20,20,20" ], [ "pnode=1", "size=2048", "vcpus=2-3", "vdistances=20,10,20,20" ], [ "pnode=2", "size=2048", "vcpus=4-5", "vdistances=20,20,10,20" ], [ "pnode=3", "size=2048", "vcpus=6-7", "vdistances=20,20,20,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
> new file mode 100644
> index 000000000..9cab3ca6d
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml
> @@ -0,0 +1,53 @@
> +<domain type='xen'>
> +  <name>XenGuest2</name>
> +  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>8388608</memory>
> +  <currentMemory unit='KiB'>8388608</currentMemory>
> +  <vcpu placement='static'>8</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='xenfv'>hvm</type>
> +    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> +    <boot dev='cdrom'/>
> +  </os>
> +  <features>
> +    <acpi/>
> +    <apic/>
> +    <pae/>
> +  </features>
> +  <cpu>
> +    <numa>
> +      <cell id='0' cpus='0-1' memory='2097152' unit='KiB'/>
> +      <cell id='1' cpus='2-3' memory='2097152' unit='KiB'/>
> +      <cell id='2' cpus='4-5' memory='2097152' unit='KiB'/>
> +      <cell id='3' cpus='6-7' memory='2097152' unit='KiB'/>
> +    </numa>
> +  </cpu>
> +  <clock offset='variable' adjustment='0' basis='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>restart</on_crash>
> +  <devices>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> +    <disk type='block' device='disk'>
> +      <driver name='phy' type='raw'/>
> +      <source dev='/dev/HostVG/XenGuest2'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='ide' index='0'/>
> +    <interface type='bridge'>
> +      <mac address='00:16:3e:66:92:9c'/>
> +      <source bridge='xenbr1'/>
> +      <script path='vif-bridge'/>
> +      <model type='e1000'/>
> +    </interface>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> +      <listen type='address' address='127.0.0.1'/>
> +    </graphics>
> +    <video>
> +      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> +    </video>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg
> new file mode 100644
> index 000000000..861a50e76
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 8
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0-1", "vdistances=10,21,31,41" ], [ "pnode=1", "size=2048", "vcpus=2-3", "vdistances=21,10,20,20" ], [ "pnode=2", "size=2048", "vcpus=4-5", "vdistances=31,20,10,20" ], [ "pnode=3", "size=2048", "vcpus=6-7", "vdistances=41,20,20,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml
> new file mode 100644
> index 000000000..084b8893c
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml
> @@ -0,0 +1,60 @@
> +<domain type='xen'>
> +  <name>XenGuest2</name>
> +  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>8388608</memory>
> +  <currentMemory unit='KiB'>8388608</currentMemory>
> +  <vcpu placement='static'>8</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='xenfv'>hvm</type>
> +    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> +    <boot dev='cdrom'/>
> +  </os>
> +  <features>
> +    <acpi/>
> +    <apic/>
> +    <pae/>
> +  </features>
> +  <cpu>
> +    <numa>
> +      <cell id='0' cpus='0-1' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='0' value='10'/>
> +          <sibling id='1' value='21'/>
> +          <sibling id='2' value='31'/>
> +          <sibling id='3' value='41'/>
> +        </distances>
> +      </cell>
> +      <cell id='1' cpus='2-3' memory='2097152' unit='KiB'/>
> +      <cell id='2' cpus='4-5' memory='2097152' unit='KiB'/>
> +      <cell id='3' cpus='6-7' memory='2097152' unit='KiB'/>
> +    </numa>
> +  </cpu>
> +  <clock offset='variable' adjustment='0' basis='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>restart</on_crash>
> +  <devices>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> +    <disk type='block' device='disk'>
> +      <driver name='phy' type='raw'/>
> +      <source dev='/dev/HostVG/XenGuest2'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='ide' index='0'/>
> +    <interface type='bridge'>
> +      <mac address='00:16:3e:66:92:9c'/>
> +      <source bridge='xenbr1'/>
> +      <script path='vif-bridge'/>
> +      <model type='e1000'/>
> +    </interface>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> +      <listen type='address' address='127.0.0.1'/>
> +    </graphics>
> +    <video>
> +      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> +    </video>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.cfg b/tests/xlconfigdata/test-fullvirt-vnuma.cfg
> new file mode 100644
> index 000000000..91e233ac2
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma.cfg
> @@ -0,0 +1,26 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 8192
> +memory = 8192
> +vcpus = 8
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-system-i386"
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +vnuma = [ [ "pnode=0", "size=2048", "vcpus=0-1", "vdistances=10,21,31,41" ], [ "pnode=1", "size=2048", "vcpus=2-3", "vdistances=21,10,21,31" ], [ "pnode=2", "size=2048", "vcpus=4-5", "vdistances=31,21,10,21" ], [ "pnode=3", "size=2048", "vcpus=6-7", "vdistances=41,31,21,10" ] ]
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.xml b/tests/xlconfigdata/test-fullvirt-vnuma.xml
> new file mode 100644
> index 000000000..5368b0d9c
> --- /dev/null
> +++ b/tests/xlconfigdata/test-fullvirt-vnuma.xml
> @@ -0,0 +1,81 @@
> +<domain type='xen'>
> +  <name>XenGuest2</name>
> +  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> +  <memory unit='KiB'>8388608</memory>
> +  <currentMemory unit='KiB'>8388608</currentMemory>
> +  <vcpu placement='static'>8</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='xenfv'>hvm</type>
> +    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> +    <boot dev='cdrom'/>
> +  </os>
> +  <features>
> +    <acpi/>
> +    <apic/>
> +    <pae/>
> +  </features>
> +  <cpu>
> +    <numa>
> +      <cell id='0' cpus='0-1' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='0' value='10'/>
> +          <sibling id='1' value='21'/>
> +          <sibling id='2' value='31'/>
> +          <sibling id='3' value='41'/>
> +        </distances>
> +      </cell>
> +      <cell id='1' cpus='2-3' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='0' value='21'/>
> +          <sibling id='1' value='10'/>
> +          <sibling id='2' value='21'/>
> +          <sibling id='3' value='31'/>
> +        </distances>
> +      </cell>
> +      <cell id='2' cpus='4-5' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='0' value='31'/>
> +          <sibling id='1' value='21'/>
> +          <sibling id='2' value='10'/>
> +          <sibling id='3' value='21'/>
> +        </distances>
> +      </cell>
> +      <cell id='3' cpus='6-7' memory='2097152' unit='KiB'>
> +        <distances>
> +          <sibling id='0' value='41'/>
> +          <sibling id='1' value='31'/>
> +          <sibling id='2' value='21'/>
> +          <sibling id='3' value='10'/>
> +        </distances>
> +      </cell>
> +    </numa>
> +  </cpu>
> +  <clock offset='variable' adjustment='0' basis='utc'/>
> +  <on_poweroff>destroy</on_poweroff>
> +  <on_reboot>restart</on_reboot>
> +  <on_crash>restart</on_crash>
> +  <devices>
> +    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
> +    <disk type='block' device='disk'>
> +      <driver name='phy' type='raw'/>
> +      <source dev='/dev/HostVG/XenGuest2'/>
> +      <target dev='hda' bus='ide'/>
> +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> +    </disk>
> +    <controller type='ide' index='0'/>
> +    <interface type='bridge'>
> +      <mac address='00:16:3e:66:92:9c'/>
> +      <source bridge='xenbr1'/>
> +      <script path='vif-bridge'/>
> +      <model type='e1000'/>
> +    </interface>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> +      <listen type='address' address='127.0.0.1'/>
> +    </graphics>
> +    <video>
> +      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
> +    </video>
> +  </devices>
> +</domain>
> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
> index 30468c905..f2b1cd66d 100644
> --- a/tests/xlconfigtest.c
> +++ b/tests/xlconfigtest.c
> @@ -270,6 +270,12 @@ mymain(void)
>       DO_TEST("fullvirt-multi-timer");
>       DO_TEST("fullvirt-nestedhvm");
>       DO_TEST("fullvirt-nestedhvm-disabled");
> +#ifdef LIBXL_HAVE_VNUMA
> +    DO_TEST("fullvirt-vnuma");
> +    DO_TEST_PARSE("fullvirt-vnuma-autocomplete", false);
> +    DO_TEST_PARSE("fullvirt-vnuma-nodistances", false);
> +    DO_TEST_PARSE("fullvirt-vnuma-partialdist", false);
> +#endif
>   
>       DO_TEST("paravirt-cmdline");
>       DO_TEST_FORMAT("paravirt-cmdline-extra-root", false);
> 




More information about the libvir-list mailing list