Split out OSes where necessary

includes/discovery/os/openindiana.inc.php

@@ -0,0 +1,15 @@
+<?php
+
+if (starts_with($sysDescr, 'SunOS')) {
+    list(,,$version) = explode(' ', $sysDescr);
+
+    if (version_compare($version, '5.10', '>')) {
+        if (str_contains($sysDescr, 'oi_')) {
+            $os = 'openindiana';
+        }
+    }
+}
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.42.2.1.1')) {
+    $os = 'solaris';
+}

includes/discovery/os/opensolaris.inc.php

@@ -0,0 +1,11 @@
+<?php
+
+if (starts_with($sysDescr, 'SunOS')) {
+    list(,,$version) = explode(' ', $sysDescr);
+
+    if (version_compare($version, '5.10', '>')) {
+        if (!str_contains($sysDescr, 'oi_')) {
+            $os = 'opensolaris';
+        }
+    }
+}

includes/discovery/os/sentry3.inc.php

@@ -8,9 +8,7 @@ if (starts_with($sysDescr, 'Sentry') && str_contains($sysDescr, array('Switched'
     $version = intval($version[1]);
 
     // It appears that version 8 and up is good for sentry4
-    if ($version >= 8) {
+    if ($version < 8) {
-        $os = 'sentry4';
-    } else {
         $os = 'sentry3';
     }
 }

includes/discovery/os/sentry4.inc.php

@@ -0,0 +1,14 @@
+<?php
+
+if (starts_with($sysDescr, 'Sentry') && str_contains($sysDescr, array('Switched', 'Smart'))) {
+    // ServerTech doesn't have a way to distinguish between sentry3 and sentry4 devices
+    // Hopefully, we can use the version string to figure it out
+    $version = trim(snmp_get($device, 'Sentry3-MIB::serverTech.4.1.1.1.3.0', '-Osqnv'));
+    $version = explode(" ", $version);
+    $version = intval($version[1]);
+
+    // It appears that version 8 and up is good for sentry4
+    if ($version >= 8) {
+        $os = 'sentry4';
+    }
+}

includes/discovery/os/solaris.inc.php

@@ -5,11 +5,7 @@ if (starts_with($sysDescr, 'SunOS')) {
     list(,,$version) = explode(' ', $sysDescr);
 
     if (version_compare($version, '5.10', '>')) {
-        if (str_contains($sysDescr, 'oi_')) {
+        unset($os);
-            $os = 'openindiana';
-        } else {
-            $os = 'opensolaris';
-        }
     }
 }
 

tests/OSDiscoveryTest.php

@@ -1271,7 +1271,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     public function testSwos()
     {
         $mockSnmp = array(
-            'SNMPv2-MIB::sysName.0' => 'MicroTik'
+            'SNMPv2-MIB::sysName.0' => 'MikroTik'
         );
         $this->checkOS('swos', 'RB250GS', '', $mockSnmp);
         $this->checkOS('swos', 'RB260GS', '', $mockSnmp);