openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virt-install: Generate default --name 

This uses the same logic as virt-manager. The name is mostly
derived from --os-variant naming, but we have fallback defaults too.

Print the name to stdout so users are informed about what we are
doing.
This commit is contained in:
Cole Robinson 2019-06-11 11:54:02 -04:00
parent 078348fbbf
commit b3e6ebe28b
76 changed files with 127 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>vm-aarch64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -42,7 +42,7 @@
</devices>
</domain>
<domain type="qemu">
<name>foobar</name>
<name>vm-aarch64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-aarch64-graphics.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-aarch64-headless.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-aarch64-kvm-gic.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora22</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -23,7 +23,7 @@
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/foobar.qcow2"/>
<source file="/var/lib/libvirt/images/None.qcow2"/>
<target dev="vda" bus="virtio"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi">

2
tests/cli-test-xml/compare/virt-install-aarch64-kvm-import.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>vm-aarch64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>vm-aarch64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora20-arm</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-arm-kvm-import.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora20</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-arm-vexpress-plain.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>vm-arm</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora20-arm</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-boot-loader-secure.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-boot-uefi.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-cdrom-centos-label.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>centos6.5</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -79,7 +79,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>centos6.5</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

8
tests/cli-test-xml/compare/virt-install-cdrom-double.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -20,7 +20,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/var/lib/libvirt/images/foobar.qcow2"/>
<source file="/var/lib/libvirt/images/None.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">
@ -51,7 +51,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -70,7 +70,7 @@
<devices>
<emulator>/usr/bin/test-hv</emulator>
<disk type="file" device="disk">
<source file="/var/lib/libvirt/images/foobar.qcow2"/>
<source file="/var/lib/libvirt/images/None.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<disk type="file" device="cdrom">

4
tests/cli-test-xml/compare/virt-install-cdrom-url.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -43,7 +43,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-cpu-disable-sec.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -45,7 +45,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-cpu-rhel7-default.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -47,7 +47,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-cpuset-auto.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -37,7 +37,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-f21-kvm-remote.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-fake-ftp.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>rhel6.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -44,7 +44,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>rhel6.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-fake-http.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>rhel6.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -44,7 +44,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>rhel6.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-centos7.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>centos7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -67,7 +67,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>centos7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-cpu-default-fallback.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>rhel7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -69,7 +69,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>rhel7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-fedoralatest-url.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -57,7 +57,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-hostcopy-fallback.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -76,7 +76,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-kvm-i686-uefi.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm-i686</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -55,7 +55,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm-i686</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-kvm-rhel5.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>rhel5.4</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -64,7 +64,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>rhel5.4</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-rhel6.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>rhel6.4</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -73,7 +73,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>rhel6.4</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-rhel7.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>rhel7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -67,7 +67,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>rhel7.0</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

8
tests/cli-test-xml/compare/virt-install-kvm-session-defaults.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -34,7 +34,7 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/tmp/.local/share/libvirt/images/foobar.qcow2"/>
<source file="/tmp/.local/share/libvirt/images/None.qcow2"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">
@ -72,7 +72,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -105,7 +105,7 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/tmp/.local/share/libvirt/images/foobar.qcow2"/>
<source file="/tmp/.local/share/libvirt/images/None.qcow2"/>
<target dev="vda" bus="virtio"/>
</disk>
<disk type="file" device="cdrom">

4
tests/cli-test-xml/compare/virt-install-kvm-win10.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>win10</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -69,7 +69,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>win10</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>win2k3</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -69,7 +69,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>win2k3</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-location-iso.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora17</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -77,7 +77,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora17</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-location-manual-kernel.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -61,7 +61,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

6
tests/cli-test-xml/compare/virt-install-many-devices.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -67,7 +67,7 @@
</disk>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/foobar.qcow2"/>
<source file="/var/lib/libvirt/images/None.qcow2"/>
<target dev="vdc" bus="virtio"/>
</disk>
<disk type="block" device="lun" sgio="unfiltered" rawio="yes">
@ -114,7 +114,7 @@
<auth username="admin">
<secret type="ceph" uuid="f65cc5a8-b77b-4254-9030-d50a528fb456"/>
</auth>
<source protocol="rbd" name="rbd-sourcename/foobar">
<source protocol="rbd" name="rbd-sourcename/None">
<host name="ceph-mon-1.example.com" port="6789"/>
<host name="ceph-mon-2.example.com" port="6789"/>
<host name="ceph-mon-3.example.com" port="6789"/>

4
tests/cli-test-xml/compare/virt-install-memory-hotplug.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<maxMemory slots="2">2097152</maxMemory>
<os>
@ -63,7 +63,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<maxMemory slots="2">2097152</maxMemory>
<os>

4
tests/cli-test-xml/compare/virt-install-memory-option-backcompat.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<maxMemory slots="1">409600</maxMemory>
<memory>307200</memory>
@ -37,7 +37,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<maxMemory slots="1">409600</maxMemory>
<memory>307200</memory>

4
tests/cli-test-xml/compare/virt-install-network-install-resources.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>silverblue29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -49,7 +49,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>silverblue29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

1
tests/cli-test-xml/compare/virt-install-noargs-fail.xml
View File

