Skip to content

GitLab

Commit a9e21b46 authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[2121] Address review comments 

* Newlines have been added to the default values where it returns
  "Unknown" to preserve formatting.

* If a command fails, a failure message is returned instead of
  "Unknown".
parent 5255dd6b
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 65 deletions
src/lib/python/isc/sysinfo/sysinfo.py
View file @ a9e21b46
......@@ -41,10 +41,10 @@ class SysInfo:
self._mem_swap_total = -1
self._mem_swap_free = -1
self._platform_distro = 'Unknown'
self._net_interfaces = 'Unknown'
self._net_routing_table = 'Unknown'
self._net_stats = 'Unknown'
self._net_connections = 'Unknown'
self._net_interfaces = 'Unknown\n'
self._net_routing_table = 'Unknown\n'
self._net_stats = 'Unknown\n'
self._net_connections = 'Unknown\n'
def get_num_processors(self):
"""Returns the number of processors. This is the number of
......@@ -230,18 +230,11 @@ class SysInfoLinux(SysInfoPOSIX):
if self._platform_distro is None:
self._platform_distro = 'Unknown'
self._net_interfaces = None
try:
s = subprocess.check_output(['ip', 'addr'])
self._net_interfaces = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_interfaces is None:
self._net_interfaces = 'Unknown'
self._net_routing_table = None
self._net_interfaces = 'Warning: "ip addr" command failed.\n'
try:
s = subprocess.check_output(['ip', 'route'])
......@@ -250,32 +243,19 @@ class SysInfoLinux(SysInfoPOSIX):
s = subprocess.check_output(['ip', '-f', 'inet6', 'route'])
self._net_routing_table += s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_routing_table is None:
self._net_routing_table = 'Unknown'
self._net_stats = None
self._net_routing_table = 'Warning: "ip route" or "ip -f inet6 route" command failed.\n'
try:
s = subprocess.check_output(['netstat', '-s'])
self._net_stats = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_stats is None:
self._net_stats = 'Unknown'
self._net_connections = None
self._net_stats = 'Warning: "netstat -s" command failed.\n'
try:
s = subprocess.check_output(['netstat', '-apn'])
self._net_connections = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_connections is None:
self._net_connections = 'Unknown'
self._net_connections = 'Warning: "netstat -apn" command failed.\n'
class SysInfoBSD(SysInfoPOSIX):
"""Common BSD implementation of the SysInfo class.
......@@ -284,17 +264,12 @@ class SysInfoBSD(SysInfoPOSIX):
def __init__(self):
super().__init__()
self._hostname = None
try:
s = subprocess.check_output(['hostname'])
self._hostname = s.decode('utf-8').strip()
except (subprocess.CalledProcessError, OSError):
pass
if self._hostname is None:
self._hostname = 'Unknown'
try:
s = subprocess.check_output(['sysctl', '-n', 'kern.boottime'])
t = s.decode('utf-8').strip()
......@@ -350,49 +325,29 @@ class SysInfoOpenBSD(SysInfoBSD):
except (subprocess.CalledProcessError, OSError):
pass
self._net_interfaces = None
try:
s = subprocess.check_output(['ifconfig'])
self._net_interfaces = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_interfaces is None:
self._net_interfaces = 'Unknown'
self._net_routing_table = None
self._net_interfaces = 'Warning: "ifconfig" command failed.\n'
try:
s = subprocess.check_output(['route', '-n', 'show'])
self._net_routing_table = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_routing_table is None:
self._net_routing_table = 'Unknown'
self._net_stats = None
self._net_routing_table = 'Warning: "route -n show" command failed.\n'
try:
s = subprocess.check_output(['netstat', '-s'])
self._net_stats = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_stats is None:
self._net_stats = 'Unknown'
self._net_connections = None
self._net_stats = 'Warning: "netstat -s" command failed.\n'
try:
s = subprocess.check_output(['netstat', '-an'])
self._net_connections = s.decode('utf-8')
except (subprocess.CalledProcessError, OSError):
pass
if self._net_connections is None:
self._net_connections = 'Unknown'
self._net_connections = 'Warning: "netstat -an" command failed.\n'
class SysInfoTestcase(SysInfo):
def __init__(self):
......
src/lib/python/isc/sysinfo/tests/sysinfo_test.py
View file @ a9e21b46
......@@ -141,10 +141,10 @@ class SysInfoTest(unittest.TestCase):
self.assertEqual(-1, s.get_mem_swap_total())
self.assertEqual(-1, s.get_mem_swap_free())
self.assertEqual('Unknown', s.get_platform_distro())
self.assertEqual('Unknown', s.get_net_interfaces())
self.assertEqual('Unknown', s.get_net_routing_table())
self.assertEqual('Unknown', s.get_net_stats())
self.assertEqual('Unknown', s.get_net_connections())
self.assertEqual('Unknown\n', s.get_net_interfaces())
self.assertEqual('Unknown\n', s.get_net_routing_table())
self.assertEqual('Unknown\n', s.get_net_stats())
self.assertEqual('Unknown\n', s.get_net_connections())
def test_sysinfo_factory(self):
"""Test that SysInfoFromFactory returns a valid system-specific
......@@ -170,10 +170,10 @@ class SysInfoTest(unittest.TestCase):
self.assertEqual(-1, s.get_mem_swap_total())
self.assertEqual(-1, s.get_mem_swap_free())
self.assertEqual('Unknown', s.get_platform_distro())
self.assertEqual('Unknown', s.get_net_interfaces())
self.assertEqual('Unknown', s.get_net_routing_table())
self.assertEqual('Unknown', s.get_net_stats())
self.assertEqual('Unknown', s.get_net_connections())
self.assertEqual('Unknown\n', s.get_net_interfaces())
self.assertEqual('Unknown\n', s.get_net_routing_table())
self.assertEqual('Unknown\n', s.get_net_stats())
self.assertEqual('Unknown\n', s.get_net_connections())
platform.system = old_platform_system
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment