Adding dmidecode support in server-info for better view of memory subsystem (#178)

* Added(server-info): reminder about installation pcituils and dmidecode.
* Added(server-info): using dmidecode memory data file (type, speed and size). for -show and -rate
* Added(test-data): server-info archive from cheapest vscale CentOS 7
* Added(assessor): Grade by known values
* Fixed(test-data): server-info show expected output changed
* Refactoring(dmi): parser complexity fighting
* Refactoring(parsers): provide optional simplier way of initialisation for any Parser-based class
* Incremented version

#37

Author: strizhechenko

netutils_linux_hardware/assessor.py

@@ -39,12 +39,33 @@ def assess_cpu(self):
                 'Vendor ID': Grade.str(cpuinfo.get('Vendor ID'), good=['GenuineIntel']),
             }
 
+    def assess_memory_device(self, device):
+        return {
+            'size': Grade.int(device.get('size', 0), 512, 8196),
+            'type': Grade.known_values(device.get('type', 'RAM'), {
+                'DDR1': 2,
+                'DDR2': 3,
+                'DDR3': 6,
+                'DDR4': 10,
+            }),
+            'speed': Grade.int(device.get('speed', 0), 200, 4000),
+        }
+
+    def assess_memory_devices(self, devices):
+        return dict((handle, self.assess_memory_device(device)) for handle, device in devices.items())
+
+    def assess_memory_size(self, size):
+        return {
+            'MemTotal': Grade.int(size.get('MemTotal'), 2 * (1024 ** 2), 16 * (1024 ** 2)),
+            'SwapTotal': Grade.int(size.get('SwapTotal'), 512 * 1024, 4 * (1024 ** 2)),
+        }
+
     def assess_memory(self):
         meminfo = self.data.get('memory')
         if meminfo:
             return {
-                'MemTotal': Grade.int(meminfo.get('MemTotal'), 2 * (1024 ** 2), 16 * (1024 ** 2)),
-                'SwapTotal': Grade.int(meminfo.get('SwapTotal'), 512 * 1024, 4 * (1024 ** 2)),
+                'devices': self.assess_memory_devices(meminfo.get('devices')),
+                'size': self.assess_memory_size(meminfo.get('size')),
             }
 
     def assess_system(self):

netutils_linux_hardware/grade.py

@@ -18,3 +18,7 @@ def str(value, good=None, bad=None):
     @staticmethod
     def fact(value, mode=False):
         return 10 if (value is None) != mode else 1
+
+    @staticmethod
+    def known_values(value, _dict):
+        return _dict.get(value, 1)

netutils_linux_hardware/parsers.py

@@ -8,7 +8,9 @@
 
 
 class Parser(object):
-    @staticmethod
+    def __init__(self, filepath=None):
+        self.result = self.parse_file_safe(filepath) if filepath else None
+
     def parse(text, **kwargs):
         raise NotImplementedError
 
@@ -122,6 +124,48 @@ def parse(self, text):
         return dict((k, int(v.replace(' kB', ''))) for k, v in iteritems(yaml.load(text)) if k in self.keys_required)
 
 
+class MemInfoDMIDevice(object):
+    def __init__(self, text):
+        self.data = {
+            'speed': 0,
+            'type': 'RAM',
+            'size': 0,
+        }
+        self.type = 'RAM'
+        self.handle = None
+        self.size = 0
+        self.parse_text(text)
+
+    def parse_text(self, text):
+        """ Разбор описания плашки памяти от dmidecode """
+        for line in map(str.strip, text.split('\n')):
+            self.parse_line(line)
+
+    def parse_line(self, line):
+        for key in ('Speed', 'Type', 'Size'):
+            if line.startswith(key + ':'):
+                self.data[key.lower()] = line.split()[1]
+                break
+        if line.startswith('Handle'):
+            self.handle = line.split(' ')[1].strip(',')
+
+
+class MemInfoDMI(Parser):
+    @staticmethod
+    def parse(text):
+        """ Разбор всего вывода dmidecode --type memory """
+        return MemInfoDMI.__parse(text.split('\n\n')) if text else None
+
+    @staticmethod
+    def __parse(devices):
+        output = dict()
+        for device in devices:
+            if 'Memory Device' in device:
+                mem_dev = MemInfoDMIDevice(device)
+                output[mem_dev.handle] = mem_dev
+        return output
+
+
 class CPULayout(Parser):
     @staticmethod
     def parse(text):

