Files
infix/src/show/show.py
T
Joachim Wiberg d1fda087ec statd: refactor, use parent node for sensor relationships
For more advanced hardware with multiple sensor types per device
(e.g., SFP modules with temperature, voltage, current, and power
sensors), use the YANG parent/child relationship to group related
sensors together for better presentation.

Changes:
 - Remove parent/parent-rel-pos deviations from infix-hardware.yang
 - Create parent components (class: module) for multi-sensor devices
 - Add parent references to child sensor components
 - Add human-readable descriptions from hwmon labels
 - Extend hwmon discovery to support voltage, current, and power
 - Normalize sensor names: strip vendor prefixes (mt7915_phy0 -> phy0)
 - Remove redundant TYPE column, clarify units (V -> VDC, add spaces)
 - Simplify child sensor display by stripping parent prefix
 - Fix "show system" to only show CPU temperature and fan speed

Example output from "show hardware":

  NAME                     VALUE               STATUS
  ===================================================
  sfp1:
    Rx Power               0.000 W             ok
    Tx Power               0.001 W             ok
    Vcc                    3.35 VDC            ok
    Bias                   0.006 A             ok
    Temperature            30.3 °C             ok

  sfp2:
    Rx Power               0.000 W             ok
    Tx Power               0.001 W             ok
    Vcc                    3.34 VDC            ok
    Bias                   0.006 A             ok
    Temperature            32.0 °C             ok

  cpu                      42.8 °C             ok
  phy0                     47.0 °C             ok
  phy1                     53.0 °C             ok

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
2025-10-31 13:26:04 +01:00

334 lines
10 KiB
Python
Executable File

