ironic-python-agent 10.2.0__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'")
@@ -34,6 +34,13 @@ LLDP_ETHERTYPE = 0x88cc
34
34
  IFF_PROMISC = 0x100
35
35
  SIOCGIFFLAGS = 0x8913
36
36
  SIOCSIFFLAGS = 0x8914
37
+ # SIOCETHTOOL from linux/sockios.h
38
+ SIOCETHTOOL = 0x8946
39
+ # ETHTOOL_GPERMADDR from linux/ethtool.h
40
+ ETHTOOL_GPERMADDR = 0x00000020
41
+ # MAX_ADDR_LEN from linux/netdevice.h
42
+ MAX_ADDR_LEN = 32
43
+
37
44
  INFINIBAND_ADDR_LEN = 59
38
45
 
39
46
  # LLDP definitions needed to extract vlan information
@@ -45,10 +52,25 @@ dot1_VLAN_NAME = "03"
45
52
  VLAN_ID_LEN = len(LLDP_802dot1_OUI + dot1_VLAN_NAME)
46
53
 
47
54
 
55
+ class ethtoolPermAddr(ctypes.Structure):
56
+ """Class for getting interface permanent MAC address"""
57
+ _fields_ = [("cmd", ctypes.c_uint32),
58
+ ("size", ctypes.c_uint32),
59
+ ("data", ctypes.c_uint8 * MAX_ADDR_LEN)]
60
+
61
+
62
+ class ifreq_data(ctypes.Union):
63
+ _fields_ = [("ifr_flags", ctypes.c_short),
64
+ (
65
+ "ifr_data_ethtool_perm_addr",
66
+ ctypes.POINTER(ethtoolPermAddr))]
67
+
68
+
48
69
  class ifreq(ctypes.Structure):
49
- """Class for setting flags on a socket."""
70
+ """Class for ioctl on socket."""
71
+ _anonymous_ = ("ifr_data",)
50
72
  _fields_ = [("ifr_ifrn", ctypes.c_char * 16),
51
- ("ifr_flags", ctypes.c_short)]
73
+ ("ifr_data", ifreq_data)]
52
74
 
53
75
 
54
76
  class RawPromiscuousSockets(object):
@@ -236,6 +258,23 @@ def get_ipv6_addr(interface_id):
236
258
 
237
259
 
238
260
  def get_mac_addr(interface_id):
261
+ """Retrieve permanent mac address, if unable to fallback to default one"""
262
+ try:
263
+ data = ethtoolPermAddr(cmd=ETHTOOL_GPERMADDR, size=MAX_ADDR_LEN)
264
+ ifr = ifreq(ifr_ifrn=interface_id.encode())
265
+ ifr.ifr_data_ethtool_perm_addr = ctypes.pointer(data)
266
+ sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0)
267
+ fcntl.ioctl(sock.fileno(), SIOCETHTOOL, ifr)
268
+ # if not full of zeros
269
+ if any(data.data[:data.size]):
270
+ # kernel updates size to actual address size during ioctl call
271
+ permaddr = [f'{b:02x}' for b in data.data[:data.size]]
272
+ return ':'.join(permaddr)
273
+ except OSError:
274
+ pass
275
+ LOG.warning("Failed to get permanent mac address for interface %s, "
276
+ "falling back to default mac address",
277
+ interface_id)
239
278
  return get_default_ip_addr(socket.AF_PACKET, interface_id)
240
279
 
241
280
 
@@ -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,
@@ -6279,6 +6390,7 @@ class TestCollectSystemLogs(base.IronicAgentTest):
6279
6390
  FakeAddr = namedtuple('FakeAddr', ('family', 'address'))
6280
6391
 
6281
6392
 
6393
+ @mock.patch.object(netutils, 'get_mac_addr', autospec=True)
6282
6394
  @mock.patch.object(hardware.GenericHardwareManager, '_get_system_lshw_dict',
6283
6395
  autospec=True, return_value={'id': 'host'})
6284
6396
  @mock.patch.object(hardware, 'get_managers', autospec=True,
@@ -6303,7 +6415,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6303
6415
  mocked_listdir,
6304
6416
  mocked_net_if_addrs,
6305
6417
  mockedget_managers,
6306
- mocked_lshw):
6418
+ mocked_lshw,
6419
+ mocked_get_mac_addr):
6307
6420
  mocked_lshw.return_value = json.loads(hws.LSHW_JSON_OUTPUT_V2[0])
6308
6421
  mocked_listdir.return_value = ['lo', 'eth0', 'foobar']
6309
6422
  mocked_exists.side_effect = [False, False, True, True]
@@ -6327,6 +6440,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6327
6440
  FakeAddr(socket.AF_INET6, 'fd00:1000::101')
