NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

cloner: Explicitly reject 'network' disks we don't know how to clone

Browse Source 
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
2020-11-03 12:53:25 -05:00
parent 2d4b85b5bf
commit 1a1e4580c0
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/data/cli/virtclone/clone-net.xml Normal file
View File

@@ -0,0 +1,29 @@
<domain type='test' id='1'>
<name>origtest</name>
<uuid>db69fa1f-eef0-e567-3c20-3ef16f10376b</uuid>
<memory>8388608</memory>
<currentMemory>2097152</currentMemory>
<vcpu>2</vcpu>
<os>
<type arch='i686'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<disk type='network' device='disk'>
<driver name='qemu' type='raw' cache='none' io='native'/>
<auth username='libvirt'>
<secret type='ceph' uuid='11111111-2222-3333-4444-55556666777'/>
</auth>
<source protocol='rbd' name='vms/foo1'>
<host name='host1' port='6789'/>
<host name='host2' port='6789'/>
<host name='host3' port='6789'/>
</source>
<target dev='vda' bus='virtio'/>
</disk>
</devices>
</domain>

3
tests/test_cli.py
View File

@@ -1336,6 +1336,8 @@ _CLONE_NVRAM = "--original-xml %s/clone-nvram-auto.xml" % _CLONEXMLDIR
_CLONE_NVRAM_NEWPOOL = "--original-xml %s/clone-nvram-newpool.xml" % _CLONEXMLDIR
_CLONE_NVRAM_MISSING = "--original-xml %s/clone-nvram-missing.xml" % _CLONEXMLDIR
_CLONE_EMPTY = "--original-xml %s/clone-empty.xml" % _CLONEXMLDIR
_CLONE_NET = "--original-xml %s/clone-net.xml" % _CLONEXMLDIR
vclon = App("virt-clone")
c = vclon.add_category("remote", "--connect %(URI-TEST-REMOTE)s")
@@ -1371,6 +1373,7 @@ c.add_invalid("-o test --auto-clone", grep="shutoff") # VM is running
c.add_invalid("--connect %(URI-TEST-FULL)s -o test-clone-simple -n newvm --file %(EXISTIMG1)s") # Should complain about overwriting existing file
c.add_invalid("--connect %(URI-TEST-REMOTE)s -o test-clone-simple --auto-clone --file /dev/default-pool/testvol9.img --check all=off", grep="Clone onto existing storage volume") # hit a specific error message
c.add_invalid("--connect %(URI-TEST-FULL)s -o test-clone-full --auto-clone", grep="not enough free space") # catch failure of clone path setting
c.add_invalid(_CLONE_NET + " --auto-clone", grep="'network' is not cloneable")
c = vclon.add_category("general", "-n clonetest")

2
virtinst/cloner.py
View File

@@ -174,6 +174,8 @@ def _get_cloneable_msg(disk):
"""
if disk.wants_storage_creation():
return _("Disk path '%s' does not exist.") % disk.path
if (disk.type == "network" and not disk.get_vol_object()):
return _("Disk type '%s' is not cloneable.") % disk.type
def _get_shareable_msg(disk):