@ -1,3 +1,4 @@
Using default --name vm1
ERROR
--disk storage must be specified (override with --disk none)
An install method must be specified

4
tests/cli-test-xml/compare/virt-install-openbsd-defaults.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>openbsd4.9</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -31,7 +31,7 @@
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/var/lib/libvirt/images/foobar.qcow2"/>
<source file="/var/lib/libvirt/images/None.qcow2"/>
<target dev="hda" bus="ide"/>
</disk>
<controller type="usb" index="0" model="ich9-ehci1"/>

4
tests/cli-test-xml/compare/virt-install-osinfo-netinst-unattended.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -55,7 +55,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-osinfo-url-unattended.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -49,7 +49,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-osinfo-url.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -49,7 +49,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora26</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-osinfo-win7-unattended.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>win7</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -67,7 +67,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>win7</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-ppc64-graphics.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-ppc64-headless.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora20-ppc64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora20-ppc64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora20</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-q35-defaults.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -66,7 +66,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-qemu-32-on-64.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora20-i686</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-qemu-plain.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>ubuntu13.10</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-riscv64-graphics.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora29-riscv64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-riscv64-headless.xml
View File

@ -1,5 +1,5 @@
<domain type="qemu">
<name>foobar</name>
<name>fedora29-riscv64</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-s390x-cdrom-KVMIBM.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora21</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-s390x-graphics.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-s390x-headless.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-simple-pxe.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>
@ -36,7 +36,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-singleton-config-1.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>12345678-12F4-1234-1234-123456789AFA</uuid>
<genid/>
<description>foobar &amp; baz</description>

4
tests/cli-test-xml/compare/virt-install-singleton-config-2.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<genid>e9392370-2917-565e-692b-d057f46512d6</genid>
<title>my-title</title>
@ -213,7 +213,7 @@
</cputune>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<genid>e9392370-2917-565e-692b-d057f46512d6</genid>
<title>my-title</title>

2
tests/cli-test-xml/compare/virt-install-singleton-config-3.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-vz-ct-template.xml
View File

@ -1,5 +1,5 @@
<domain type="vz">
<name>foobar</name>
<name>container1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-w2k3-cdrom.xml
View File

@ -1,5 +1,5 @@
<domain type="test">
<name>foobar</name>
<name>win2k3</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -51,7 +51,7 @@
</devices>
</domain>
<domain type="test">
<name>foobar</name>
<name>win2k3</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

4
tests/cli-test-xml/compare/virt-install-win7-uefi.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>win7</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -74,7 +74,7 @@
</devices>
</domain>
<domain type="kvm">
<name>foobar</name>
<name>win7</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-x86_64-graphics.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-x86_64-headless.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>fedora29</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev-full.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-x86_64-launch-security-sev.xml
View File

@ -1,5 +1,5 @@
<domain type="kvm">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-xen-default.xml
View File

@ -1,5 +1,5 @@
<domain type="xen">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

2
tests/cli-test-xml/compare/virt-install-xen-hvm.xml
View File

@ -1,5 +1,5 @@
<domain type="xen">
<name>foobar</name>
<name>vm1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory>65536</memory>
<currentMemory>65536</currentMemory>

4
tests/cli-test-xml/compare/virt-install-xen-pv.xml
View File

@ -1,5 +1,5 @@
<domain type="xen">
<name>foobar</name>
<name>fedora17</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
@ -32,7 +32,7 @@
</devices>
</domain>
<domain type="xen">
<name>foobar</name>
<name>fedora17</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<metadata>
<libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">

2
tests/clitest.py
View File

@ -377,8 +377,6 @@ class App(object):
args += " --connect %s" % uri
if self.appname in ["virt-install"]:
if "--name " not in cli:
args += " --name foobar"
if "--ram " not in cli:
args += " --ram 64"

13
virt-install
View File

@ -321,9 +321,6 @@ def validate_required_options(options, guest, installer):
# aggregate the errors to help first time users get it right
msg = ""
if not guest.name:
msg += "\n" + _("--name is required")
if not memory_specified(guest):
msg += "\n" + _("--memory amount in MiB is required")
@ -525,7 +522,13 @@ def build_installer(options, guest):
return installer
def set_resources_from_osinfo(options, guest):
def set_cli_defaults(options, guest):
if not guest.name:
default_name = virtinst.Guest.generate_name(guest)
cli.print_stdout(_("Using default --name {vm_name}").format(
vm_name=default_name))
guest.name = default_name
if guest.os.is_container():
return
@ -580,7 +583,7 @@ def build_guest_instance(conn, options):
# we are operating on any arch/os/type values passed in with --boot
guest.set_capabilities_defaults()
installer = build_installer(options, guest)
set_resources_from_osinfo(options, guest)
set_cli_defaults(options, guest)
if installer:
installer.set_install_defaults(guest)

3
virtinst/guest.py
View File

@ -146,6 +146,9 @@ class Guest(XMLBuilder):
force_num = False
basename = guest.osinfo.name
if basename.endswith("-unknown"):
basename = basename.rsplit("-", 1)[0]
if guest.osinfo.name == "generic":
force_num = True
if guest.os.is_container():