From 1d796fecfe1f69f1f995275f7a26c5d0c635f0dd Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Mon, 8 Feb 2016 13:58:03 -0600 Subject: [PATCH] Add a generic way to allow empty ifDescr on ports for an OS. --- includes/definitions.inc.php | 1 + includes/functions.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 0d3ffc2e2..7b874be86 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -316,6 +316,7 @@ $os = 'calix'; $config['os'][$os]['text'] = 'Calix E7'; $config['os'][$os]['type'] = 'network'; $config['os'][$os]['ifname'] = 1; +$config['os'][$os]['empty_ifdescr'] = 1; $config['os'][$os]['icon'] = 'calix'; $config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['text'] = 'Device Traffic'; diff --git a/includes/functions.php b/includes/functions.php index 883bccc65..f5949aae3 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -895,7 +895,7 @@ function is_port_valid($port, $device) { } } } - if (empty($port['ifDescr']) && !$device['os'] == "calix") { + if (empty($port['ifDescr']) && !$config['os'][$device['os']]['empty_ifdescr']) { $valid = 0; } if ($device['os'] == "catos" && strstr($if, "vlan")) {