userspace/snmpd: update MIB and code for wrsTemperature

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/snmpd: update MIB and code for wrsTemperature
Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
8b8d7ef0 · Adam Wujek · 459b5293 · 8b8d7ef0 · 8b8d7ef0 · 8b8d7ef0
Commit 8b8d7ef0 authored Mar 20, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 69 additions and 66 deletions

WR-SWITCH-MIB.txt userspace/snmpd/WR-SWITCH-MIB.txt +67 -65

wrsTemperature.c userspace/snmpd/wrsTemperature.c +1 -1

wrsTemperature.h userspace/snmpd/wrsTemperature.h +1 -0

No files found.
--- a/userspace/snmpd/WR-SWITCH-MIB.txt
+++ b/userspace/snmpd/WR-SWITCH-MIB.txt
@@ -544,69 +544,6 @@ portSfpErrorX OBJECT-TYPE
    ::= { wrsPortsEntryX 10 }

 -- wrsTemperatureX (.5)
-tempFPGAX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "FPGA temperature"
-    ::= { wrsTemperatureX 1 }
-
-tempPLLX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "PLL temperature"
-    ::= { wrsTemperatureX 2 }
-
-tempPSLX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Power Supply Left (PSL) temperature"
-    ::= { wrsTemperatureX 3 }
-
-tempPSRX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Power Supply Right (PSR) temperature"
-    ::= { wrsTemperatureX 4 }
-
-tempTholdFPGAX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Threshold level for FPGA temperature"
-    ::= { wrsTemperatureX 5 }
-
-tempTholdPLLX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Threshold level for PLL temperature"
-    ::= { wrsTemperatureX 6 }
-
-tempTholdPSLX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Threshold level for Power Supply Left (PSL) temperature"
-    ::= { wrsTemperatureX 7 }
-
-tempTholdPSRX OBJECT-TYPE
-    SYNTAX         INTEGER
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Threshold level for Power Supply Right (PSR) temperature"
-    ::= { wrsTemperatureX 8 }

 tempWarningX OBJECT-TYPE
    SYNTAX         INTEGER {
@@ -714,11 +651,76 @@ wrsDateString   OBJECT-TYPE
        "The current TAI time, printed as %y-%m-%d-%H:%M:%S (no time zone)"
    ::= { wrsDate 2 }

--wrsOperationStatus      OBJECT IDENTIFIER ::= { wrsExpertStatus 1 }
+wrsOperationStatus      OBJECT IDENTIFIER ::= { wrsExpertStatus 1 }

 --wrsCurrentTimeGroup     OBJECT IDENTIFIER ::= { wrsOperationStatus 1 }
 --wrsBootStatusGroup      OBJECT IDENTIFIER ::= { wrsOperationStatus 2 }
--wrsTemperatureGroup     OBJECT IDENTIFIER ::= { wrsOperationStatus 3 }
+wrsTemperatureGroup     OBJECT IDENTIFIER ::= { wrsOperationStatus 3 }
+
+-- wrsTemperatureGroup (.6.1.3)
+wrsTempFPGA OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "FPGA temperature"
+    ::= { wrsTemperatureGroup 1 }
+
+wrsTempPLL OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "PLL temperature"
+    ::= { wrsTemperatureGroup 2 }
+
+wrsTempPSL OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Power Supply Left (PSL) temperature"
+    ::= { wrsTemperatureGroup 3 }
+
+wrsTempPSR OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Power Supply Right (PSR) temperature"
+    ::= { wrsTemperatureGroup 4 }
+
+wrsTempThresholdFPGA OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Threshold level for FPGA temperature"
+    ::= { wrsTemperatureGroup 5 }
+
+wrsTempThresholdPLL OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Threshold level for PLL temperature"
+    ::= { wrsTemperatureGroup 6 }
+
+wrsTempThresholdPSL OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Threshold level for Power Supply Left (PSL) temperature"
+    ::= { wrsTemperatureGroup 7 }
+
+wrsTempThresholdPSR OBJECT-TYPE
+    SYNTAX         Integer32
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Threshold level for Power Supply Right (PSR) temperature"
+    ::= { wrsTemperatureGroup 8 }

 --wrsRestartCntGroup      OBJECT IDENTIFIER ::= { wrsExpertStatus 2 }
 --wrsSpllState            OBJECT IDENTIFIER ::= { wrsExpertStatus 3 }

--- a/userspace/snmpd/wrsTemperature.c
+++ b/userspace/snmpd/wrsTemperature.c
@@ -56,7 +56,7 @@ time_t wrsTemperature_data_fill(void)
 	return time_update;
 }

-#define GT_OID WRS_OID, 6, 2
+#define GT_OID WRSTEMPERATURE_OID
 #define GT_PICKINFO wrsTemperature_pickinfo
 #define GT_DATA_FILL_FUNC wrsTemperature_data_fill
 #define GT_DATA_STRUCT wrsTemperature_s

--- a/userspace/snmpd/wrsTemperature.h
+++ b/userspace/snmpd/wrsTemperature.h
@@ -2,6 +2,7 @@
 #define WRS_WRS_TEMPERATURE_H

 #define WRSTEMPERATURE_CACHE_TIMEOUT 5
+#define WRSTEMPERATURE_OID WRS_OID, 6, 1, 3

 struct wrsTemperature_s {
 	int temp_fpga;		/* FPGA temperature */