j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 12:46:49 +00:00
Code Issues Projects Releases Wiki Activity

fix(instances): the Migrate tab keeps disks of one file name apart

Browse source 
Two disks of a VM with the same file name in different directories
were both offered the same destination pool by default. The form was
sent, and the migration job refused it only then: both copies would
be one file.

The plan now gives each such disk, by default, a pool no earlier disk
of that name is copied into, and says under its choice that another
disk has the file name. A choice that still puts them in one pool is
refused by the job, as before.
This commit is contained in:
catborise 2026-11-02 16:21:45 +03:00
parent b89672169f
commit 5d1269666b
4 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
vrtManager/tests/test_migration.py
View file

@ -512,6 +512,23 @@ class MigrationPlanTestCase(unittest.TestCase):
dest._find_volume = lambda pool, name: object() if pool is pools["default"][0] else None
disks, pending = dest.migration_plan(None, "live", "next")
self.assertEqual((disks[0]["free_pools"], disks[0]["default"]), (["fast", "slow"], "fast"))
self.assertFalse(disks[0]["same_name"])
self.assertEqual(pending, [vdb])
for pool, directory in pools.values():
pool.refresh.assert_called_once_with(0) # a file made since is seen
def test_disks_of_one_file_name_go_to_different_pools(self):
dest = wvmInstances.__new__(wvmInstances)
pools = {"fast": (mock.MagicMock(), "/srv/fast"), "slow": (mock.MagicMock(), "/srv/slow")}
dest.file_pools = lambda: pools
dest._find_volume = lambda pool, name: None
rows = [{"target": "vda", "path": "/x/data.qcow2", "shared": False, "refusal": None},
{"target": "vdb", "path": "/nfs/data.qcow2", "shared": True, "refusal": None},
{"target": "vdc", "path": "/y/data.qcow2", "shared": False, "refusal": None},
{"target": "vdd", "path": "/z/data.qcow2", "shared": False, "refusal": None},
{"target": "vde", "path": "/x/os.qcow2", "shared": False, "refusal": None}]
dest.disk_plan = lambda conn, xml: [dict(row) for row in rows]
disks, pending = dest.migration_plan(None, "live", "next")
# the shared disk stays where it is by default: it takes no pool; the fourth finds none left
self.assertEqual([disk["default"] for disk in disks if not disk["shared"]], ["fast", "slow", None, "fast"])
self.assertEqual([disk["same_name"] for disk in disks], [True, True, True, True, False])