Refactoring(server-info): Assessor -> Rater.

netutils_linux_hardware/__init__.py

@@ -1,7 +1,7 @@
 from netutils_linux_hardware import netdev
-from netutils_linux_hardware import parsers
+from netutils_linux_hardware import parser
 from netutils_linux_hardware import interrupts
 from netutils_linux_hardware.reader import Reader
-from netutils_linux_hardware.assessor import Assessor
+from netutils_linux_hardware.rater import Rater
 
-__all__ = ['parsers', 'netdev', 'interrupts', 'Reader', 'Assessor']
+__all__ = ['parser', 'netdev', 'interrupts', 'Reader', 'Rater']

netutils_linux_hardware/cli.py

@@ -4,7 +4,7 @@
 
 from six import print_
 
-from netutils_linux_hardware.assessor import Assessor, FOLDING_NO, FOLDING_DEVICE, FOLDING_SUBSYSTEM, FOLDING_SERVER
+from netutils_linux_hardware.rater import Rater, FOLDING_NO, FOLDING_DEVICE, FOLDING_SUBSYSTEM, FOLDING_SERVER
 from netutils_linux_hardware.collect import ServerInfoCollect
 from netutils_linux_hardware.reader import Reader
 
@@ -71,4 +71,4 @@ def main(self):
  ServerInfoCollect(directory, tarball, self.args.collect)
  if self.args.rate or self.args.show:
  reader = Reader(directory, self.args)
- print_(Assessor(reader.info, self.args) if self.args.rate else reader)
+ print_(Rater(reader.info, self.args) if self.args.rate else reader)

netutils_linux_hardware/grade.py

@@ -1,5 +1,5 @@
 # coding: utf-8
-from netutils_linux_hardware.assessor_math import any2int, round_
+from netutils_linux_hardware.rater_math import any2int, round_
 
 
 class Grade(object):

netutils_linux_hardware/interrupts.py

@@ -2,7 +2,7 @@
 # pylint: disable=C0111, C0103
 
 from six import print_
-from netutils_linux_hardware.parsers import Parser
+from netutils_linux_hardware.parser import Parser
 
 
 class NICQueues(object):

netutils_linux_hardware/netdev.py

@@ -4,7 +4,7 @@
 import os
 from six import iteritems
 from netutils_linux_hardware.interrupts import IRQQueueCounter
-from netutils_linux_hardware.parsers import EthtoolBuffers, ReductorMirror, BridgeOutput, YAMLLike, EthtoolFiles
+from netutils_linux_hardware.parser import EthtoolBuffers, ReductorMirror, BridgeOutput, YAMLLike, EthtoolFiles
 
 
 class ReaderNet(object):

netutils_linux_hardware/assessor.py → netutils_linux_hardware/rater.py

@@ -3,7 +3,7 @@
 
 import yaml
 
-from netutils_linux_hardware.assessor_math import extract
+from netutils_linux_hardware.rater_math import extract
 from netutils_linux_hardware.grade import Grade
 
 FOLDING_NO = 0
@@ -12,7 +12,7 @@
 FOLDING_SERVER = 3
 
 
-class Assessor(object):
+class Rater(object):
  """ Calculates rates for important system components """
  info = None
  avg = None
@@ -22,7 +22,7 @@ def __init__(self, data, args):
  self.data = data
  self.args = args
  if self.data:
- self.assess()
+ self.rate()
 
  def fold(self, data, level):
  """ Схлапывает значения в дикте до среднего арифметического """
@@ -36,24 +36,24 @@ def fold(self, data, level):
  def __str__(self):
  return yaml.dump(self.info, default_flow_style=False).strip()
 
- def assess(self):
+ def rate(self):
  data = dict()
  for key in self.keys:
  if not getattr(self.args, key):
  continue
  elif key == 'net':
- data[key] = self.__assess(self.assess_netdev, 'net')
+ data[key] = self.__rate(self.rate_netdev, 'net')
  elif key == 'cpu':
- data[key] = self.assess_cpu()
+ data[key] = self.rate_cpu()
  elif key == 'memory':
- data[key] = self.assess_memory()
+ data[key] = self.rate_memory()
  elif key == 'disk':
- data[key] = self.__assess(self.assess_disk, 'disk')
+ data[key] = self.__rate(self.rate_disk, 'disk')
  elif key == 'system':
- data[key] = self.assess_system()
+ data[key] = self.rate_system()
  self.info = self.fold(data, FOLDING_SERVER)
 
- def assess_cpu(self):
+ def rate_cpu(self):
  cpuinfo = extract(self.data, ['cpu', 'info'])
  if cpuinfo:
  return self.fold({
@@ -67,7 +67,7 @@ def assess_cpu(self):
  'Vendor ID': Grade.str(cpuinfo.get('Vendor ID'), good=['GenuineIntel']),
  }, FOLDING_SUBSYSTEM)
 
