From 76b4cba8dfae018d1852bf789d7b0d602b3aa52b Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 30 Nov 2015 12:57:47 -0600
Subject: [PATCH] New MIBs for Netonix Switch. Use the new enterprise ID 46242
 for discovery. Fixes #2187

---
 includes/discovery/os/netonix.inc.php |  9 +++----
 mibs/netonix/NETONIX-SWITCH-MIB       | 39 +++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/includes/discovery/os/netonix.inc.php b/includes/discovery/os/netonix.inc.php
index 04f977230b..46ee5b89ea 100644
--- a/includes/discovery/os/netonix.inc.php
+++ b/includes/discovery/os/netonix.inc.php
@@ -1,7 +1,6 @@
 <?php
-
-$version = snmp_get($device, 'firmwareVersion.0', '-Osqnv', 'NETONIX-SWITCH-MIB', 'mibs:mibs/netonix/');
-list(,$version) = explode(': ', $version);
-if (is_numeric($version)) {
-    $os = 'netonix';
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.46242')) {
+        $os = 'netonix';
+    }
 }
diff --git a/mibs/netonix/NETONIX-SWITCH-MIB b/mibs/netonix/NETONIX-SWITCH-MIB
index d473f9c04a..2c57e67ca3 100644
--- a/mibs/netonix/NETONIX-SWITCH-MIB
+++ b/mibs/netonix/NETONIX-SWITCH-MIB
@@ -13,7 +13,7 @@ netonixSwitch MODULE-IDENTITY
      DESCRIPTION "The MIB Module for Netonix Switches."
      REVISION "9803231700Z"
      DESCRIPTION "The MIB Module for Netonix Switches."
-    ::= { enterprises 99999 }
+    ::= { enterprises 46242 }
 
 netonixSwitchGroup OBJECT-GROUP
     OBJECTS { firmwareVersion,
@@ -21,7 +21,8 @@ netonixSwitchGroup OBJECT-GROUP
 	tempDescription,
 	temp,
 	voltageDescription,
-	voltage
+	voltage,
+	poeStatus
     }
     STATUS  current
     DESCRIPTION "A collection of objects providing basic instrumentation and control of an SNMPv2 entity."
@@ -84,6 +85,40 @@ fanSpeed OBJECT-TYPE
     DESCRIPTION "Integer reference number (row number) for the fan mib."
     ::= { fanEntry 2 }
 
+poeStatusTable OBJECT-TYPE
+    SYNTAX	SEQUENCE OF PoEStatus
+    MAX-ACCESS	not-accessible
+    STATUS	current
+    DESCRIPTION "PoE Status per port."
+    ::= { netonixSwitch 5 }
+
+poeStatusEntry OBJECT-TYPE
+    SYNTAX     PoeStatusEntry
+    MAX-ACCESS not-accessible
+    STATUS     current
+    DESCRIPTION "An entry containing poe status."
+    INDEX      { poeStatusIndex }
+    ::= { poeStatusTable  1 }
+
+PoEStatusEntry ::= SEQUENCE {
+    poeStatusIndex		Integer32,
+    poeStatus		DisplayString
+}
+
+poeStatusIndex OBJECT-TYPE
+    SYNTAX	Integer32 (0..65535)
+    MAX-ACCESS	not-accessible
+    STATUS	current
+    DESCRIPTION "Integer reference number (row number) for the poe status."
+    ::= { poeStatusEntry 1 }
+
+poeStatus OBJECT-TYPE
+    SYNTAX	DisplayString (SIZE (0..255))
+    MAX-ACCESS	read-only
+    STATUS	current
+    DESCRIPTION "poe status."
+    ::= { poeStatusEntry 2 }
+
 tempTable OBJECT-TYPE
     SYNTAX	SEQUENCE OF TempEntry
     MAX-ACCESS	not-accessible