Seed code for ironic
[ta/ironic.git] / nokia / patches / 0001-floppy-support.patch
1 diff -Npur ironic-10.1.3.orig/ironic/common/boot_devices.py ironic-10.1.3/ironic/common/boot_devices.py
2 --- ironic-10.1.3.orig/ironic/common/boot_devices.py    2018-06-18 03:05:08.000000000 +0300
3 +++ ironic-10.1.3/ironic/common/boot_devices.py 2018-06-28 12:40:17.970297042 +0300
4 @@ -44,5 +44,8 @@ SAFE = 'safe'
5  WANBOOT = 'wanboot'
6  "Boot from Wide Area Network"
7  
8 +FLOPPY = 'floppy'
9 +"Boot from Floppy/primary removable media"
10 +
11  ISCSIBOOT = 'iscsiboot'
12  "Boot from iSCSI volume"
13 diff -Npur ironic-10.1.3.orig/ironic/drivers/modules/ipmitool.py ironic-10.1.3/ironic/drivers/modules/ipmitool.py
14 --- ironic-10.1.3.orig/ironic/drivers/modules/ipmitool.py       2018-06-18 03:05:16.000000000 +0300
15 +++ ironic-10.1.3/ironic/drivers/modules/ipmitool.py    2018-06-28 12:40:35.563255832 +0300
16 @@ -137,7 +137,8 @@ BOOT_DEVICE_HEXA_MAP = {
17      boot_devices.DISK: '0x08',
18      boot_devices.CDROM: '0x14',
19      boot_devices.BIOS: '0x18',
20 -    boot_devices.SAFE: '0x0c'
21 +    boot_devices.SAFE: '0x0c',
22 +    boot_devices.FLOPPY: '0x3c'
23  }
24  
25  
26 diff -Npur ironic-10.1.3.orig/ironic/tests/unit/drivers/modules/irmc/test_management.py ironic-10.1.3/ironic/tests/unit/drivers/modules/irmc/test_management.py
27 --- ironic-10.1.3.orig/ironic/tests/unit/drivers/modules/irmc/test_management.py        2018-06-18 03:05:16.000000000 +0300
28 +++ ironic-10.1.3/ironic/tests/unit/drivers/modules/irmc/test_management.py     2018-06-28 12:41:04.804187338 +0300
29 @@ -194,8 +194,8 @@ class IRMCManagementTestCase(db_base.DbT
30      def test_management_interface_get_supported_boot_devices(self):
31          with task_manager.acquire(self.context, self.node.uuid) as task:
32              expected = [boot_devices.PXE, boot_devices.DISK,
33 -                        boot_devices.CDROM, boot_devices.BIOS,
34 -                        boot_devices.SAFE]
35 +                        boot_devices.FLOPPY, boot_devices.CDROM, 
36 +                        boot_devices.BIOS, boot_devices.SAFE]
37              self.assertEqual(sorted(expected), sorted(task.driver.management.
38                               get_supported_boot_devices(task)))
39  
40 diff -Npur ironic-10.1.3.orig/ironic/tests/unit/drivers/modules/test_ipmitool.py ironic-10.1.3/ironic/tests/unit/drivers/modules/test_ipmitool.py
41 --- ironic-10.1.3.orig/ironic/tests/unit/drivers/modules/test_ipmitool.py       2018-06-18 03:05:16.000000000 +0300
42 +++ ironic-10.1.3/ironic/tests/unit/drivers/modules/test_ipmitool.py    2018-06-28 12:41:31.187125538 +0300
43 @@ -2175,8 +2175,8 @@ class IPMIToolDriverTestCase(db_base.DbT
44      def test_management_interface_get_supported_boot_devices(self):
45          with task_manager.acquire(self.context, self.node.uuid) as task:
46              expected = [boot_devices.PXE, boot_devices.DISK,
47 -                        boot_devices.CDROM, boot_devices.BIOS,
48 -                        boot_devices.SAFE]
49 +                        boot_devices.FLOPPY, boot_devices.CDROM, 
50 +                        boot_devices.BIOS, boot_devices.SAFE]
51              self.assertEqual(sorted(expected), sorted(task.driver.management.
52                               get_supported_boot_devices(task)))
53