From 33af42c96556ec66087954f115697d79967efe91 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 22 Sep 2016 15:51:22 +0200 Subject: [PATCH] Fix creating config drive for whole disk images The execute utility returns (out, err), not just out. Change-Id: I322ddae8026493eed2d1ac3c8d446e870b09e711 Closes-Bug: #1626544 --- ironic_lib/disk_utils.py | 2 +- ironic_lib/tests/test_disk_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ironic_lib/disk_utils.py b/ironic_lib/disk_utils.py index 530afe08..8758f65f 100644 --- a/ironic_lib/disk_utils.py +++ b/ironic_lib/disk_utils.py @@ -568,7 +568,7 @@ def _is_disk_larger_than_max_size(device, node_uuid): LOG.error(msg) raise exception.InstanceDeployFailure(msg) - disksize_mb = int(disksize_bytes) // 1024 // 1024 + disksize_mb = int(disksize_bytes[0].strip()) // 1024 // 1024 return disksize_mb > MAX_DISK_SIZE_MB_SUPPORTED_BY_MBR diff --git a/ironic_lib/tests/test_disk_utils.py b/ironic_lib/tests/test_disk_utils.py index 0bef303a..d33c34f4 100644 --- a/ironic_lib/tests/test_disk_utils.py +++ b/ironic_lib/tests/test_disk_utils.py @@ -738,7 +738,7 @@ class WholeDiskPartitionTestCases(test_base.BaseTestCase): self.assertEqual(1, mock_log.call_count) def _test_is_disk_larger_than_max_size(self, mock_execute, blk_out): - mock_execute.return_value = blk_out + mock_execute.return_value = ('%s\n' % blk_out, '') result = disk_utils._is_disk_larger_than_max_size(self.dev, self.node_uuid) mock_execute.assert_called_once_with('blockdev', '--getsize64',