openstack/ironic-python-agent
Code Issues Proposed changes

Merge "Reduced restriction of parsing for dmidecode output"

Browse Source
This commit is contained in:
Jenkins
2016-03-01 17:39:10 +00:00
committed by Gerrit Code Review
parent 2a71a94208 d66fa523bf
commit 1971ad7023
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ironic_python_agent/hardware.py
View File

@@ -421,7 +421,7 @@ class GenericHardwareManager(HardwareManager):
total = int(psutil.phymem_usage().total) total = int(psutil.phymem_usage().total)
try: try:
out, _e = utils.execute("dmidecode --type memory | grep Size", out, _e = utils.execute("dmidecode --type 17 | grep Size",
shell=True) shell=True)
except (processutils.ProcessExecutionError, OSError) as e: except (processutils.ProcessExecutionError, OSError) as e:
LOG.warning("Cannot get real physical memory size: %s", e) LOG.warning("Cannot get real physical memory size: %s", e)
@@ -433,12 +433,20 @@ class GenericHardwareManager(HardwareManager):
if not line: if not line:
continue continue
if 'Size:' not in line:
continue
value = None
try: try:
value = line.split(None, 1)[1].strip() value = line.split('Size: ', 1)[1]
physical += int(UNIT_CONVERTER(value).to_base_units()) physical += int(UNIT_CONVERTER(value).to_base_units())
except Exception as exc: except Exception as exc:
LOG.error('Cannot parse size expression %s: %s', if (value == "No Module Installed" or
line, exc) value == "Not Installed"):
LOG.debug('One memory slot is empty')
else:
LOG.error('Cannot parse size expression %s: %s',
line, exc)
if not physical: if not physical:
LOG.warning('failed to get real physical RAM, dmidecode ' LOG.warning('failed to get real physical RAM, dmidecode '

5
ironic_python_agent/tests/unit/test_hardware.py
View File

@@ -421,7 +421,10 @@ class TestGenericHardwareManager(test_base.BaseTestCase):
def test_get_memory(self, mocked_execute, mocked_usage): def test_get_memory(self, mocked_execute, mocked_usage):
mocked_usage.return_value = mock.Mock(total=3952 * 1024 * 1024) mocked_usage.return_value = mock.Mock(total=3952 * 1024 * 1024)
mocked_execute.return_value = ( mocked_execute.return_value = (
"Foo\nSize: 2048 MB\nSize: 2 GB\n", ("Foo\nSize: 2048 MB\nSize: 2 GB\n"
"Installed Size: Not Installed\n"
"Enabled Size: Not Installed\n"
"Size: No Module Installed\n"),
"" ""
) )

5
releasenotes/notes/add-unit-test-cc4a1a05859ad17d.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- dmidecode output produces less parsing errors and logs
common and normal output like "No Module Installed" or
"Not Installed" in debug instead of error.