Rebased + added OS Tests

mibs/netonix/NETONIX-SWITCH-MIB

@@ -7,11 +7,11 @@ IMPORTS
     DisplayString,TEXTUAL-CONVENTION FROM SNMPv2-TC;
 
 netonixSwitch MODULE-IDENTITY
-     LAST-UPDATED "9803231700Z"
+     LAST-UPDATED "9803231800Z"
      ORGANIZATION "Netonix"
      CONTACT-INFO "eric@netonix.com"
      DESCRIPTION "The MIB Module for Netonix Switches."
-     REVISION "9803231700Z"
+     REVISION "9803231800Z"
      DESCRIPTION "The MIB Module for Netonix Switches."
     ::= { enterprises 46242 }
 
@@ -22,7 +22,10 @@ netonixSwitchGroup OBJECT-GROUP
 	temp,
 	voltageDescription,
 	voltage,
-	poeStatus
+	poeStatus,
+	totalPowerConsumption,
+	dcdcInputCurrent,
+	dcdcEfficiency
     }
     STATUS  current
     DESCRIPTION "A collection of objects providing basic instrumentation and control of an SNMPv2 entity."
@@ -44,6 +47,18 @@ VoltageTC ::= TEXTUAL-CONVENTION
     DESCRIPTION  "A voltage with 2 decimal places"
     SYNTAX       Integer32
 
+PowerTC ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "d-1"
+    STATUS       current
+    DESCRIPTION  "Power consumption in watts with 1 decimal place"
+    SYNTAX       Integer32
+
+CurrentTC ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "d-1"
+    STATUS       current
+    DESCRIPTION  "Current in amps with 1 decimal place"
+    SYNTAX       Integer32
+
 firmwareVersion OBJECT-TYPE
      SYNTAX     DisplayString (SIZE (0..255))
      MAX-ACCESS read-only
@@ -51,6 +66,27 @@ firmwareVersion OBJECT-TYPE
      DESCRIPTION "The version of the firmware running on the switch"
      ::= { netonixSwitch 1 }
 
+totalPowerConsumption OBJECT-TYPE
+     SYNTAX	PowerTC
+     MAX-ACCESS read-only
+     STATUS current
+     DESCRIPTION "Total power being consumed by the switch, in Watts"
+     ::= { netonixSwitch 6 }
+
+dcdcInputCurrent OBJECT-TYPE
+     SYNTAX	CurrentTC
+     MAX-ACCESS read-only
+     STATUS current
+     DESCRIPTION "DCDC Input Current in amps"
+     ::= { netonixSwitch 7 }
+
+dcdcEfficiency OBJECT-TYPE
+     SYNTAX	Integer32
+     MAX-ACCESS read-only
+     STATUS current
+     DESCRIPTION "DCDC power supply efficiency, percentage"
+     ::= { netonixSwitch 8 }
+
 fanTable OBJECT-TYPE
     SYNTAX	SEQUENCE OF FanEntry
     MAX-ACCESS	not-accessible
@@ -86,14 +122,14 @@ fanSpeed OBJECT-TYPE
     ::= { fanEntry 2 }
 
 poeStatusTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF PoEStatus
+    SYNTAX	SEQUENCE OF PoEStatusEntry
     MAX-ACCESS	not-accessible
     STATUS	current
     DESCRIPTION "PoE Status per port."
     ::= { netonixSwitch 5 }
 
 poeStatusEntry OBJECT-TYPE
-    SYNTAX     PoeStatusEntry
+    SYNTAX     PoEStatusEntry
     MAX-ACCESS not-accessible
     STATUS     current
     DESCRIPTION "An entry containing poe status."