netutils_linux_hardware/reader.py

@@ -2,13 +2,14 @@
 # pylint: disable=C0111, C0103
 
 import os
+
 import yaml
-from netutils_linux_hardware.parsers import YAMLLike, CPULayout, DiskInfo, MemInfo
+
 from netutils_linux_hardware.netdev import ReaderNet
+from netutils_linux_hardware.parsers import YAMLLike, CPULayout, DiskInfo, MemInfo, MemInfoDMI
 
 
 class Reader(object):
-
     info = None
 
     def __init__(self, datadir):
@@ -25,12 +26,15 @@ def gather_info(self):
 
         self.info = {
             'cpu': {
-                'info': YAMLLike().parse_file_safe(self.path('lscpu_info')),
-                'layout': CPULayout().parse_file_safe(self.path('lscpu_layout')),
+                'info': YAMLLike(self.path('lscpu_info')).result,
+                'layout': CPULayout(self.path('lscpu_layout')).result,
             },
             'net': ReaderNet(self.datadir, self.path).netdevs,
             'disk': DiskInfo().parse(self.path('disks_types'), self.path('lsblk_sizes'), self.path('lsblk_models')),
-            'memory': MemInfo().parse_file_safe(self.path('meminfo')),
+            'memory': {
+                'size': MemInfo(self.path('meminfo')).result,
+                'devices': MemInfoDMI(self.path('dmidecode')).result,
+            },
         }
         for key in ('CPU MHz', 'BogoMIPS'):
             if self.info.get('cpu', {}).get('info', {}).get(key):

setup.py

@@ -16,7 +16,7 @@ def read(*paths):
 
 setuptools.setup(
     name='netutils-linux',
-    version='2.5.2',
+    version='2.6.1',
     author='Oleg Strizhechenko',
     author_email='oleg.strizhechenko@gmail.com',
     license='MIT',

tests/server-info-show.tests/1xE3-1271.I217_and_X710.L2_mixed.masterconf/expected_output

@@ -33,10 +33,12 @@ disk:
     size: 120034123776
     type: SSD
 memory:
-  MemFree: 14142256
-  MemTotal: 16290904
-  SwapFree: 8216572
-  SwapTotal: 8216572
+  devices: null
+  size:
+    MemFree: 14142256
+    MemTotal: 16290904
+    SwapFree: 8216572
+    SwapTotal: 8216572
 net:
   eth0:
     buffers:

tests/server-info-show.tests/1xE31240.2x82576.L2.manual/expected_output

@@ -31,7 +31,9 @@ cpu:
     '6': '0'
     '7': '0'
 disk: null
-memory: null
+memory:
+  devices: null
+  size: null
 net:
   eth0:
     buffers:

tests/server-info-show.tests/1xE5200.82571EB_and_AR8121.L2.manual/expected_output

@@ -24,7 +24,9 @@ cpu:
     '0': '0'
     '1': '0'
 disk: null
-memory: null
+memory:
+  devices: null
+  size: null
 net:
   eth1:
     buffers:

tests/server-info-show.tests/1xi3.single_i350.l2_mixed.manual/expected_output

@@ -28,7 +28,9 @@ cpu:
     '2': '0'
     '3': '0'
 disk: null
-memory: null
+memory:
+  devices: null
+  size: null
 net:
   eth6:
     buffers:

tests/server-info-show.tests/1xi7-4770K.1x82541PI.L2.manual/expected_output

@@ -32,7 +32,9 @@ cpu:
     '6': '0'
     '7': '0'
 disk: null
-memory: null
+memory:
+  devices: null
+  size: null
 net:
   eth0:
     buffers: