Refactoring: NUMA's devices lazy init made by link-rate + new tests. (#120)

* Refactoring: NUMA's devices lazy init made by link-rate.
* Added: test checking that utils are runnable at all (1 iteration, random data).

Author: strizhechenko

Makefile

@@ -2,6 +2,7 @@ test:
 	./tests/rss-ladder-test
 	./tests/server-info-show
 	./tests/link_rate_units.sh
+	./tests/utils_runnable
 	pytest netutils_linux_*/
 
 env:

netutils_linux_monitoring/link_rate.py

@@ -79,6 +79,8 @@ def colorize_stats(self, dev, repr_source):
         return [self.colorize_stat(stat, repr_source[dev][stat]) for stat in self.stats]
 
     def make_rows(self):
+        if not self.numa.devices:
+            self.numa.devices = self.numa.node_dev_dict(self.options.devices, self.options.random)
         repr_source = self.repr_source()
         for dev in self.options.devices:
             dev_node = self.numa.devices.get(dev)

netutils_linux_monitoring/network_top.py

@@ -22,8 +22,7 @@ def __init__(self):
             'link-rate': LinkRateTop(),
         }
         self.parse_options()
-        self.numa = Numa(devices=self.options.devices,
-                         fake=self.options.random)
+        self.numa = Numa(fake=self.options.random)
 
     def parse(self):
         return dict((top_name, _top.parse()) for top_name, _top in iteritems(self.tops))

netutils_linux_monitoring/numa.py

@@ -28,7 +28,7 @@ class Numa(object):
     numa_layout = None
     socket_layout = None
 
-    def __init__(self, devices=None, fake=False, lscpu_output=None):
+    def __init__(self, fake=False, lscpu_output=None):
         if fake:
             self.numa_layout = self.socket_layout = self.__FAKE_LAYOUT
         else:
@@ -39,7 +39,6 @@ def __init__(self, devices=None, fake=False, lscpu_output=None):
         else:
             self.layout = self.socket_layout
             self.layout_kind = 'SOCKET'
-        self.devices = self.node_dev_dict(devices, fake)
 
     def node_dev_dict(self, devices, fake):
         """ Returns NIC's NUMA bindings dict like {'eth1': 0, 'eth2': 1, 'eth3': 0} """

tests/link_rate_units.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-. env/bin/activate
-
 set -eux
 
 link-rate --random  --devices=eth1,eth2,eth3 --iterations=1 | grep -q 'rx-mbits'

tests/utils_runnable

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -eu
+
+softirq="./tests/softirqs/i7/softirqs1"
+irq="./tests/interrupts/singlequeue_8cpu/interrupts_short"
+soft_net_stat="./tests/softnet_stat/softnet_stat1"
+devices="eth1,eth2,eth3"
+
+network-top  --no-clear -n 1 --random \
+	--softirqs-file="$softirq" \
+	--softnet-stat-file="$soft_net_stat" \
+	--interrupts-file="$irq" \
+	--devices="$devices"
+link-rate  --no-clear -n 1 --random --devices="$devices"
+irqtop  --no-clear -n 1 --random --interrupts-file="$irq"
+softirq-top  --no-clear -n 1 --random --softirqs-file="$softirq"
+softnet-stat-top  --no-clear -n 1 --random --softnet-stat-file="$soft_net_stat"
+