mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Updated vlan discovery to support JunOS (#6597)

Browse Source
This commit is contained in:
Neil Lathwood
2017-05-13 23:06:14 +01:00
committed by GitHub
parent 073b444d4a
commit 4d0832e412
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/discovery/vlans.inc.php
View File

@@ -23,8 +23,12 @@ foreach ($tmp_base_indexes as $index => $array) {
}
$index_to_base = array_flip($base_to_index);
require 'includes/discovery/vlans/q-bridge-mib.inc.php';
require 'includes/discovery/vlans/cisco-vtp.inc.php';
if ($device['os'] === 'junos') {
require 'includes/discovery/vlans/junos.inc.php';
} else {
require 'includes/discovery/vlans/q-bridge-mib.inc.php';
require 'includes/discovery/vlans/cisco-vtp.inc.php';
}
// Fetch switchport <> VLAN relationships. This is DIRTY.
foreach ($device['vlans'] as $domain_id => $vlans) {

38
includes/discovery/vlans/junos.inc.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
echo 'JUNIPER-VLAN-MIB VLANs: ';
$vlanversion = snmp_get($device, 'dot1qVlanVersionNumber.0', '-Oqv', 'IEEE8021-Q-BRIDGE-MIB');
if ($vlanversion == 'version1' || $vlanversion == '2') {
echo "ver $vlanversion ";
$vtpdomain_id = '1';
$vlans = snmpwalk_cache_oid($device, 'jnxExVlanName', array(), 'JUNIPER-VLAN-MIB');
$tagoruntag = snmpwalk_cache_oid($device, 'jnxExVlanTag', array(), 'JUNIPER-VLAN-MIB', null, '-OQUs --hexOutputLength=0');
$untag = snmpwalk_cache_oid($device, 'jnxExVlanPortTagness', array(), 'JUNIPER-VLAN-MIB', null, '-OQeUs --hexOutputLength=0');
foreach ($vlans as $vlan_id => $vlan) {
$vlan_id = $tagoruntag[$vlan_id]['jnxExVlanTag'];
d_echo(" $vlan_id");
if (is_array($vlans_db[$vtpdomain_id][$vlan_id])) {
echo '.';
} else {
dbInsert(array(
'device_id' => $device['device_id'],
'vlan_domain' => $vtpdomain_id,
'vlan_vlan' => $vlan_id,
'vlan_name' => $vlan['jnxExVlanName'],
'vlan_type' => array('NULL')
), 'vlans');
echo '+';
}
$device['vlans'][$vtpdomain_id][$vlan_id] = $vlan_id;
$egress_ids = $tagoruntag[$vlan_id]['jnxExVlanTag'];
foreach ($egress_ids as $port_id) {
$ifIndex = $base_to_index[$port_id];
$per_vlan_data[$vlan_id][$ifIndex]['untagged'] = $untagged_ids;
}
}
}

0
mibs/junos/mib-jnx-vlan.txt → mibs/junos/JUNIPER-VLAN-MIB
View File