clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 10:28:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update IOS with 4948 variant hardware detection (#12685)

Browse Source 
* Update IOS with 4948 variant hardware detection

* Use entPhysicalModelName if Switch System match
* Add test data for 4948e and 4948-10ge variants

Signed-off-by: Misha Komarovskiy <zombah@gmail.com>

* Fix bracket error

Signed-off-by: Misha Komarovskiy <zombah@gmail.com>

* Add json test data

Signed-off-by: Misha Komarovskiy <zombah@gmail.com>
This commit is contained in:
Misha Komarovskiy 2021-04-05 23:26:38 +03:00 committed by GitHub
parent 339227280a
commit 61b4c35ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/OS/Shared/Cisco.php
View File

@ -100,7 +100,7 @@ class Cisco extends OS implements OSDiscovery, ProcessorDiscovery, MempoolsDisco
}
}
if (empty($hardware) && ! empty($data[1000]['entPhysicalModelName'])) {
if ((empty($hardware) || preg_match('/Switch System/', $hardware)) && ! empty($data[1000]['entPhysicalModelName'])) {
$hardware = $data[1000]['entPhysicalModelName'];
} elseif (empty($hardware) && ! empty($data[1000]['entPhysicalContainedIn'])) {
$hardware = $data[$data[1000]['entPhysicalContainedIn']]['entPhysicalName'];

23
tests/data/ios_4948-10ge.json Normal file
View File

@ -0,0 +1,23 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.659",
"sysDescr": "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500-IPBASEK9-M), Version 15.0(2)SG11, RELEASE SOFTWARE (fc2)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2016 by Cisco Systems, Inc.\r\nCompiled Mon 24-Oct-16 10:00 by pr",
"sysContact": "<private>",
"version": "15.0(2)SG11",
"hardware": "WS-C4948-10GE",
"features": "IPBASEK9",
"os": "ios",
"type": "network",
"serial": "<private>",
"icon": "cisco.svg",
"location": "<private>"
}
]
},
"poller": "matches discovery"
}
}

23
tests/data/ios_4948e.json Normal file
View File

@ -0,0 +1,23 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.1178",
"sysDescr": "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M), Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2015 by Cisco Systems, Inc.\r\nCompiled Tue 07-Apr-15 10:40",
"sysContact": "<private>",
"version": "15.0(2)SG10",
"hardware": "WS-C4948E",
"features": "ENTSERVICESK9",
"os": "ios",
"type": "network",
"serial": "<private>",
"icon": "cisco.svg",
"location": "<private>"
}
]
},
"poller": "matches discovery"
}
}

17
tests/snmpsim/ios_4948-10ge.snmprec Normal file
View File

@ -0,0 +1,17 @@
1.3.6.1.2.1.1.1.0|4x|436973636f20494f5320536f6674776172652c20436174616c7973742034353030204c332053776974636820536f6674776172652028636174343530302d4950424153454b392d4d292c2056657273696f6e2031352e30283229534731312c2052454c4541534520534f4654574152452028666332290a546563686e6963616c20537570706f72743a20687474703a2f2f7777772e636973636f2e636f6d2f74656368737570706f72740d0a436f707972696768742028632920313938362d3230313620627920436973636f2053797374656d732c20496e632e0d0a436f6d70696c6564204d6f6e2032342d4f63742d31362031303a3030206279207072
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.659
1.3.6.1.2.1.1.3.0|67|3204930739
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.2.1.47.1.1.1.1.4.1|2|0
1.3.6.1.2.1.47.1.1.1.1.4.1000|2|2
1.3.6.1.2.1.47.1.1.1.1.4.1001|2|1000
1.3.6.1.2.1.47.1.1.1.1.7.1|4|Switch System
1.3.6.1.2.1.47.1.1.1.1.10.1|4|
1.3.6.1.2.1.47.1.1.1.1.11.1|4|<private>
1.3.6.1.2.1.47.1.1.1.1.11.1001|4|
1.3.6.1.2.1.47.1.1.1.1.13.1|4|
1.3.6.1.2.1.47.1.1.1.1.13.1000|4|WS-C4948-10GE
1.3.6.1.2.1.47.1.1.1.1.13.1001|4|
1.3.6.1.6.3.10.2.1.3.0|2|117956722

17
tests/snmpsim/ios_4948e.snmprec Normal file
View File

@ -0,0 +1,17 @@
1.3.6.1.2.1.1.1.0|4x|436973636f20494f5320536f6674776172652c20436174616c7973742034353030204c332053776974636820536f667477617265202863617434353030652d454e5453455256494345534b392d4d292c2056657273696f6e2031352e30283229534731302c2052454c4541534520534f4654574152452028666331290a546563686e6963616c20537570706f72743a20687474703a2f2f7777772e636973636f2e636f6d2f74656368737570706f72740d0a436f707972696768742028632920313938362d3230313520627920436973636f2053797374656d732c20496e632e0d0a436f6d70696c6564205475652030372d4170722d31352031303a3430
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.1178
1.3.6.1.2.1.1.3.0|67|358708345
1.3.6.1.2.1.1.4.0|4|<private>
1.3.6.1.2.1.1.5.0|4|<private>
1.3.6.1.2.1.1.6.0|4|<private>
1.3.6.1.2.1.47.1.1.1.1.4.1|2|0
1.3.6.1.2.1.47.1.1.1.1.4.1000|2|2
1.3.6.1.2.1.47.1.1.1.1.4.1001|2|1000
1.3.6.1.2.1.47.1.1.1.1.7.1|4|Switch System
1.3.6.1.2.1.47.1.1.1.1.10.1|4|
1.3.6.1.2.1.47.1.1.1.1.11.1|4|<private>
1.3.6.1.2.1.47.1.1.1.1.11.1001|4|
1.3.6.1.2.1.47.1.1.1.1.13.1|4|
1.3.6.1.2.1.47.1.1.1.1.13.1000|4|WS-C4948E
1.3.6.1.2.1.47.1.1.1.1.13.1001|4|
1.3.6.1.6.3.10.2.1.3.0|2|132438681