From c617dd69622bf984264548cf9e8691f994773b0e Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Wed, 22 Mar 2017 22:43:47 +0000
Subject: [PATCH] newdevice: Updated Sonus SBC os detection #6241

---
 includes/definitions/sonus-sbc.yaml | 2 +-
 tests/OSDiscoveryTest.php           | 1 +
 tests/snmpsim/sonus-sbc1500.snmprec | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 tests/snmpsim/sonus-sbc1500.snmprec

diff --git a/includes/definitions/sonus-sbc.yaml b/includes/definitions/sonus-sbc.yaml
index 89b31bd6f7..7e8f628850 100644
--- a/includes/definitions/sonus-sbc.yaml
+++ b/includes/definitions/sonus-sbc.yaml
@@ -4,5 +4,5 @@ type: appliance
 icon: sonus
 discovery:
     - sysObjectId:
-        - .1.3.6.1.4.1.2879.1.9.2
+        - .1.3.6.1.4.1.2879.1.9.
         - .1.3.6.1.4.1.177.15.1.1.1
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index c12ba4acfe..3e6bd869ae 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1581,6 +1581,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     {
         $this->checkOS('sonus-sbc');
         $this->checkOS('sonus-sbc', 'sonus-sbc1');
+        $this->checkOS('sonus-sbc', 'sonus-sbc1500');
     }
 
     public function testSophos()
diff --git a/tests/snmpsim/sonus-sbc1500.snmprec b/tests/snmpsim/sonus-sbc1500.snmprec
new file mode 100644
index 0000000000..9c85df8465
--- /dev/null
+++ b/tests/snmpsim/sonus-sbc1500.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Sonus SBC 5100 version sbc-V05.01.01-R000.x86_64
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2879.1.9.3