ironic-python-agent 10.2.1__py3-none-any.whl → 10.2.2__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3057,9 +3057,11 @@ class GenericHardwareManager(HardwareManager):
3057
3057
 
3058
3058
  parted_start_dict[device] = end
3059
3059
 
3060
- # Create the RAID devices.
3060
+ # Create the RAID devices. The indices mapping tracks the last used
3061
+ # partition index for each physical device.
3062
+ indices = {}
3061
3063
  for index, logical_disk in enumerate(logical_disks):
3062
- raid_utils.create_raid_device(index, logical_disk)
3064
+ raid_utils.create_raid_device(index, logical_disk, indices)
3063
3065
 
3064
3066
  LOG.info("Successfully created Software RAID")
3065
3067
 
@@ -3354,6 +3356,8 @@ class GenericHardwareManager(HardwareManager):
3354
3356
  size2 = logical_disks[1]['size_gb']
3355
3357
 
3356
3358
  # Only one logical disk is allowed to span the whole device.
3359
+ # FIXME(dtantsur): this logic is not correct when logical disks use
3360
+ # different physical devices.
3357
3361
  if size1 == 'MAX' and size2 == 'MAX':
3358
3362
  msg = ("Software RAID can have only one RAID device with "
3359
3363
  "size 'MAX'")
@@ -202,24 +202,31 @@ def _get_actual_component_devices(raid_device):
202
202
  return component_devices
203
203
 
204
204
 
205
- def create_raid_device(index, logical_disk):
205
+ def create_raid_device(index, logical_disk, indices=None):
206
206
  """Create a raid device.
207
207
 
208
208
  :param index: the index of the resulting md device.
209
209
  :param logical_disk: the logical disk containing the devices used to
210
210
  crete the raid.
211
+ :param indices: Mapping to track the last used partition index for each
212
+ physical device across calls to create_raid_device.
211
213
  :raise: errors.SoftwareRAIDError if not able to create the raid device
212
214
  or fails to re-add a device to a raid.
213
215
  """
214
216
  md_device = '/dev/md%d' % index
215
217
  component_devices = []
218
+ if indices is None:
219
+ # Backward compatibility with custom hardware managers
220
+ indices = {dev: index for dev in logical_disk['block_devices']}
216
221
  for device in logical_disk['block_devices']:
217
222
  # The partition delimiter for all common harddrives (sd[a-z]+)
218
223
  part_delimiter = ''
219
224
  if 'nvme' in device:
220
225
  part_delimiter = 'p'
226
+ index_on_device = indices.get(device, 0)
221
227
  component_devices.append(
222
- device + part_delimiter + str(index + RAID_PARTITION))
228
+ device + part_delimiter + str(index_on_device + RAID_PARTITION))
229
+ indices[device] = index_on_device + 1
223
230
  raid_level = logical_disk['raid_level']
224
231
  # The schema check allows '1+0', but mdadm knows it as '10'.
225
232
  if raid_level == '1+0':
@@ -4308,6 +4308,117 @@ class TestGenericHardwareManager(base.IronicAgentTest):
4308
4308
  mock.call(x) for x in ['/dev/sda', '/dev/sdb']
4309
4309
  ])
4310
4310
 
4311
+ @mock.patch.object(raid_utils, '_get_actual_component_devices',
4312
+ autospec=True)
4313
+ @mock.patch.object(utils, 'get_node_boot_mode', lambda node: 'bios')
4314
+ @mock.patch.object(disk_utils, 'list_partitions', autospec=True,
4315
+ return_value=[])
4316
+ @mock.patch.object(utils, 'execute', autospec=True)
4317
+ def test_create_configuration_with_different_disks(self, mocked_execute,
4318
+ mock_list_parts,
4319
+ mocked_actual_comp):
4320
+ node = self.node
4321
+ raid_config = {
4322
+ "logical_disks": [
4323
+ {
4324
+ "size_gb": "10",
4325
+ "raid_level": "1",
4326
+ "controller": "software",
4327
+ "physical_disks": [{'name': '/dev/sda'},
4328
+ {'name': '/dev/sdb'}],
4329
+ },
4330
+ {
4331
+ "size_gb": "MAX",
4332
+ "raid_level": "0",
4333
+ "controller": "software",
4334
+ "physical_disks": [{'name': '/dev/sdc'},
4335
+ {'name': '/dev/sdd'}],
4336
+ },
4337
+ ]
4338
+ }
4339
+ node['target_raid_config'] = raid_config
4340
+ device1 = hardware.BlockDevice('/dev/sda', 'sda', 107374182400, True)
4341
+ device2 = hardware.BlockDevice('/dev/sdb', 'sdb', 107374182400, True)
4342
+ device3 = hardware.BlockDevice('/dev/sdc', 'sdc', 107374182400, True)
4343
+ device4 = hardware.BlockDevice('/dev/sdd', 'sdd', 107374182400, True)
4344
+ self.hardware.list_block_devices = mock.Mock()
4345
+ self.hardware.list_block_devices.return_value = [
4346
+ device1,
4347
+ device2,
4348
+ device3,
4349
+ device4,
4350
+ ]
4351
+
4352
+ mocked_execute.side_effect = [
4353
+ None, # mklabel sda
4354
+ ('42', None), # sgdisk -F sda
4355
+ None, # mklabel sda
4356
+ ('42', None), # sgdisk -F sdb
4357
+ None, # mklabel sdc
4358
+ ('42', None), # sgdisk -F sdc
4359
+ None, # mklabel sdd
4360
+ ('42', None), # sgdisk -F sdd
4361
+ None, None, None, # parted + partx + udevadm_settle sda
4362
+ None, None, None, # parted + partx + udevadm_settle sdb
4363
+ None, None, None, # parted + partx + udevadm_settle sdc
4364
+ None, None, None, # parted + partx + udevadm_settle sdd
4365
+ None, None, None, # parted + partx + udevadm_settle sda
4366
+ None, None, None, # parted + partx + udevadm_settle sdb
4367
+ None, None, None, # parted + partx + udevadm_settle sdc
4368
+ None, None, None, # parted + partx + udevadm_settle sdd
4369
+ None, None # mdadms
4370
+ ]
4371
+
4372
+ mocked_actual_comp.side_effect = [
4373
+ ('/dev/sda1', '/dev/sdb1'),
4374
+ ('/dev/sdc1', '/dev/sdd1'),
4375
+ ]
4376
+
4377
+ result = self.hardware.create_configuration(node, [])
4378
+
4379
+ mocked_execute.assert_has_calls([
4380
+ mock.call('parted', '/dev/sda', '-s', '--', 'mklabel', 'msdos'),
4381
+ mock.call('sgdisk', '-F', '/dev/sda'),
4382
+ mock.call('parted', '/dev/sdb', '-s', '--', 'mklabel', 'msdos'),
4383
+ mock.call('sgdisk', '-F', '/dev/sdb'),
4384
+ mock.call('parted', '/dev/sdc', '-s', '--', 'mklabel', 'msdos'),
4385
+ mock.call('sgdisk', '-F', '/dev/sdc'),
4386
+ mock.call('parted', '/dev/sdd', '-s', '--', 'mklabel', 'msdos'),
4387
+ mock.call('sgdisk', '-F', '/dev/sdd'),
4388
+ mock.call('parted', '/dev/sda', '-s', '-a', 'optimal', '--',
4389
+ 'mkpart', 'primary', '42s', '10GiB'),
4390
+ mock.call('partx', '-av', '/dev/sda', attempts=3,
4391
+ delay_on_retry=True),
4392
+ mock.call('udevadm', 'settle'),
4393
+ mock.call('parted', '/dev/sdb', '-s', '-a', 'optimal', '--',
4394
+ 'mkpart', 'primary', '42s', '10GiB'),
4395
+ mock.call('partx', '-av', '/dev/sdb', attempts=3,
4396
+ delay_on_retry=True),
4397
+ mock.call('udevadm', 'settle'),
4398
+ mock.call('parted', '/dev/sdc', '-s', '-a', 'optimal', '--',
4399
+ 'mkpart', 'primary', '42s', '-1'),
4400
+ mock.call('partx', '-av', '/dev/sdc', attempts=3,
4401
+ delay_on_retry=True),
4402
+ mock.call('udevadm', 'settle'),
4403
+ mock.call('parted', '/dev/sdd', '-s', '-a', 'optimal', '--',
4404
+ 'mkpart', 'primary', '42s', '-1'),
4405
+ mock.call('partx', '-av', '/dev/sdd', attempts=3,
4406
+ delay_on_retry=True),
4407
+ mock.call('udevadm', 'settle'),
4408
+ mock.call('mdadm', '--create', '/dev/md0', '--force', '--run',
4409
+ '--metadata=1', '--level', '1', '--name', 'md0',
4410
+ '--raid-devices', 2, '/dev/sda1', '/dev/sdb1'),
4411
+ mock.call('mdadm', '--create', '/dev/md1', '--force', '--run',
4412
+ '--metadata=1', '--level', '0', '--name', 'md1',
4413
+ '--raid-devices', 2, '/dev/sdc1', '/dev/sdd1')])
4414
+ self.assertEqual(raid_config, result)
4415
+
4416
+ self.assertEqual(4, mock_list_parts.call_count)
4417
+ mock_list_parts.assert_has_calls([
4418
+ mock.call(x) for x in ['/dev/sda', '/dev/sdb',
4419
+ '/dev/sdc', '/dev/sdd']
4420
+ ])
4421
+
4311
4422
  @mock.patch.object(utils, 'execute', autospec=True)
