Added(server-info): using dmidecode memory data file for -show

netutils_linux_hardware/parsers.py

@@ -121,6 +121,42 @@ class MemInfo(YAMLLike):
  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.speed = 0
+ self.type = 'RAM'
+ self.handle = None
+ self.size = 0
+ for line in map(str.strip, text.split('\n')):
+ if line.startswith('Speed:'):
+ self.speed = line.split()[1]
+ elif line.startswith('Type:'):
+ self.type = line.split()[1]
+ elif line.startswith('Size:'):
+ self.size = line.split()[1]
+ elif line.startswith('Handle'):
+ self.handle = line.split(' ')[1].strip(',')
+
+
+class MemInfoDMI(Parser):
+ @staticmethod
+ def parse(text):
+ if not text:
+ return None
+ output = dict()
+ for device in text.split('\n\n'):
+ if not 'Memory Device' in device:
+ continue
+ mem_dev = MemInfoDMIDevice(device)
+ if not mem_dev.handle:
+ continue
+ output[mem_dev.handle] = {
+ 'type': mem_dev.type,
+ 'speed': mem_dev.speed,
+ 'size': mem_dev.size,
+ }
+ return output
+
 
 class CPULayout(Parser):
  @staticmethod

netutils_linux_hardware/reader.py

@@ -3,7 +3,7 @@
 
 import os
 import yaml
-from netutils_linux_hardware.parsers import YAMLLike, CPULayout, DiskInfo, MemInfo
+from netutils_linux_hardware.parsers import YAMLLike, CPULayout, DiskInfo, MemInfo, MemInfoDMI
 from netutils_linux_hardware.netdev import ReaderNet
 
 
@@ -30,7 +30,10 @@ def gather_info(self):
  },
  '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().parse_file_safe(self.path('meminfo')),
+ 'devices': MemInfoDMI().parse_file_safe(self.path('dmidecode')),
+ },
  }
  for key in ('CPU MHz', 'BogoMIPS'):
  if self.info.get('cpu', {}).get('info', {}).get(key):