6328
6441
  ]
6329
6442
  }
6443
+ mocked_get_mac_addr.side_effect = lambda iface: {
6444
+ 'lo': '00:00:00:00:00:00',
6445
+ 'eth0': '00:0c:29:8c:11:b1',
6446
+ }.get(iface)
6330
6447
  mocked_execute.return_value = ('em0\n', '')
6331
6448
  mock_has_carrier.return_value = True
6332
6449
  interfaces = self.hardware.list_network_interfaces()
@@ -6348,7 +6465,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6348
6465
  mocked_listdir,
6349
6466
  mocked_net_if_addrs,
6350
6467
  mockedget_managers,
6351
- mocked_lshw):
6468
+ mocked_lshw,
6469
+ mocked_get_mac_addr):
6352
6470
  mocked_listdir.return_value = ['lo', 'eth0']
6353
6471
  mocked_exists.side_effect = [False, False, True]
6354
6472
  mocked_open.return_value.__enter__ = lambda s: s
@@ -6367,6 +6485,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6367
6485
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6368
6486
  ]
6369
6487
  }
6488
+ mocked_get_mac_addr.side_effect = lambda iface: {
6489
+ 'lo': '00:00:00:00:00:00',
6490
+ 'eth0': '00:0c:29:8c:11:b1',
6491
+ }.get(iface)
6370
6492
  mocked_execute.return_value = ('em0\n', '')
6371
6493
  mock_has_carrier.return_value = True
6372
6494
  interfaces = self.hardware.list_network_interfaces()
@@ -6390,7 +6512,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6390
6512
  mocked_listdir,
6391
6513
  mocked_net_if_addrs,
6392
6514
  mockedget_managers,
6393
- mocked_lshw):
6515
+ mocked_lshw,
6516
+ mocked_get_mac_addr):
6394
6517
  CONF.set_override('collect_lldp', True)
6395
6518
  mocked_listdir.return_value = ['lo', 'eth0']
6396
6519
  mocked_exists.side_effect = [False, False, True]
@@ -6410,6 +6533,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6410
6533
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6411
6534
  ]
6412
6535
  }
6536
+ mocked_get_mac_addr.side_effect = lambda iface: {
6537
+ 'lo': '00:00:00:00:00:00',
6538
+ 'eth0': '00:0c:29:8c:11:b1',
6539
+ }.get(iface)
6413
6540
  mocked_lldp_info.return_value = {'eth0': [
6414
6541
  (0, b''),
6415
6542
  (1, b'\x04\x88Z\x92\xecTY'),
@@ -6444,7 +6571,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6444
6571
  mocked_listdir,
6445
6572
  mocked_net_if_addrs,
6446
6573
  mockedget_managers,
6447
- mocked_lshw):
6574
+ mocked_lshw,
6575
+ mocked_get_mac_addr):
6448
6576
  CONF.set_override('collect_lldp', True)
6449
6577
  mocked_listdir.return_value = ['lo', 'eth0']
6450
6578
  mocked_exists.side_effect = [False, False, True]
@@ -6464,6 +6592,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6464
6592
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6465
6593
  ]
6466
6594
  }
6595
+ mocked_get_mac_addr.side_effect = lambda iface: {
6596
+ 'lo': '00:00:00:00:00:00',
6597
+ 'eth0': '00:0c:29:8c:11:b1',
6598
+ }.get(iface)
6467
6599
  mocked_lldp_info.side_effect = Exception('Boom!')
6468
6600
  mocked_execute.return_value = ('em0\n', '')
6469
6601
  mock_has_carrier.return_value = True
@@ -6485,7 +6617,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6485
6617
  mocked_listdir,
6486
6618
  mocked_net_if_addrs,
6487
6619
  mockedget_managers,
6488
- mocked_lshw):
6620
+ mocked_lshw,
6621
+ mocked_get_mac_addr):
6489
6622
 
6490
6623
  mockedget_managers.return_value = [hardware.GenericHardwareManager()]
6491
6624
  mocked_listdir.return_value = ['lo', 'eth0']
@@ -6506,6 +6639,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6506
6639
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6507
6640
  ]
6508
6641
  }
6642
+ mocked_get_mac_addr.side_effect = lambda iface: {
6643
+ 'lo': '00:00:00:00:00:00',
6644
+ 'eth0': '00:0c:29:8c:11:b1',
6645
+ }.get(iface)
6509
6646
  mocked_execute.return_value = ('em0\n', '')
6510
6647
  mock_has_carrier.return_value = False
6511
6648
  interfaces = self.hardware.list_network_interfaces()
@@ -6526,7 +6663,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6526
6663
  mocked_listdir,
6527
6664
  mocked_net_if_addrs,
