From d6c268dc0e6f4299e9ef0bf10571e53d72c5b90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Ricart?= Date: Sat, 8 Mar 2025 21:20:52 +0100 Subject: [PATCH] [DEBIAN][BSD] add ipv4 information --- parsers/freebsd.py | 5 ++++- template/debian.rst.j2 | 2 +- template/freebsd.rst.j2 | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/parsers/freebsd.py b/parsers/freebsd.py index 8436597..d718ed6 100644 --- a/parsers/freebsd.py +++ b/parsers/freebsd.py @@ -29,9 +29,12 @@ def parse_freebsd(content): else: if current_section: result[current_section] += line + "\n" + for section in result: + print(" parsing {}...".format(section)) + if section in ["interfaces"]: + result[section] = loads(result[section]) from pprint import pprint #pprint(result) - result["ip"] = parse_ip(result["interfaces"]) result["os"] = loads(result["version"]) return result diff --git a/template/debian.rst.j2 b/template/debian.rst.j2 index b4f0915..d4d8772 100644 --- a/template/debian.rst.j2 +++ b/template/debian.rst.j2 @@ -9,7 +9,7 @@ ip ========= ============== interface adresses ========= =============={% for interface in ip %} -{{ "{:<10}".format(interface["ifname"]) }} {% for ip in interface["addr_info"] %} {% if interface["addr_info"].index(ip) != 0 %} {% endif %}{{ ip["local"] }}/{{ ip["prefixlen"]}} +{{ "{:<10}".format(interface["ifname"]) }} {% for ip in interface["addr_info"] %} {% if interface["addr_info"].index(ip) != 0 %} {% endif %}* {{ ip["local"] }}/{{ ip["prefixlen"]}} {% endfor %}{% endfor %}========= ============== routes diff --git a/template/freebsd.rst.j2 b/template/freebsd.rst.j2 index c753bcf..d397b81 100644 --- a/template/freebsd.rst.j2 +++ b/template/freebsd.rst.j2 @@ -5,6 +5,6 @@ network ========= ========== interface ip -========= =========={% for interface in ip %} -{{ "{:<10}".format(interface.replace("\n","")) }} {% for addr in ip[interface] %} {{ addr.replace("\n","") }}{% endfor %}{% endfor %} +========= =========={% for interface in interfaces %} +{{ "{:<11}".format(interface["name"]) }} {{ interface["ipv4_addr"] }}{% endfor %} ========= ==========