[cisco] Add vlans on trunk ports (librenms#18360)

* [cisco] Add vlans on trunk ports

* Refactor VLAN processing logic in Cisco.php

* Fix formatting in Cisco.php

* Fix formatting issues in Cisco.php again ...

* Fix tests

* Fix existing logic

* More fix

* and tests

* Update iosxe_c9800.json

tests

* better vlan mapping

But still incomplete c9800 data I suppose, let's check

* once more

* test data

---------

Co-authored-by: PipoCanaja <[email protected]>

Author: Npeca75

LibreNMS/OS/Shared/Cisco.php

@@ -63,6 +63,7 @@
 use LibreNMS\RRD\RrdDefinition;
 use LibreNMS\Util\IP;
 use LibreNMS\Util\Mac;
+use LibreNMS\Util\StringHelpers;
 use SnmpQuery;
 
 class Cisco extends OS implements
@@ -996,17 +997,48 @@ public function discoverVlanPorts(Collection $vlans): Collection
             return $ports;
         }
 
-        // Only returns 'untagged' vlan for each port (either access ports, or native vlan of a trunk)
-        // stored for use in below loop
         $native_vlans_raw = SnmpQuery::abortOnFailure()->walk([
-            'CISCO-VTP-MIB::vlanTrunkPortNativeVlan',
+            'CISCO-VTP-MIB::vlanTrunkPortTable',
             'CISCO-VLAN-MEMBERSHIP-MIB::vmVlan',
         ])->table(1);
 
         // Hash Table indexed by vlans and ifIndexes
         foreach ($native_vlans_raw as $ifindex => $data) {
+            // Only returns 'untagged' vlan for each port (either access ports, or native vlan of a trunk)
+            // stored for use in below loop
             $vlan_id = $data['CISCO-VLAN-MEMBERSHIP-MIB::vmVlan'] ?? $data['CISCO-VTP-MIB::vlanTrunkPortNativeVlan'] ?? 0;
-            $isNative[$vlan_id][$ifindex] = 1;
+            if ($vlan_id > 0) {
+                $isNative[$vlan_id][$ifindex] = 1;
+            }
+            if (isset($data['CISCO-VTP-MIB::vlanTrunkPortDynamicState']) && $data['CISCO-VTP-MIB::vlanTrunkPortDynamicState'] == 2) {
+                continue; // This port is not a trunk, so continue to next one
+            }
+            // Only returns 'tagged' vlan for each port
+            // stored for use in below loop
+            if (isset($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined'])) {
+                $vlanIds = StringHelpers::bitsToIndices($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined']);
+                foreach ($vlanIds as $vlan_id) {
+                    $isNative[$vlan_id - 1][$ifindex] = $isNative[$vlan_id - 1][$ifindex] ?? 0;
+                }
+            }
+            if (isset($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined2k'])) {
+                $vlanIds = StringHelpers::bitsToIndices($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined2k']);
+                foreach ($vlanIds as $vlan_id) {
+                    $isNative[$vlan_id + 1023][$ifindex] = $isNative[$vlan_id + 1023][$ifindex] ?? 0;
+                }
+            }
+            if (isset($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined3k'])) {
+                $vlanIds = StringHelpers::bitsToIndices($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined3k']);
+                foreach ($vlanIds as $vlan_id) {
+                    $isNative[$vlan_id + 2047][$ifindex] = $isNative[$vlan_id + 2047][$ifindex] ?? 0;
+                }
+            }
+            if (isset($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined4k'])) {
+                $vlanIds = StringHelpers::bitsToIndices($data['CISCO-VTP-MIB::vlanTrunkPortVlansXmitJoined4k']);
+                foreach ($vlanIds as $vlan_id) {
+                    $isNative[$vlan_id + 3071][$ifindex] = $isNative[$vlan_id + 3071][$ifindex] ?? 0;
+                }
+            }
         }
 
         // process all the discovered vlans
@@ -1035,13 +1067,13 @@ public function discoverVlanPorts(Collection $vlans): Collection
                         'priority' => $data['BRIDGE-MIB::dot1dStpPortPriority'] ?? 0,
                         'state' => $data['BRIDGE-MIB::dot1dStpPortState'] ?? 'unknown',
                         'cost' => $data['BRIDGE-MIB::dot1dStpPortPathCost'] ?? 0,
-                        'untagged' => isset($isNative[$vlan_id][$ifindex]),
+                        'untagged' => isset($isNative[$vlan_id][$ifindex]) && $isNative[$vlan_id][$ifindex] > 0,
                         'port_id' => PortCache::getIdFromIfIndex($ifindex, $this->getDeviceId()) ?? 0, // ifIndex from device
                     ]));
                 }
             }
 
-            // Let's do the native/access that were not processed above
+            // Let's do the ones that were not processed above
             // if we have isNative for this vlan, then we check which ifindexes are not yet processed and we add them.
             if (isset($isNative[$vlan_id])) {
                 foreach ($isNative[$vlan_id] as $ifindex => $value) {
@@ -1051,7 +1083,7 @@ public function discoverVlanPorts(Collection $vlans): Collection
                     $ports->push(new PortVlan([
                         'vlan' => $vlan_id,
                         'baseport' => $this->bridgePortFromIfIndex($ifindex),
-                        'untagged' => 1,
+                        'untagged' => $value,
                         'state' => 'unknown',
                         'port_id' => PortCache::getIdFromIfIndex($ifindex, $this->getDeviceId()) ?? 0, // ifIndex from device,
                     ]));

tests/data/iosxe_c9800.json

@@ -5729,6 +5729,22 @@
                     "cost": 0,
                     "untagged": 1
                 },
+                {
+                    "vlan": 1,
+                    "baseport": 0,
+                    "priority": 0,
+                    "state": "unknown",
+                    "cost": 0,
+                    "untagged": 0
+                },
+                {
+                    "vlan": 5,
+                    "baseport": 0,
+                    "priority": 0,
+                    "state": "unknown",
+                    "cost": 0,
+                    "untagged": 0
+                },
                 {
                     "vlan": 52,
                     "baseport": 0,
@@ -5752,6 +5768,14 @@
                     "state": "unknown",
                     "cost": 0,
                     "untagged": 1
+                },
+                {
+                    "vlan": 72,
+                    "baseport": 0,
+                    "priority": 0,
+                    "state": "unknown",
+                    "cost": 0,
+                    "untagged": 0
                 }
             ]
         }