Commit 0d08a03a authored by Adam Wujek's avatar Adam Wujek

[Feature: #221] rootfs: in SNMP use sysObjectID specific for WRS

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent 9fee06a8
Pipeline #2026 failed with stage
in 0 seconds
......@@ -104,6 +104,8 @@ set | tr -d \' | grep CONFIG_SNMP | sed 's/=/ /' | while read varname value; do
sed -i "/$varname/ s/^#//" $T
sed -i "/$varname/ s/$varname/$value/" $T
done
# call assembly_snmpd_conf.sh to fill more advanced SNMP parameters
/wr/bin/assembly_snmpd_conf.sh $T
mv $T /etc/snmpd.conf
# Select a ppsi configuration file
......
#!/bin/sh
# Author: Adam Wujek for GSI
# Copyright: 2021 GSI
# Assempbly sysObjectID value
MANUFACTURER=`/wr/bin/wrs_version -t | grep manufacturer | cut -d " " -f 2-`
SCB=`/wr/bin/wrs_version -t | grep scb-version | cut -d " " -f 2`
SCB_MAJOR=`echo $SCB | cut -d "." -f 1`
SCB_MINOR=`echo $SCB | cut -d "." -f 2`
case ${SCB_MAJOR} in
3)
SCB_MAJOR_N=${SCB_MAJOR}
;;
*)
# set as unknown (1)
# Output sysObjectID value to configuration file
echo "sysObjectID .1.3.6.1.4.1.96.100.1000.1.1" >> $1
exit 0;
;;
esac
case ${MANUFACTURER} in
"Seven Solutions")
MANUFACTURER_N=2
;;
"Creotech Ins SA")
MANUFACTURER_N=3
;;
"SyncTechnology")
MANUFACTURER_N=4
;;
"OPNT")
MANUFACTURER_N=5
;;
*)
# set as unknown (1)
MANUFACTURER_N=1
;;
esac
case ${SCB_MINOR} in
3|4|5)
SCB_MINOR_N=${SCB_MINOR}
;;
*)
# set as unknown (1)
SCB_MINOR_N=1
;;
esac
# Output sysObjectID value to configuration file
echo "sysObjectID .1.3.6.1.4.1.96.100.1000.${SCB_MAJOR_N}.${MANUFACTURER_N}.${SCB_MINOR_N}" >> $1
......@@ -26,6 +26,11 @@ wrSwitchMIB MODULE-IDENTITY
DESCRIPTION "White Rabbit Switch internal details
"
REVISION "202108310000Z"
DESCRIPTION
"Add wrsId OIDs to identify WRS version and manufacturer in sysObjectID.
"
REVISION "202005220000Z"
DESCRIPTION
"Updates for v6.0 WRS firmware release
......@@ -77,6 +82,7 @@ wrsScalar OBJECT IDENTIFIER ::= { wrSwitchMIB 1 }
--wrsDate OBJECT IDENTIFIER ::= { wrSwitchMIB 5 } == obsolete
wrsStatus OBJECT IDENTIFIER ::= { wrSwitchMIB 6 }
wrsExpertStatus OBJECT IDENTIFIER ::= { wrSwitchMIB 7 }
wrsId OBJECT IDENTIFIER ::= { wrSwitchMIB 1000 }
-- define one stupid object for a start
......@@ -3170,4 +3176,48 @@ wrsPtpInstanceVlanListStr OBJECT-TYPE
--wrsNetworking
--Configuration
-- wrsId (.1000)
wrsIdUnkn OBJECT IDENTIFIER ::= { wrsId 1 }
wrsIdOther OBJECT IDENTIFIER ::= { wrsId 2 }
wrsId3 OBJECT IDENTIFIER ::= { wrsId 3 }
-- wrsId (.1000.1)
wrsIdUnknUnkn OBJECT IDENTIFIER ::= { wrsIdUnkn 1 }
-- wrsIdOther (.1000.2)
-- wrsId3 (.1000.3)
wrsId3Unkn OBJECT IDENTIFIER ::= { wrsId3 1 }
wrsId3Ssol OBJECT IDENTIFIER ::= { wrsId3 2 }
wrsId3Cti OBJECT IDENTIFIER ::= { wrsId3 3 }
wrsId3St OBJECT IDENTIFIER ::= { wrsId3 4 }
wrsId3Opnt OBJECT IDENTIFIER ::= { wrsId3 5 }
-- wrsId3Unkn (.1000.3.1)
wrsId3UnknUnkn OBJECT IDENTIFIER ::= { wrsId3Unkn 1 }
wrsId3Unkn3 OBJECT IDENTIFIER ::= { wrsId3Unkn 3 }
wrsId3Unkn4 OBJECT IDENTIFIER ::= { wrsId3Unkn 4 }
wrsId3UnknFL OBJECT IDENTIFIER ::= { wrsId3Unkn 5 }
-- wrsId3Ssol (.1000.3.2)
wrsId3SsolUnkn OBJECT IDENTIFIER ::= { wrsId3Ssol 1 }
wrsId3Ssol3 OBJECT IDENTIFIER ::= { wrsId3Ssol 3 }
wrsId3Ssol4 OBJECT IDENTIFIER ::= { wrsId3Ssol 4 }
-- wrsId3Cti (.1000.3.3)
wrsId3CtiUnkn OBJECT IDENTIFIER ::= { wrsId3Cti 1 }
wrsId3Cti3 OBJECT IDENTIFIER ::= { wrsId3Cti 3 }
wrsId3Cti4 OBJECT IDENTIFIER ::= { wrsId3Cti 4 }
-- wrsId3St (.1000.3.4)
wrsId3StUnkn OBJECT IDENTIFIER ::= { wrsId3St 1 }
wrsId3St3 OBJECT IDENTIFIER ::= { wrsId3St 3 }
wrsId3St4 OBJECT IDENTIFIER ::= { wrsId3St 4 }
wrsId3StFL OBJECT IDENTIFIER ::= { wrsId3St 5 }
-- wrsId3Opnt (.1000.3.5)
wrsId3OpntUnkn OBJECT IDENTIFIER ::= { wrsId3Opnt 1 }
wrsId3Opnt3 OBJECT IDENTIFIER ::= { wrsId3Opnt 3 }
wrsId3Opnt4 OBJECT IDENTIFIER ::= { wrsId3Opnt 4 }
END
......@@ -308,6 +308,33 @@
"wrsPtpInstanceVlanNum" "1.3.6.1.4.1.96.100.7.8.1.24"
"wrsPtpInstanceVlanListStr" "1.3.6.1.4.1.96.100.7.8.1.25"
"wrsPtpInstanceStatusError" "1.3.6.1.4.1.96.100.7.8.1.26"
"wrsId" "1.3.6.1.4.1.96.100.1000"
"wrsIdUnkn" "1.3.6.1.4.1.96.100.1000.1"
"wrsIdUnknUnkn" "1.3.6.1.4.1.96.100.1000.1.1"
"wrsIdOther" "1.3.6.1.4.1.96.100.1000.2"
"wrsId3" "1.3.6.1.4.1.96.100.1000.3"
"wrsId3Unkn" "1.3.6.1.4.1.96.100.1000.3.1"
"wrsId3UnknUnkn" "1.3.6.1.4.1.96.100.1000.3.1.1"
"wrsId3Unkn3" "1.3.6.1.4.1.96.100.1000.3.1.3"
"wrsId3Unkn4" "1.3.6.1.4.1.96.100.1000.3.1.4"
"wrsId3UnknFL" "1.3.6.1.4.1.96.100.1000.3.1.5"
"wrsId3Ssol" "1.3.6.1.4.1.96.100.1000.3.2"
"wrsId3SsolUnkn" "1.3.6.1.4.1.96.100.1000.3.2.1"
"wrsId3Ssol3" "1.3.6.1.4.1.96.100.1000.3.2.3"
"wrsId3Ssol4" "1.3.6.1.4.1.96.100.1000.3.2.4"
"wrsId3Cti" "1.3.6.1.4.1.96.100.1000.3.3"
"wrsId3CtiUnkn" "1.3.6.1.4.1.96.100.1000.3.3.1"
"wrsId3Cti3" "1.3.6.1.4.1.96.100.1000.3.3.3"
"wrsId3Cti4" "1.3.6.1.4.1.96.100.1000.3.3.4"
"wrsId3St" "1.3.6.1.4.1.96.100.1000.3.4"
"wrsId3StUnkn" "1.3.6.1.4.1.96.100.1000.3.4.1"
"wrsId3St3" "1.3.6.1.4.1.96.100.1000.3.4.3"
"wrsId3St4" "1.3.6.1.4.1.96.100.1000.3.4.4"
"wrsId3StFL" "1.3.6.1.4.1.96.100.1000.3.4.5"
"wrsId3Opnt" "1.3.6.1.4.1.96.100.1000.3.5"
"wrsId3OpntUnkn" "1.3.6.1.4.1.96.100.1000.3.5.1"
"wrsId3Opnt3" "1.3.6.1.4.1.96.100.1000.3.5.3"
"wrsId3Opnt4" "1.3.6.1.4.1.96.100.1000.3.5.4"
"security" "1.3.6.1.5"
"snmpV2" "1.3.6.1.6"
"snmpDomains" "1.3.6.1.6.1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment