From: Vincent Bernat <vincent@bernat.ch>
Date: Sat, 27 Jul 2019 15:36:35 +0000 (+0200)
Subject: client: don't display management interface index if unknown
X-Git-Tag: 1.0.5~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30fca74bf43fbd14d7840c59c3dee9703da4bcd4;p=thirdparty%2Flldpd.git

client: don't display management interface index if unknown
---

diff --git a/src/client/display.c b/src/client/display.c
index dc130703..d416e5d4 100644
--- a/src/client/display.c
+++ b/src/client/display.c
@@ -258,8 +258,9 @@ display_chassis(struct writer* w, lldpctl_atom_t* chassis, int details)
 	lldpctl_atom_foreach(mgmts, mgmt) {
 		tag_datatag(w, "mgmt-ip", "MgmtIP",
 		    lldpctl_atom_get_str(mgmt, lldpctl_k_mgmt_ip));
-		tag_datatag(w, "mgmt-iface", "MgmtIface",
-		    lldpctl_atom_get_str(mgmt, lldpctl_k_mgmt_iface_index));
+		if (lldpctl_atom_get_int(mgmt, lldpctl_k_mgmt_iface_index))
+			tag_datatag(w, "mgmt-iface", "MgmtIface",
+			    lldpctl_atom_get_str(mgmt, lldpctl_k_mgmt_iface_index));
 	}
 	lldpctl_atom_dec_ref(mgmts);
 
diff --git a/tests/integration/test_basic.py b/tests/integration/test_basic.py
index f2cea6ba..3e31d532 100644
--- a/tests/integration/test_basic.py
+++ b/tests/integration/test_basic.py
@@ -152,7 +152,7 @@ def test_forced_unknown_management_address(lldpd1, lldpd, lldpcli, namespaces):
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors")
         assert out["lldp.eth0.chassis.mgmt-ip"] == "2001:db8::47"
-        assert out["lldp.eth0.chassis.mgmt-iface"] == "0"
+        assert "lldp.eth0.chassis.mgmt-iface" not in out
 
 
 def test_forced_known_management_address(lldpd1, lldpd, lldpcli, namespaces):