6528
6665
  mockedget_managers,
6529
- mocked_lshw):
6666
+ mocked_lshw,
6667
+ mocked_get_mac_addr):
6530
6668
  mocked_listdir.return_value = ['lo', 'eth0']
6531
6669
  mocked_exists.side_effect = [False, False, True]
6532
6670
  mocked_open.return_value.__enter__ = lambda s: s
@@ -6546,6 +6684,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6546
6684
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6547
6685
  ]
6548
6686
  }
6687
+ mocked_get_mac_addr.side_effect = lambda iface: {
6688
+ 'lo': '00:00:00:00:00:00',
6689
+ 'eth0': '00:0c:29:8c:11:b1',
6690
+ }.get(iface)
6549
6691
  mocked_execute.return_value = ('em0\n', '')
6550
6692
  mock_has_carrier.return_value = True
6551
6693
  interfaces = self.hardware.list_network_interfaces()
@@ -6567,7 +6709,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6567
6709
  mocked_listdir,
6568
6710
  mocked_net_if_addrs,
6569
6711
  mockedget_managers,
6570
- mocked_lshw):
6712
+ mocked_lshw,
6713
+ mocked_get_mac_addr):
6571
6714
  mocked_listdir.return_value = ['lo', 'bond0']
6572
6715
  mocked_exists.side_effect = [False, False, True]
6573
6716
  mocked_open.return_value.__enter__ = lambda s: s
@@ -6586,6 +6729,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6586
6729
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6587
6730
  ]
6588
6731
  }
6732
+ mocked_get_mac_addr.side_effect = lambda iface: {
6733
+ 'lo': '00:00:00:00:00:00',
6734
+ 'bond0': '00:0c:29:8c:11:b1',
6735
+ }.get(iface)
6589
6736
  mocked_execute.return_value = ('\n', '')
6590
6737
  mock_has_carrier.return_value = True
6591
6738
  interfaces = self.hardware.list_network_interfaces()
@@ -6610,7 +6757,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6610
6757
  mocked_listdir,
6611
6758
  mocked_net_if_addrs,
6612
6759
  mockedget_managers,
6613
- mocked_lshw):
6760
+ mocked_lshw,
6761
+ mocked_get_mac_addr):
6614
6762
  mocked_listdir.return_value = ['lo', 'eth0']
6615
6763
  mocked_exists.side_effect = [False, False, True]
6616
6764
  mocked_open.return_value.__enter__ = lambda s: s
@@ -6629,6 +6777,10 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6629
6777
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6630
6778
  ]
6631
6779
  }
6780
+ mocked_get_mac_addr.side_effect = lambda iface: {
6781
+ 'lo': '00:00:00:00:00:00',
6782
+ 'eth0': '00:0c:29:8c:11:b1',
6783
+ }.get(iface)
6632
6784
  mocked_execute.return_value = ('em0\n', '')
6633
6785
  mock_has_carrier.return_value = True
6634
6786
  mock_get_pci.return_value = '0000:02:00.0'
@@ -6654,7 +6806,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6654
6806
  mocked_listdir,
6655
6807
  mocked_net_if_addrs,
6656
6808
  mockedget_managers,
6657
- mocked_lshw):
6809
+ mocked_lshw,
6810
+ mocked_get_mac_addr):
6658
6811
  CONF.set_override('enable_vlan_interfaces', 'eth0.100')
6659
6812
  mocked_listdir.return_value = ['lo', 'eth0']
6660
6813
  mocked_exists.side_effect = [False, False, True]
@@ -6679,6 +6832,11 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6679
6832
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:b1')
6680
6833
  ]
6681
6834
  }
6835
+ mocked_get_mac_addr.side_effect = lambda iface: {
6836
+ 'lo': '00:00:00:00:00:00',
6837
+ 'eth0': '00:0c:29:8c:11:b1',
6838
+ 'eth0.100': '00:0c:29:8c:11:b1',
6839
+ }.get(iface)
6682
6840
  mocked_execute.return_value = ('em0\n', '')
6683
6841
  mock_has_carrier.return_value = True
6684
6842
  interfaces = self.hardware.list_network_interfaces()
@@ -6702,7 +6860,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6702
6860
  mocked_listdir,
6703
6861
  mocked_net_if_addrs,
6704
6862
  mockedget_managers,
6705
- mocked_lshw):
6863
+ mocked_lshw,
6864
+ mocked_get_mac_addr):
6706
6865
  CONF.set_override('collect_lldp', True)
6707
6866
  CONF.set_override('enable_vlan_interfaces', 'eth0')
6708
6867
  mocked_listdir.return_value = ['lo', 'eth0']