4312
4423
  @mock.patch.object(os.path, 'isdir', autospec=True, return_value=False)
4313
4424
  def test_create_configuration_invalid_raid_config(self,
@@ -52,7 +52,7 @@ class TestRaidUtils(base.IronicAgentTest):
52
52
  '/dev/sdb1',
53
53
  '/dev/sdc1']
54
54
 
55
- raid_utils.create_raid_device(0, logical_disk)
55
+ raid_utils.create_raid_device(0, logical_disk, {})
56
56
 
57
57
  mock_execute.assert_called_once_with(
58
58
  'mdadm', '--create', '/dev/md0', '--force', '--run',
@@ -73,7 +73,7 @@ class TestRaidUtils(base.IronicAgentTest):
73
73
  '/dev/sdb1',
74
74
  '/dev/sdc1']
75
75
 
76
- raid_utils.create_raid_device(0, logical_disk)
76
+ raid_utils.create_raid_device(0, logical_disk, {})
77
77
 
78
78
  mock_execute.assert_called_once_with(
79
79
  'mdadm', '--create', '/dev/md0', '--force', '--run',
@@ -92,7 +92,7 @@ class TestRaidUtils(base.IronicAgentTest):
92
92
  mocked_components.return_value = ['/dev/sda1',
93
93
  '/dev/sdc1']
94
94
 
95
- raid_utils.create_raid_device(0, logical_disk)
95
+ raid_utils.create_raid_device(0, logical_disk, {})
96
96
 
97
97
  expected_calls = [
98
98
  mock.call('mdadm', '--create', '/dev/md0', '--force', '--run',
@@ -105,6 +105,29 @@ class TestRaidUtils(base.IronicAgentTest):
105
105
  self.assertEqual(mock_execute.call_count, 2)
106
106
  mock_execute.assert_has_calls(expected_calls)
107
107
 
108
+ @mock.patch.object(raid_utils, '_get_actual_component_devices',
109
+ autospec=True)
110
+ @mock.patch.object(utils, 'execute', autospec=True)
111
+ def test_create_raid_device_with_indices(self, mock_execute,
112
+ mocked_components):
113
+ indices = {'/dev/sda': 1, '/dev/sdb': 2}
114
+ logical_disk = {
115
+ "block_devices": ['/dev/sda', '/dev/sdb', '/dev/sdc'],
116
+ "raid_level": "1",
117
+ }
118
+ mocked_components.return_value = ['/dev/sda2',
119
+ '/dev/sdb3',
120
+ '/dev/sdc1']
121
+
122
+ raid_utils.create_raid_device(0, logical_disk, indices)
123
+
124
+ mock_execute.assert_called_once_with(
125
+ 'mdadm', '--create', '/dev/md0', '--force', '--run',
126
+ '--metadata=1', '--level', '1', '--name', 'md0',
127
+ '--raid-devices', 3, '/dev/sda2', '/dev/sdb3', '/dev/sdc1')
128
+ self.assertEqual(
129
+ {'/dev/sda': 2, '/dev/sdb': 3, '/dev/sdc': 1}, indices)
130
+
108
131
  @mock.patch.object(utils, 'execute', autospec=True)
109
132
  def test_create_raid_device_fail_create_device(self, mock_execute):
110
133
  logical_disk = {
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ironic-python-agent
3
- Version: 10.2.1
3
+ Version: 10.2.2
4
4
  Summary: Ironic Python Agent Ramdisk
5
5
  Home-page: https://docs.openstack.org/ironic-python-agent/
6
6
  Author: OpenStack
@@ -9,7 +9,7 @@ ironic_python_agent/dmi_inspector.py,sha256=wyTdUFuwx7tKUuLR64OfF7c3QdQ8ILb6lrS4
9
9
  ironic_python_agent/efi_utils.py,sha256=lEEFPlh_qHNvjtDHfmmxKbdb4F0T8W0K1ZLj2u35lmI,16742
10
10
  ironic_python_agent/encoding.py,sha256=ifMKd3dW_hRCHz-JCcovdXnzwu4XkLKtknriaUZeijo,2345
11
11
  ironic_python_agent/errors.py,sha256=j2ZZjQfqlqAU73bpNJTyuQpGlLvyRXvnQcLcdDm6h-U,13547
12
- ironic_python_agent/hardware.py,sha256=295ubXHlGrMXINwJz4sqXFNkcfRBm7firR-m3nt4XSE,161867
12
+ ironic_python_agent/hardware.py,sha256=BrjwY3YPpix2SyJzvgKbmXlXh6Xb0uniptDwuBz-ImY,162112
13
13
  ironic_python_agent/inject_files.py,sha256=iEt_wdXHRPioLgUpCm1VABXOodefx0vJMy3hR6e_4bo,9412
14
14
  ironic_python_agent/inspect.py,sha256=3vl67DSIPU82qHilapbYdyiVwQs9CDU2XQLLdWRz2t4,5113
15
15
  ironic_python_agent/inspector.py,sha256=AQ0qkdSFUUREMExTjR8sUFAUqcJbt-K32sY5GxAwYAQ,16195
@@ -19,7 +19,7 @@ ironic_python_agent/netutils.py,sha256=vM6TSwSGLB9lGW_qqr2DXpwVBmFOsrqzFvv8bzP1T
19
19
  ironic_python_agent/numa_inspector.py,sha256=nKyEhV0HzHeQe6HceoyBy8QGoJqBoy5xlv5vPBBRdh0,10331
20
20
  ironic_python_agent/partition_utils.py,sha256=FWDNNjYUYEun2AMDfPpJ2rbNjMG8K09yl896JEWwjdw,32040
21
21
  ironic_python_agent/qemu_img.py,sha256=qS4tRfwd1wwJQ8HW4NVJoafP1WUM4QZ0gWTTZzm3MgQ,5953
22
- ironic_python_agent/raid_utils.py,sha256=Hmu-Wpc2Oa0E4KHTV4TKJd6WujD_JtqziLVplxQG6mg,18256
22
+ ironic_python_agent/raid_utils.py,sha256=RKHcfQKAXjpNzWjRyeucJzZArDRy87Tetl_BYKaItVw,18670
23
23
  ironic_python_agent/tls_utils.py,sha256=K0bjcc08aFJZwlJfXZ6d1Qwrom_OplaMmjcQHt5x89A,4813
24
24
  ironic_python_agent/utils.py,sha256=ydH7EySJFFgTs4mwIPRsUXnuUw-naOD2exfzJaiIQXo,43151
25
25
  ironic_python_agent/version.py,sha256=7EinnHTBHWpbgJF5yaobeBEKiwTq1nfXxeDMFIMz_c4,754
@@ -67,7 +67,7 @@ ironic_python_agent/tests/unit/test_dmi_inspector.py,sha256=vbobkICrQ97e5gEARikc
67
67
  ironic_python_agent/tests/unit/test_efi_utils.py,sha256=Ypi8T6vwXRIAEXI8_IUHKIQCG7dO_b54cObK-G0pLVE,33251
68
68
  ironic_python_agent/tests/unit/test_encoding.py,sha256=7qDOTlT4LsYVRnyluvdulwifl0EgykZOzLoLPx5y9ek,2408
69
69
  ironic_python_agent/tests/unit/test_errors.py,sha256=bm0kDx7BshIdeuQK3Hm-2sAHUGkPehCELKZEsDRQv5c,6022
70
- ironic_python_agent/tests/unit/test_hardware.py,sha256=kTqbJJKl6XsE7nfYeI4y2pvxs08D2Q8qFIgKVQ35oJQ,328220
70
+ ironic_python_agent/tests/unit/test_hardware.py,sha256=6TNQftRF5b4VWtUFkoImsRfBtoOgtISkAOplbPoUH_g,333552
71
71
  ironic_python_agent/tests/unit/test_inject_files.py,sha256=Wt-t_eWAywe02EvuqSTGCsJuRpLMQWw5HpTVWuBEPIw,17870
72
72
  ironic_python_agent/tests/unit/test_inspector.py,sha256=fgB47r69RdPilZkD1CBItoUfVi7bRtOl9xmL-bO-pnU,29903
73
73
  ironic_python_agent/tests/unit/test_ironic_api_client.py,sha256=kw-FLld0138qMZ752hfaMSjG-PxscOuijG3NNbiIkbk,24787
@@ -78,7 +78,7 @@ ironic_python_agent/tests/unit/test_netutils.py,sha256=j8-8uomt63KARAU3kCKFdec9i
78
78
  ironic_python_agent/tests/unit/test_numa_inspector.py,sha256=72n8433-Dk_V8QwqMK78hE5cl_cR9hhMKHL7YoMN2_E,18131
79
79
  ironic_python_agent/tests/unit/test_partition_utils.py,sha256=J-hZ2abHlN3_if__hZnil-50oQtlk8ol6vqJ2Pw1HB4,77441
80
80
  ironic_python_agent/tests/unit/test_qemu_img.py,sha256=BBF5zIL7xEtipHu5GE0I1_4yU1Dt-AqUrF1Lv5Ag0cA,14367
81
- ironic_python_agent/tests/unit/test_raid_utils.py,sha256=esGXw-PDozy6YCOdkkplcC1wPqyMvGMg4rzR3zN_tCQ,18393
81
+ ironic_python_agent/tests/unit/test_raid_utils.py,sha256=3b9w35jnQyziLqLY7ke-MJNfK4D2H4XhZTOeiu3YVLg,19449
82
82
  ironic_python_agent/tests/unit/test_tls_utils.py,sha256=myan7nx0-LVQOz1QEuiG18fxJIuz_U85CmXE99LEpoo,3543
83
83
  ironic_python_agent/tests/unit/test_utils.py,sha256=nlr5MkPJRgsCbfmdUhFYfsS5xy-Q1sCnnmKZYxYC9sc,61762
84
84
  ironic_python_agent/tests/unit/extensions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -102,11 +102,11 @@ ironic_python_agent/tests/unit/metrics_lib/test_metrics_collector.py,sha256=0Q2g
102
102
  ironic_python_agent/tests/unit/metrics_lib/test_metrics_statsd.py,sha256=REiOILpW3Xx29y20O2e89kiPRw3gGbFvHJ3w1VSEixo,3924
103
103
  ironic_python_agent/tests/unit/metrics_lib/test_metrics_utils.py,sha256=uXfuzTZqkete3NGd9_CpZdv2tRt84xcaK_rd5zFlbCs,4548
104
104
  ironic_python_agent/tests/unit/samples/hardware_samples.py,sha256=MnnyiRY6ozDZvdFIU_3jGCYRASggJZcgiJynucmTik8,59286
105
- ironic_python_agent-10.2.1.dist-info/AUTHORS,sha256=wTRwJlhEpitFjBci0dCJSP30IAzwsLEU7EX_GICAyCc,8612
106
- ironic_python_agent-10.2.1.dist-info/LICENSE,sha256=eYI6Jl-hPXZGT4fIcb4joP6fMoYRKf_oONHtLMiPfkQ,561
107
- ironic_python_agent-10.2.1.dist-info/METADATA,sha256=8pQLbkbMv_XSq-LYiB45i4gY1HQmZxu_3VdnLNzAdVY,3865
108
- ironic_python_agent-10.2.1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
109
- ironic_python_agent-10.2.1.dist-info/entry_points.txt,sha256=-UCKTguVlj1FATKoa0LN3Cz48L5s0CkUt_XGOl6-IMQ,1674
110
- ironic_python_agent-10.2.1.dist-info/pbr.json,sha256=WrlsX3rzv42U7c-ooHhsh4zuOstMqOMS_Z926VFAvhw,47
111
- ironic_python_agent-10.2.1.dist-info/top_level.txt,sha256=4UvmXY2TkynkLeFUThJX8rC4AWARHl7GtqmajaXD-tw,20
112
- ironic_python_agent-10.2.1.dist-info/RECORD,,
105
+ ironic_python_agent-10.2.2.dist-info/AUTHORS,sha256=wTRwJlhEpitFjBci0dCJSP30IAzwsLEU7EX_GICAyCc,8612
106
+ ironic_python_agent-10.2.2.dist-info/LICENSE,sha256=eYI6Jl-hPXZGT4fIcb4joP6fMoYRKf_oONHtLMiPfkQ,561
107
+ ironic_python_agent-10.2.2.dist-info/METADATA,sha256=axdKU6cU8J4Rg9ZbCTVH2SlOc3Z3apmasWZe_crXxLQ,3865
108
+ ironic_python_agent-10.2.2.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
109
+ ironic_python_agent-10.2.2.dist-info/entry_points.txt,sha256=-UCKTguVlj1FATKoa0LN3Cz48L5s0CkUt_XGOl6-IMQ,1674
110
+ ironic_python_agent-10.2.2.dist-info/pbr.json,sha256=gahWg6K6A-ABptLhJG9jmpyvASlcswUNEvH2ldgEhis,47
111
+ ironic_python_agent-10.2.2.dist-info/top_level.txt,sha256=4UvmXY2TkynkLeFUThJX8rC4AWARHl7GtqmajaXD-tw,20
112
+ ironic_python_agent-10.2.2.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "1492c705", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "797c3f3e", "is_release": true}