From 546a52800a1393b5d593409f04dc60adc63c2ac9 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 28 Feb 2021 16:29:41 +0100 Subject: [PATCH] client: display port administrative status with "show interfaces" Fix #432. --- NEWS | 2 ++ src/client/display.c | 6 +++++- tests/integration/test_basic.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 55872092..14d78934 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ lldpd (1.0.9) * Fix: + Do not use interface alias if we set it ourselves. + * Changes: + + Display port status with "show interfaces". lldpd (1.0.8) * Fix: diff --git a/src/client/display.c b/src/client/display.c index c6011809..ab206140 100644 --- a/src/client/display.c +++ b/src/client/display.c @@ -726,6 +726,10 @@ display_interface(lldpctl_conn_t *conn, struct writer *w, int hidden, tag_attr(w, "age" , "Time", display_age(lldpctl_atom_get_int(port, lldpctl_k_port_age))); } + if (local) { + tag_datatag(w, "status", "Administrative status", + lldpctl_atom_get_str(port, lldpctl_k_port_status)); + } display_chassis(w, chassis, details); display_port(w, port, details); @@ -818,7 +822,7 @@ display_local_interfaces(lldpctl_conn_t *conn, struct writer *w, tag_start(w, "lldp", "LLDP interfaces"); while ((iface = cmd_iterate_on_interfaces(conn, env))) { lldpctl_atom_t *port; - port = lldpctl_get_port(iface); + port = lldpctl_get_port(iface); display_interface(conn, w, hidden, iface, port, details, protocol); lldpctl_atom_dec_ref(port); } diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py index c89c1dbe..a470c7f6 100644 --- a/tests/integration/test_basic.py +++ b/tests/integration/test_basic.py @@ -62,7 +62,7 @@ def test_one_interface(lldpd1, lldpd, lldpcli, namespaces): del out['lldp.eth0.chassis.descr'] del out['lldp.eth0.chassis.Router.enabled'] del out['lldp.eth0.chassis.Station.enabled'] - assert out == {"lldp.eth0.via": "unknown", + assert out == {"lldp.eth0.status": "RX and TX", "lldp.eth0.chassis.mac": "00:00:00:00:00:01", "lldp.eth0.chassis.name": "ns-1.example.com", "lldp.eth0.chassis.mgmt-ip": "fe80::200:ff:fe00:1", -- 2.39.5