Timos sap dot1q graphing fix (librenms#13654)

* Added wireless MSE * dot1q sap graph fix * Fix removed files * fix * Fixed style * Fixed style * Fixed style * Removed vscode workspace file * Clarification
sunblade · Jan 9, 2022 · fa3367f · fa3367f
1 parent cc83ab5
commit fa3367f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/LibreNMS/OS/Timos.php b/LibreNMS/OS/Timos.php
@@ -661,6 +661,13 @@ public function pollMplsSaps($svcs)
             $svc_id = $svcs->firstWhere('svc_oid', $svcId)->svc_id;
             $traffic_id = $svcId . '.' . $sapPortId . '.' . $this->nokiaEncap($sapEncapValue);
 
+            // Any unused vlan on a port returns * in sapEncapValue but had OID .4095
+            $specialQinQIdentifier = $this->nokiaEncap($sapEncapValue);
+            if ($specialQinQIdentifier == '*') {
+                $specialQinQIdentifier = '4095';
+                $traffic_id = $svcId . '.' . $sapPortId . '.' . $specialQinQIdentifier;
+            }
+
             $saps->push(new MplsSap([
                 'svc_id' => $svc_id,
                 'svc_oid' => $svcId,

diff --git a/includes/html/functions.inc.php b/includes/html/functions.inc.php
@@ -440,6 +440,11 @@ function generate_port_url($port, $vars = [])
 
 function generate_sap_url($sap, $vars = [])
 {
+    // Overwrite special QinQ sap identifiers
+    if ($sap['sapEncapValue'] == '*') {
+        $sap['sapEncapValue'] = '4095';
+    }
+
     return \LibreNMS\Util\Url::graphPopup(['device' => $sap['device_id'], 'page' => 'graphs', 'type' => 'device_sap', 'tab' => 'routing', 'proto' => 'mpls', 'view' => 'saps', 'traffic_id' => $sap['svc_oid'] . '.' . $sap['sapPortId'] . '.' . $sap['sapEncapValue']], $vars);
 }//end generate_sap_url()