Peter Pentchev | 5a9f8a6 | 2023-12-06 10:40:18 +0200 | [diff] [blame] | 1 | From 2835c8aeb39313e927a4c13a7ce78d5386c4d909 Mon Sep 17 00:00:00 2001 |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 2 | From: Peter Penchev <openstack-dev@storpool.com> |
| 3 | Date: Tue, 17 Jan 2023 01:20:59 +0200 |
Peter Pentchev | 5a9f8a6 | 2023-12-06 10:40:18 +0200 | [diff] [blame] | 4 | Subject: [PATCH 05/10] StorPool: fix the "rename volume" unit test emulation |
Peter Pentchev | 844a5d9 | 2023-01-17 03:07:56 +0200 | [diff] [blame] | 5 | |
| 6 | Also update the "name" field of the actual data structure in |
| 7 | the fake list of volumes. |
| 8 | |
| 9 | Change-Id: Iee9e3feea1af4f3d0acdf05ea1b540ecf59e755b |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 10 | --- |
| 11 | cinder/tests/unit/volume/drivers/test_storpool.py | 7 ++++++- |
| 12 | 1 file changed, 6 insertions(+), 1 deletion(-) |
| 13 | |
| 14 | diff --git a/cinder/tests/unit/volume/drivers/test_storpool.py b/cinder/tests/unit/volume/drivers/test_storpool.py |
| 15 | index 2e6f56526..f878c6d26 100644 |
Peter Pentchev | 844a5d9 | 2023-01-17 03:07:56 +0200 | [diff] [blame] | 16 | --- a/cinder/tests/unit/volume/drivers/test_storpool.py |
| 17 | +++ b/cinder/tests/unit/volume/drivers/test_storpool.py |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 18 | @@ -135,7 +135,10 @@ class MockAPI(object): |
Peter Pentchev | 844a5d9 | 2023-01-17 03:07:56 +0200 | [diff] [blame] | 19 | volumes[name]['size'] = data['size'] |
| 20 | |
| 21 | if 'rename' in data and data['rename'] != name: |
| 22 | - volumes[data['rename']] = volumes[name] |
| 23 | + new_name = data['rename'] |
| 24 | + volumes[new_name] = volumes[name] |
| 25 | + if volumes[new_name]['name'] == name: |
| 26 | + volumes[new_name]['name'] = new_name |
| 27 | del volumes[name] |
| 28 | |
| 29 | |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 30 | @@ -259,6 +262,8 @@ class StorPoolTestCase(test.TestCase): |
Peter Pentchev | 844a5d9 | 2023-01-17 03:07:56 +0200 | [diff] [blame] | 31 | def assertVolumeNames(self, names): |
| 32 | self.assertListEqual(sorted([volumeName(n) for n in names]), |
| 33 | sorted(volumes.keys())) |
| 34 | + self.assertListEqual(sorted([volumeName(n) for n in names]), |
| 35 | + sorted(data['name'] for data in volumes.values())) |
| 36 | |
| 37 | @mock_volume_types |
| 38 | def test_create_delete_volume(self): |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 39 | -- |
Peter Pentchev | 5a9f8a6 | 2023-12-06 10:40:18 +0200 | [diff] [blame] | 40 | 2.42.0 |
Peter Pentchev | fad59c6 | 2023-01-17 08:44:27 +0200 | [diff] [blame] | 41 | |