@@ -6734,6 +6893,12 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6734
6893
  FakeAddr(socket.AF_PACKET, '00:0c:29:8c:11:c2')
6735
6894
  ]
6736
6895
  }
6896
+ mocked_get_mac_addr.side_effect = lambda iface: {
6897
+ 'lo': '00:00:00:00:00:00',
6898
+ 'eth0': '00:0c:29:8c:11:b1',
6899
+ 'eth0.100': '00:0c:29:8c:11:c1',
6900
+ 'eth0.101': '00:0c:29:8c:11:c2',
6901
+ }.get(iface)
6737
6902
  mocked_lldp_info.return_value = {'eth0': [
6738
6903
  (0, b''),
6739
6904
  (127, b'\x00\x80\xc2\x03\x00d\x08vlan-100'),
@@ -6767,7 +6932,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6767
6932
  mocked_listdir,
6768
6933
  mocked_net_if_addrs,
6769
6934
  mockedget_managers,
6770
- mocked_lshw):
6935
+ mocked_lshw,
6936
+ mocked_get_mac_addr):
6771
6937
  CONF.set_override('collect_lldp', True)
6772
6938
  CONF.set_override('enable_vlan_interfaces', 'enp0s1')
6773
6939
  mocked_listdir.return_value = ['lo', 'eth0']
@@ -6805,7 +6971,8 @@ class TestListNetworkInterfaces(base.IronicAgentTest):
6805
6971
  mocked_listdir,
6806
6972
  mocked_net_if_addrs,
6807
6973
  mockedget_managers,
6808
- mocked_lshw):
6974
+ mocked_lshw,
6975
+ mocked_get_mac_addr):
6809
6976
  CONF.set_override('collect_lldp', True)
6810
6977
  CONF.set_override('enable_vlan_interfaces', 'all')
6811
6978
  mocked_listdir.return_value = ['lo', 'eth0', 'eth1']
@@ -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 = {
@@ -122,6 +122,7 @@ Nam Nguyen Hoai <namnh@vn.fujitsu.com>
122
122
  Naohiro Tamura <naohirot@jp.fujitsu.com>
123
123
  Nguyen Hai Truong <truongnh@vn.fujitsu.com>
124
124
  Nguyen Van Trung <trungnv@vn.fujitsu.com>
125
+ Nicolas Belouin <nicolas.belouin@suse.com>
125
126
  Nikolay Fedotov <nfedotov@cisco.com>
126
127
  Nisha Agarwal <agarwalnisha1980@gmail.com>
127
128
  Nisha Brahmankar <nisha.ee.iitb@gmail.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ironic-python-agent
3
- Version: 10.2.0
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,17 +9,17 @@ 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
16
16
  ironic_python_agent/ironic_api_client.py,sha256=TA4YiP558nQdv_HuhYqVj1WB2KCrLFYUge-d2H00n_4,13760
17
17
  ironic_python_agent/mdns.py,sha256=Y4GTMMQWMAuRY1Ii__oSCYnc1yeIjUMlbqn82e6bdyI,7604
18
- ironic_python_agent/netutils.py,sha256=teZTgU1Baa9kRNRzCG_INw395DA16fQQsOq55d1EzsI,14707
18
+ ironic_python_agent/netutils.py,sha256=vM6TSwSGLB9lGW_qqr2DXpwVBmFOsrqzFvv8bzP1TeA,16193
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=twa27fVSWgmk3zEio_A42TBpfh_UeX07hfGW22fCbsE,325593
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.0.dist-info/AUTHORS,sha256=AWi__zpvV28CrcOPWm8_xxLZOa1HBTuF2O4d0kyWQ-o,8569
106
- ironic_python_agent-10.2.0.dist-info/LICENSE,sha256=eYI6Jl-hPXZGT4fIcb4joP6fMoYRKf_oONHtLMiPfkQ,561
107
- ironic_python_agent-10.2.0.dist-info/METADATA,sha256=RXj449KtsaSB4q7rFtmwf2Jh5KemC8z7U6QOj21_ffU,3865
108
- ironic_python_agent-10.2.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
109
- ironic_python_agent-10.2.0.dist-info/entry_points.txt,sha256=-UCKTguVlj1FATKoa0LN3Cz48L5s0CkUt_XGOl6-IMQ,1674
110
- ironic_python_agent-10.2.0.dist-info/pbr.json,sha256=vEt89esKawSSDAD6tAa3rz0YaMNxrSGG9Lu6Fyxs9j8,47
111
- ironic_python_agent-10.2.0.dist-info/top_level.txt,sha256=4UvmXY2TkynkLeFUThJX8rC4AWARHl7GtqmajaXD-tw,20
112
- ironic_python_agent-10.2.0.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": "91f52035", "is_release": true}