#!/usr/bin/env python3
import re
import subprocess
import json
from typing import List
import os
import shlex
import argparse
RAW_OUTPUT = False
def run_sysrepocfg(xpath: str) -> dict:
if not isinstance(xpath, str) or not xpath.startswith("/"):
print("Invalid XPATH. It must be a valid string starting with '/'.")
return {}
safe_xpath = shlex.quote(xpath)
try:
result = subprocess.run([
"sysrepocfg", "-f", "json", "-X", "-d", "operational", "-x", safe_xpath
], capture_output=True, text=True, check=True)
json_data = json.loads(result.stdout)
return json_data
except subprocess.CalledProcessError as e:
print(f"Error running sysrepocfg: {e}")
return {}
except json.JSONDecodeError as e:
print(f"Error parsing JSON output: {e}")
return {}
def cli_pretty(json_data: dict, command: str, *args: str):
if not command or not all(isinstance(arg, str) for arg in args):
print("Invalid command or arguments. All arguments must be strings.")
return
safe_args = [shlex.quote(arg) for arg in args]
try:
json_input = json.dumps(json_data) # Keep as string, not bytes
result = subprocess.run([
"/usr/libexec/statd/cli-pretty", command, *safe_args
], input=json_input, capture_output=True, text=True, check=True)
print(result.stdout, end="")
except subprocess.CalledProcessError as e:
print(f"Error running cli-pretty: {e}")
def dhcp(args: List[str]) -> None:
data = run_sysrepocfg("/infix-dhcp-server:dhcp-server")
if not data:
print("No interface data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-dhcp-server")
def hardware(args: List[str]) -> None:
data = run_sysrepocfg("/ietf-hardware:hardware")
if not data:
print("No hardware data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-hardware")
def ntp(args: List[str]) -> None:
data = run_sysrepocfg("/system-state/ntp")
if not data:
print("No ntp data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-ntp")
def is_valid_interface_name(interface_name: str) -> bool:
"""
Validates a Linux network interface name.
"""
if len(interface_name) > 15:
return False
pattern = r'^[a-zA-Z0-9._-]+$'
return bool(re.match(pattern, interface_name))
def interface(args: List[str]) -> None:
data = run_sysrepocfg("/ietf-interfaces:interfaces")
if not data:
print("No interface data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
if len(args) == 0 or not args[0]: # Treat "" as no arg.
cli_pretty(data, "show-interfaces")
elif len(args) == 1:
iface = args[0]
if is_valid_interface_name(iface):
cli_pretty(data, f"show-interfaces", "-n", iface)
else:
print(f"Invalid interface name: {iface}")
else:
print("Too many arguments provided. Only one interface name is expected.")
def stp(args: List[str]) -> None:
data = run_sysrepocfg("/ietf-interfaces:interfaces")
if not data:
print("No interface data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-bridge-stp")
def software(args: List[str]) -> None:
data = run_sysrepocfg("/ietf-system:system-state/infix-system:software")
if not data:
print("No software data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
if len(args) == 0 or not args[0]: # Treat "" as no arg.
cli_pretty(data, "show-software")
elif len(args) == 1:
name = args[0]
if name not in ("primary", "secondary"):
print(f"Invalid software name: {name}")
return
cli_pretty(data, f"show-software", "-n", name)
else:
print("Too many arguments provided. Only one name is expected.")
def services(args: List[str]) -> None:
data = run_sysrepocfg("/ietf-system:system-state/infix-system:services")
if not data:
print("No service data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, f"show-services")
def routes(args: List[str]):
ip_version = args[0] if args and args[0] in ["ipv4", "ipv6"] else "ipv4"
data = run_sysrepocfg("/ietf-routing:routing/ribs")
if not data:
print("No route data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-routing-table", "-i", ip_version)
def lldp(args: List[str]):
data = run_sysrepocfg("/ieee802-dot1ab-lldp:lldp")
if not data:
print("No lldp data retrieved.")
return
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-lldp")
def wifi(args: List[str]):
iface = args[0]
if len(args) == 0:
print("Illigal usage")
return
if is_valid_interface_name(iface):
if not os.path.exists(f"/sys/class/net/{iface}/wireless"):
print("Not a Wi-Fi interface")
return
data = run_sysrepocfg("/ietf-interfaces:interfaces")
cli_pretty(data, "show-wifi-scan", "-n", iface)
else:
print(f"Invalid interface name: {iface}")
def system(args: List[str]) -> None:
# Get system state from sysrepo
data = run_sysrepocfg("/ietf-system:system-state")
if not data:
print("No system data retrieved.")
return
# Get hardware data (including thermal sensors)
hardware_data = run_sysrepocfg("/ietf-hardware:hardware")
# Augment with runtime data
runtime = {}
# Extract CPU temperature and fan speed from hardware components
cpu_temp = None
fan_rpm = None
if hardware_data and "ietf-hardware:hardware" in hardware_data:
components = hardware_data.get("ietf-hardware:hardware", {}).get("component", [])
for component in components:
sensor_data = component.get("sensor-data", {})
if not sensor_data:
continue
name = component.get("name", "")
value_type = sensor_data.get("value-type")
# Only capture CPU temperature (ignore phy, sfp, etc.)
if value_type == "celsius" and name == "cpu" and cpu_temp is None:
temp_millidegrees = sensor_data.get("value", 0)
cpu_temp = temp_millidegrees / 1000.0
# Capture fan speed if available
elif value_type == "rpm" and fan_rpm is None:
fan_rpm = sensor_data.get("value", 0)
if cpu_temp is not None:
runtime["cpu_temp"] = cpu_temp
if fan_rpm is not None:
runtime["fan_rpm"] = fan_rpm
# Extract resource usage from system-state
system_state = data.get("ietf-system:system-state", {})
resource_usage = system_state.get("infix-system:resource-usage", {})
# Memory info - convert KiB to MiB for display
memory_kib = resource_usage.get("memory", {})
if memory_kib:
memory = {}
if "total" in memory_kib:
memory["MemTotal"] = int(memory_kib["total"]) // 1024
if "free" in memory_kib:
memory["MemFree"] = int(memory_kib["free"]) // 1024
if "available" in memory_kib:
memory["MemAvailable"] = int(memory_kib["available"]) // 1024
runtime["memory"] = memory
# Load average
load_avg = resource_usage.get("load-average", {})
if load_avg:
runtime["load"] = {
"1min": str(load_avg.get("load-1min", "0.00")),
"5min": str(load_avg.get("load-5min", "0.00")),
"15min": str(load_avg.get("load-15min", "0.00"))
}
# Filesystem usage - convert KiB to human-readable format
filesystems = resource_usage.get("filesystem", [])
if filesystems:
disk_usage = []
for fs in filesystems:
mount = fs.get("mount-point", "")
size_kib = int(fs.get("size", 0))
used_kib = int(fs.get("used", 0))
avail_kib = int(fs.get("available", 0))
# Convert KiB to human-readable format (similar to df -h)
def human_readable(kib_val):
for unit in ['K', 'M', 'G', 'T']:
if kib_val < 1024.0:
return f"{kib_val:.1f}{unit}"
kib_val /= 1024.0
return f"{kib_val:.1f}P"
# Calculate percentage
percent = f"{int((used_kib / size_kib * 100) if size_kib > 0 else 0)}%"
disk_usage.append({
"mount": mount,
"size": human_readable(size_kib),
"used": human_readable(used_kib),
"available": human_readable(avail_kib),
"percent": percent
})
runtime["disk"] = disk_usage
# Add runtime data to main data structure
data["runtime"] = runtime
if RAW_OUTPUT:
print(json.dumps(data, indent=2))
return
cli_pretty(data, "show-system")
def execute_command(command: str, args: List[str]):
command_mapping = {
'dhcp': dhcp,
'hardware': hardware,
'interface': interface,
'ntp': ntp,
'routes': routes,
'lldp': lldp,
'services' : services,
'software' : software,
'stp': stp,
'system': system,
'wifi': wifi
}
if command in command_mapping:
command_mapping[command](args)
else:
print(f"Unknown command: {command}")
def main():
global RAW_OUTPUT
parser = argparse.ArgumentParser(description="Show operational data")
parser.add_argument('command', help="Command to execute")
parser.add_argument('args', nargs=argparse.REMAINDER, help="Additional arguments for the command")
parser.add_argument('-r', '--raw', action='store_true', help="Print raw JSON output from Sysrepo")
args = parser.parse_args()
RAW_OUTPUT = args.raw
execute_command(args.command, args.args)
if __name__ == "__main__":
main()