- def assess_memory_device(self, device):
+ def rate_memory_device(self, device):
  return self.fold({
  'size': Grade.int(device.get('size', 0), 512, 8196),
  'type': Grade.known_values(device.get('type', 'RAM'), {
@@ -79,36 +79,36 @@ def assess_memory_device(self, device):
  'speed': Grade.int(device.get('speed', 0), 200, 4000),
  }, FOLDING_DEVICE)
 
- def assess_memory_devices(self, devices):
+ def rate_memory_devices(self, devices):
  if not devices:
  return 1
- return self.fold(dict((handle, self.assess_memory_device(device))
+ return self.fold(dict((handle, self.rate_memory_device(device))
  for handle, device in devices.items()),
  FOLDING_SUBSYSTEM)
 
- def assess_memory_size(self, size):
+ def rate_memory_size(self, size):
  return self.fold({
  'MemTotal': Grade.int(size.get('MemTotal'), 2 * (1024 ** 2), 16 * (1024 ** 2)),
  'SwapTotal': Grade.int(size.get('SwapTotal'), 512 * 1024, 4 * (1024 ** 2)),
  }, FOLDING_DEVICE) if size else 1
 
- def assess_memory(self):
+ def rate_memory(self):
  meminfo = self.data.get('memory')
  if meminfo:
  return self.fold({
- 'devices': self.assess_memory_devices(meminfo.get('devices')),
- 'size': self.assess_memory_size(meminfo.get('size')),
+ 'devices': self.rate_memory_devices(meminfo.get('devices')),
+ 'size': self.rate_memory_size(meminfo.get('size')),
  }, FOLDING_SUBSYSTEM)
 
- def assess_system(self):
+ def rate_system(self):
  cpuinfo = extract(self.data, ['cpu', 'info'])
  if cpuinfo:
  return self.fold({
  'Hypervisor vendor': Grade.fact(cpuinfo.get('Hypervisor vendor'), False),
  'Virtualization type': Grade.fact(cpuinfo.get('Hypervisor vendor'), False),
  }, FOLDING_SUBSYSTEM)
 
- def assess_netdev(self, netdev):
+ def rate_netdev(self, netdev):
  netdevinfo = extract(self.data, ['net', netdev])
  queues = sum(
  len(extract(netdevinfo, ['queues', x])) for x in ('rx', 'rxtx'))
@@ -132,20 +132,14 @@ def assess_netdev(self, netdev):
  }, FOLDING_DEVICE)
  }, FOLDING_DEVICE)
 
- def assess_disk(self, disk):
+ def rate_disk(self, disk):
  diskinfo = extract(self.data, ['disk', disk])
  return self.fold({
  'type': Grade.str(diskinfo.get('type'), ['SDD'], ['HDD']),
  # 50Gb - good, 1Tb - good enough
  'size': Grade.int(diskinfo.get('size'), 50 * (1000 ** 3), 1000 ** 4),
  }, FOLDING_DEVICE)
 
- def __assess(self, func, key):
+ def __rate(self, func, key):
  items = self.data.get(key)
  return self.fold(dict((item, func(item)) for item in items), FOLDING_SUBSYSTEM) if items else 1
-
- def parse_args(self):
- parser = argparse.ArgumentParser()
- parser.add_argument('-f', '--folding', action='count', help='-f - device, -ff - subsystem, -fff - server',
- default=FOLDING_NO)
- return parser.parse_args()

netutils_linux_hardware/reader.py

@@ -6,7 +6,7 @@
 import yaml
 
 from netutils_linux_hardware.netdev import ReaderNet
-from netutils_linux_hardware.parsers import YAMLLike, CPULayout, DiskInfo, MemInfo, MemInfoDMI
+from netutils_linux_hardware.parser import YAMLLike, CPULayout, DiskInfo, MemInfo, MemInfoDMI
 
 
 class Reader(object):

netutils_linux_hardware/test_grade.py

@@ -6,7 +6,7 @@
 from unittest import TestCase, main
 from six import iteritems
 from netutils_linux_hardware.grade import Grade
-from netutils_linux_hardware.assessor_math import any2int
+from netutils_linux_hardware.rater_math import any2int
 
 
 class GradeTest(TestCase):

netutils_linux_hardware/test_parsers.py

@@ -3,7 +3,7 @@
 
 from unittest import TestCase
 
-from netutils_linux_hardware.parsers import DiskInfo
+from netutils_linux_hardware.parser import DiskInfo
 
 
 class DiskInfoTests(TestCase):

netutils_linux_monitoring/topology.py

@@ -7,7 +7,7 @@
 
 from six import print_
 
-from netutils_linux_hardware.assessor_math import any2int
+from netutils_linux_hardware.rater_math import any2int
 
 
 class Topology(object):

netutils_linux_tuning/rss_ladder.py

@@ -9,7 +9,7 @@
 from six import print_
 from six.moves import xrange
 
-from netutils_linux_hardware.assessor_math import any2int
+from netutils_linux_hardware.rater_math import any2int
 from netutils_linux_monitoring.colors import wrap, YELLOW, cpu_color, COLORS_NODE
 from netutils_linux_monitoring.topology import Topology
 from netutils_linux_tuning.base_tune import CPUBasedTune