From 5b3283d572a2adc73ebced8e14ffaa490285d5b5 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Mon, 14 Nov 2016 08:28:55 +0000
Subject: [PATCH] newdevice: Added support for Dell PowerConnect 6024

---
 includes/discovery/os/avaya-ers.inc.php    | 2 +-
 includes/discovery/os/powerconnect.inc.php | 2 ++
 tests/OSDiscoveryTest.php                  | 5 +++++
 tests/snmpsim/powerconnect.snmprec         | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 tests/snmpsim/powerconnect.snmprec

diff --git a/includes/discovery/os/avaya-ers.inc.php b/includes/discovery/os/avaya-ers.inc.php
index eacf40c9d8..36ba27b9d9 100644
--- a/includes/discovery/os/avaya-ers.inc.php
+++ b/includes/discovery/os/avaya-ers.inc.php
@@ -1,5 +1,5 @@
 <?php
 
-if (str_contains($sysDescr, array('Ethernet Routing Switch', 'ERS-'))) {
+if (str_contains($sysDescr, array('Ethernet Routing Switch', 'ERS-')) && !starts_with($sysObjectId, '.1.3.6.1.4.1.674.10895.3000')) {
     $os = 'avaya-ers';
 }
diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php
index 1d661cc391..afc7102a10 100644
--- a/includes/discovery/os/powerconnect.inc.php
+++ b/includes/discovery/os/powerconnect.inc.php
@@ -8,4 +8,6 @@ if (str_contains($sysDescr, 'PowerConnect') && !str_contains($sysDescr, 'ArubaOS
     $os = 'powerconnect';
 } elseif (str_contains(snmp_get($device, '.1.3.6.1.4.1.674.10895.3000.1.2.100.1.0', '-Oqv', ''), 'PowerConnect', true)) {
     $os = 'powerconnect';
+} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.674.10895.3000')) {
+    $os = 'powerconnect';
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index c6027c9657..b4ee4dd993 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1049,6 +1049,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('poweralert');
     }
 
+    public function testPowerconnect()
+    {
+        $this->checkOS('powerconnect');
+    }
+
     public function testPowervault()
     {
         $this->checkOS('powervault');
diff --git a/tests/snmpsim/powerconnect.snmprec b/tests/snmpsim/powerconnect.snmprec
new file mode 100644
index 0000000000..0c0992a7a0
--- /dev/null
+++ b/tests/snmpsim/powerconnect.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Ethernet Routing Switch
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.674.10895.3000