From 73f56701e35b8ac374792d21378d0cc89d5333e0 Mon Sep 17 00:00:00 2001 From: David Bell Date: Mon, 6 Feb 2017 22:43:02 +0000 Subject: [PATCH] newdevice: Added more Netgear detection #5789 --- includes/definitions/netgear.yaml | 4 +++- tests/OSDiscoveryTest.php | 1 + tests/snmpsim/netgear2.snmprec | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 tests/snmpsim/netgear2.snmprec diff --git a/includes/definitions/netgear.yaml b/includes/definitions/netgear.yaml index 2b21dfe08c..b31d146e18 100644 --- a/includes/definitions/netgear.yaml +++ b/includes/definitions/netgear.yaml @@ -7,5 +7,7 @@ bad_if: over: - { graph: device_bits, text: 'Device Traffic' } discovery: - - sysObjectId: .1.3.6.1.4.1.4526 + - sysObjectId: + - .1.3.6.1.4.1.4526 + - .1.3.6.1.4.1.89.1.1.1.3.6.1.4.1.4526.100.4 - sysDescr: ProSafe diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php index 408f7d4ec5..130ee09e4d 100644 --- a/tests/OSDiscoveryTest.php +++ b/tests/OSDiscoveryTest.php @@ -1031,6 +1031,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase { $this->checkOS('netgear'); $this->checkOS('netgear', 'netgear1'); + $this->checkOS('netgear', 'netgear2'); } public function testNetmanplus() diff --git a/tests/snmpsim/netgear2.snmprec b/tests/snmpsim/netgear2.snmprec new file mode 100644 index 0000000000..fe7f19b719 --- /dev/null +++ b/tests/snmpsim/netgear2.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|24-Port Gigabit Smart Switch with PoE and 4 SFP uplinks +1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.89.1.1.1.3.6.1.4.1.4526.100.4.25