userspace/snmpd: put object wrsOSStatus in correct MIB branch

Update: --MIB --Kconfig (update warning temp object name, add info about required hal restart after change treshold levels) --update wrsOSStatus Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/snmpd: put object wrsOSStatus in correct MIB branch
Update: --MIB --Kconfig (update warning temp object name, add info about required hal restart after change treshold levels) --update wrsOSStatus Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
b8d11bdd · Adam Wujek · 8b8d7ef0 · b8d11bdd · b8d11bdd · b8d11bdd
Commit b8d11bdd authored Mar 20, 2015 by Adam Wujek 💬
Showing with 32 additions and 24 deletions

Kconfig Kconfig +10 -4

WR-SWITCH-MIB.txt userspace/snmpd/WR-SWITCH-MIB.txt +19 -19

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

wrsOSStatus.h userspace/snmpd/wrsOSStatus.h +2 -0

No files found.
--- a/Kconfig
+++ b/Kconfig
@@ -367,28 +367,34 @@ config SNMP_TEMP_THOLD_FPGA
 	default "0"
 	help
 	  Threshold level for FPGA temperature, when exceeded warning is
-	  notified by WR-SWITCH-MIB::tempWarning
+	  notified by SNMP via WR-SWITCH-MIB::wrsTemperatureWarning
+	  Require hal restart after change
 config SNMP_TEMP_THOLD_PLL
 	int "Threshold level for PLL temperature"
 	default "0"
 	help
 	  Threshold level for PLL temperature, when exceeded warning is
-	  notified by WR-SWITCH-MIB::tempWarning
+	  notified by SNMP via WR-SWITCH-MIB::wrsTemperatureWarning
+	  Require hal restart after change
 config SNMP_TEMP_THOLD_PSL
 	int "Threshold level for Power Supply Left (PSL) temperature"
 	default "0"
 	help
 	  Threshold level for Power Supply Left (PSL) temperature, when
-	  exceeded warning is notified by WR-SWITCH-MIB::tempWarning
+	  exceeded warning is notified by SNMP via
+	  WR-SWITCH-MIB::wrsTemperatureWarning
+	  Require hal restart after change
 config SNMP_TEMP_THOLD_PSR
 	int "Threshold level for Power Supply Right (PSR) temperature"
 	default "0"
 	help
 	  Threshold level for Power Supply Right (PSR) temperature, when
-	  exceeded warning is notified by WR-SWITCH-MIB::tempWarning
+	  exceeded warning is notified by SNMP via
+	  WR-SWITCH-MIB::wrsTemperatureWarning
+	  Require hal restart after change
 endmenu

--- a/userspace/snmpd/WR-SWITCH-MIB.txt
+++ b/userspace/snmpd/WR-SWITCH-MIB.txt
@@ -252,7 +252,6 @@ pstatsWR17 OBJECT-TYPE
 --following objects will be moved
 wrsPpsiGlobalsX OBJECT IDENTIFIER ::= { wrsPpsi 3 }
 wrsPortsTableX OBJECT IDENTIFIER ::= { wrsPpsi 4 }
-wrsTemperatureX OBJECT IDENTIFIER ::= { wrsPpsi 5 }
 -- The Wr/PTP/Ppsi information is two items: an array of scalars
 -- and a table. In the table, the "channel" name is the row. But
@@ -543,22 +542,6 @@ portSfpErrorX OBJECT-TYPE
            "Problem with SFP configuration. Port has to be always 1GbE. Port has to be in data base as long as support WR."
    ::= { wrsPortsEntryX 10 }
-- wrsTemperatureX (.5)
-tempWarningX OBJECT-TYPE
-    SYNTAX         INTEGER {
-                        NA(0),
-                        Threshold-not-set(1),
-                        Temperature-OK(2),
-                        Temperature-too-high(3),
-    }
-    MAX-ACCESS     read-only
-    STATUS         current
-    DESCRIPTION
-            "Warning if temperature exceed threshold levels"
-    ::= { wrsTemperatureX 9 }
 -- Versions (4) are all just strings, several of them
 wrsVersionSw    OBJECT-TYPE
@@ -730,9 +713,26 @@ wrsTempThresholdPSR OBJECT-TYPE
 --wrsNetworking
 --Configuration
--wrsDetailedStatusesGroup   OBJECT IDENTIFIER ::= { wrsStatus 1 }
+wrsDetailedStatusesGroup   OBJECT IDENTIFIER ::= { wrsStatus 1 }
+wrsOSStatusGroup           OBJECT IDENTIFIER ::= { wrsDetailedStatusesGroup 1 }
+-- wrsOSStatusGroup (.254.1.1)
+wrsTemperatureWarning OBJECT-TYPE
+    SYNTAX         INTEGER {
+                        na(0),
+                        thresholdNotSet(1),
+                        temperatureOK(2),
+                        temperatureTooHigh(3)
+    }
+    MAX-ACCESS     read-only
+    STATUS         current
+    DESCRIPTION
+            "Warning if temperature exceed threshold levels"
+    ::= { wrsOSStatusGroup 2 }
--wrsOSStatusGroup           OBJECT IDENTIFIER ::= { wrsDetailedStatusesGroup 1 }
 --wrsTimingStatusGroup       OBJECT IDENTIFIER ::= { wrsDetailedStatusesGroup 2 }
 --wrsNetworkingStatusGroup   OBJECT IDENTIFIER ::= { wrsDetailedStatusesGroup 3 }

--- a/userspace/snmpd/wrsOSStatus.c
+++ b/userspace/snmpd/wrsOSStatus.c
@@ -48,7 +48,7 @@ time_t wrsOSStatus_data_fill(void)
 	return time_update;
 }
-#define GT_OID WRS_OID, 6, 3
+#define GT_OID WRSOSSTATUS_OID
 #define GT_PICKINFO wrsOSStatus_pickinfo
 #define GT_DATA_FILL_FUNC wrsOSStatus_data_fill
 #define GT_DATA_STRUCT wrsOSStatus_s

--- a/userspace/snmpd/wrsOSStatus.h
+++ b/userspace/snmpd/wrsOSStatus.h
 #ifndef WRS_WRS_OSSTATUS_H
 #define WRS_WRS_OSSTATUS_H
+#define WRSOSSTATUS_OID WRS_OID, 254, 1, 1
 #define WRS_TEMPERATURE_WARNING_THOLD_NOT_SET 1		/* warning */
 #define WRS_TEMPERATURE_WARNING_OK 2			/* ok */
 #define WRS_TEMPERATURE_WARNING_TOO_HIGH 3		/* warning */