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

Updated IOS-XR with NCS-5500 support for HW and version (#11044)

Browse Source 
* Add version match for newer IOS-XR NCS hardware

* Tested with NCS-5504 and NCS5508

Signed-off-by: Misha Komarovskiy <[email protected]>

* Add test data for Cisco NCS-5504 and NCS-5508

Signed-off-by: Misha Komarovskiy <[email protected]>
This commit is contained in:
Misha Komarovskiy
2020-01-17 20:04:27 +01:00
committed by PipoCanaja
parent a342a45b74
commit 25677e5edc
5 changed files with 101 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/os/iosxr.inc.php
+3
View File
@@ -4,6 +4,9 @@ if (preg_match('/^Cisco IOS XR Software \(Cisco ([^\)]+)\),\s+Version ([^\[]+)\[
$hardware = $regexp_result[1];
$features = $regexp_result[3];
$version = $regexp_result[2];
} elseif (preg_match('/^Cisco IOS XR Software \(([^\)]+)\),\s+Version\s+([^\s]+)/', $device['sysDescr'], $regexp_result)) {
$hardware = $regexp_result[1];
$version = $regexp_result[2];
} else {
// It is not an IOS-XR ... What should we do ?
}
tests/data/iosxr_ncs5504.json
+40
View File
@@ -0,0 +1,40 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.2413",
"sysDescr": "Cisco IOS XR Software (NCS-5500), Version 6.6.3 Copyright (c) 2013-2019 by Cisco Systems, Inc.",
"sysContact": null,
"version": null,
"hardware": null,
"features": null,
"os": "iosxr",
"type": "network",
"serial": null,
"icon": "cisco.svg",
"location": null
}
]
},
"poller": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.2413",
"sysDescr": "Cisco IOS XR Software (NCS-5500), Version 6.6.3 Copyright (c) 2013-2019 by Cisco Systems, Inc.",
"sysContact": "<private>",
"version": "6.6.3",
"hardware": "NCS-5504",
"features": null,
"os": "iosxr",
"type": "network",
"serial": null,
"icon": "cisco.svg",
"location": "<private>"
}
]
}
}
}
tests/data/iosxr_ncs5508.json
+40
View File
@@ -0,0 +1,40 @@
{
"os": {
"discovery": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.2349",
"sysDescr": "Cisco IOS XR Software (NCS-5500), Version 7.0.1 Copyright (c) 2013-2019 by Cisco Systems, Inc.",
"sysContact": null,
"version": null,
"hardware": null,
"features": null,
"os": "iosxr",
"type": "network",
"serial": null,
"icon": "cisco.svg",
"location": null
}
]
},
"poller": {
"devices": [
{
"sysName": "<private>",
"sysObjectID": ".1.3.6.1.4.1.9.1.2349",
"sysDescr": "Cisco IOS XR Software (NCS-5500), Version 7.0.1 Copyright (c) 2013-2019 by Cisco Systems, Inc.",
"sysContact": "<private>",
"version": "7.0.1",
"hardware": "NCS-5508",
"features": null,
"os": "iosxr",
"type": "network",
"serial": null,
"icon": "cisco.svg",
"location": "<private>"
}
]
}
}
}
tests/snmpsim/iosxr_ncs5504.snmprec
+9
View File
@@ -0,0 +1,9 @@
1.3.6.1.2.1.1.1.0|4|Cisco IOS XR Software (NCS-5500), Version 6.6.3 Copyright (c) 2013-2019 by Cisco Systems, Inc.
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.2413
1.3.6.1.2.1.1.3.0|67|148482383
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.13.8384513|4|NCS-5504
1.3.6.1.2.1.47.1.1.1.1.13.8384518|4|NCS-5504
1.3.6.1.6.3.10.2.1.3.0|2|1484824
tests/snmpsim/iosxr_ncs5508.snmprec
+9
View File
@@ -0,0 +1,9 @@
1.3.6.1.2.1.1.1.0|4|Cisco IOS XR Software (NCS-5500), Version 7.0.1 Copyright (c) 2013-2019 by Cisco Systems, Inc.
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.9.1.2349
1.3.6.1.2.1.1.3.0|67|731291663
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.13.8384513|4|NCS-5508
1.3.6.1.2.1.47.1.1.1.1.13.8384518|4|NCS-5508
1.3.6.1.6.3.10.2.1.3.0|2|7312918