升级MIB.

5 files changed, 144 insertions, 64 deletions

diff --git a/TSG-OAM-MIB b/TSG-MIB
index d2453ff..b779dab 100644
--- a/TSG-OAM-MIB
+++ b/TSG-MIB
@@ -22,9 +22,19 @@ hw OBJECT IDENTIFIER
 	-- 1.3.6.1.4.1.54450.1
 ::= { tsgoam 1 }
 
+hwCOMETEMP OBJECT-TYPE
+	SYNTAX  INTEGER
+	ACCESS  read-write
+	STATUS  optional
+	DESCRIPTION
+		"Temperature monitor for COME"
+	-- 1.3.6.1.4.1.54450.1.1
+::= { hw 1 }
+
+
 hwRRCTEMP OBJECT-TYPE
 	SYNTAX  INTEGER
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Temperature monitor for RRC"
@@ -34,7 +44,7 @@ hwRRCTEMP OBJECT-TYPE
 
 hwCMMTEMP OBJECT-TYPE
 	SYNTAX  INTEGER
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Temperature monitor for CMM"
@@ -44,7 +54,7 @@ hwCMMTEMP OBJECT-TYPE
 
 hwP1V OBJECT-TYPE
 	SYNTAX  DisplayString
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Voltage monitor for power"
@@ -54,7 +64,7 @@ hwP1V OBJECT-TYPE
 
 hwPVDDS OBJECT-TYPE
 	SYNTAX  DisplayString
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Voltage monitor for power"
@@ -64,7 +74,7 @@ hwPVDDS OBJECT-TYPE
 
 hwPVDDF OBJECT-TYPE
 	SYNTAX  DisplayString
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Voltage monitor for power"
@@ -72,9 +82,29 @@ hwPVDDF OBJECT-TYPE
 ::= { hw 6 }
 
 
+hwP3V3 OBJECT-TYPE
+	SYNTAX  DisplayString
+	ACCESS  read-write
+	STATUS  optional
+	DESCRIPTION
+		"Voltage monitor for power"
+	-- 1.3.6.1.4.1.54450.1.7
+::= { hw 7 }
+
+
+hwP5V OBJECT-TYPE
+	SYNTAX  DisplayString
+	ACCESS  read-write
+	STATUS  optional
+	DESCRIPTION
+		"Voltage monitor for power"
+	-- 1.3.6.1.4.1.54450.1.8
+::= { hw 8 }
+
+
 hwP12V OBJECT-TYPE
 	SYNTAX  DisplayString
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Voltage monitor for power"
@@ -84,7 +114,7 @@ hwP12V OBJECT-TYPE
 
 hwP1VRT OBJECT-TYPE
 	SYNTAX  DisplayString
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Voltage monitor for power"
@@ -94,7 +124,7 @@ hwP1VRT OBJECT-TYPE
 
 hwFan1 OBJECT-TYPE
 	SYNTAX  INTEGER
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Fan 1 Speed monitor"
@@ -104,7 +134,7 @@ hwFan1 OBJECT-TYPE
 
 hwFan2 OBJECT-TYPE
 	SYNTAX  INTEGER
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Fan 2 Speed monitor"
@@ -114,7 +144,7 @@ hwFan2 OBJECT-TYPE
 
 hwFan3 OBJECT-TYPE
 	SYNTAX  INTEGER
-	ACCESS  read-only
+	ACCESS  read-write
 	STATUS  optional
 	DESCRIPTION
 		"Fan 3 Speed monitor"
@@ -125,7 +155,7 @@ hwFan3 OBJECT-TYPE
 hwMCNTable OBJECT-TYPE
 	SYNTAX  SEQUENCE OF HwMCNEntry
 	ACCESS  not-accessible
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"Disk watching information.  Partions to be watched
 		are configured by the snmpd.conf file of the agent."
@@ -133,45 +163,10 @@ hwMCNTable OBJECT-TYPE
 ::= { hw 100 }
 
 
-hwMCNEntry OBJECT-TYPE
-	SYNTAX  HwMCNEntry
-	ACCESS  not-accessible
-	STATUS  mandatory
-	DESCRIPTION
-		"An entry containing mcn hardware statistics."
-	INDEX {
-		hwMCNID }
-	-- 1.3.6.1.4.1.54450.1.100.1
-::= { hwMCNTable 1 }
-
-
-HwMCNEntry ::= SEQUENCE {
-
-	hwMCNID          INTEGER,
-	hwHSCurrent0     DisplayString,
-	hwHSVolt0        DisplayString,
-	hwP1V05PCH       DisplayString,
-	hwP1V2DDR0       DisplayString,
-	hwP1V2DDR1       DisplayString,
-	hwPVCCINCPU0     DisplayString,
-	hwPVCCINCPU1     DisplayString,
-	hwPVCCIO         DisplayString,
-	hwTempLL         INTEGER,
-	hwTempLR         INTEGER,
-	hwTempPCH        INTEGER,
-	hwTempUL         INTEGER,
-	hwTempUR         INTEGER,
-	hwTempXL71082599 INTEGER,
-	hwTempmIO0       INTEGER,
-	hwTempmIO1       INTEGER,
-	hwPECICPU0       INTEGER,
-	hwPECICPU1       INTEGER }
-
-
 hwMCNID OBJECT-TYPE
 	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"MCN sled id."
 	-- 1.3.6.1.4.1.54450.1.100.1.1
@@ -191,7 +186,7 @@ hwHSCurrent0 OBJECT-TYPE
 hwHSVolt0 OBJECT-TYPE
 	SYNTAX  DisplayString
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"Current monitor for power."
 	-- 1.3.6.1.4.1.54450.1.100.1.3
@@ -228,6 +223,26 @@ hwP1V2DDR1 OBJECT-TYPE
 ::= { hwMCNEntry 6 }
 
 
+hwP3V3B OBJECT-TYPE
+	SYNTAX  DisplayString
+	ACCESS  read-only
+	STATUS  optional
+	DESCRIPTION
+		"Current monitor for power."
+	-- 1.3.6.1.4.1.54450.1.100.1.7
+::= { hwMCNEntry 7 }
+
+
+hwP5VB OBJECT-TYPE
+	SYNTAX  DisplayString
+	ACCESS  read-only
+	STATUS  optional
+	DESCRIPTION
+		"Current monitor for power."
+	-- 1.3.6.1.4.1.54450.1.100.1.8
+::= { hwMCNEntry 8 }
+
+
 hwPVCCINCPU0 OBJECT-TYPE
 	SYNTAX  DisplayString
 	ACCESS  read-only
@@ -365,7 +380,7 @@ cpu OBJECT IDENTIFIER
 cpuTable OBJECT-TYPE
 	SYNTAX  SEQUENCE OF CpuEntry
 	ACCESS  not-accessible
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"Disk watching information.  Partions to be watched
 		are configured by the snmpd.conf file of the agent."
@@ -376,7 +391,7 @@ cpuTable OBJECT-TYPE
 cpuEntry OBJECT-TYPE
 	SYNTAX  CpuEntry
 	ACCESS  not-accessible
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"An entry containing mcn hardware statistics."
 	INDEX {
@@ -399,7 +414,7 @@ CpuEntry ::= SEQUENCE {
 cpuSled OBJECT-TYPE
 	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"MXN and MCN sled id."
 	-- 1.3.6.1.4.1.54450.2.100.1.1
@@ -690,17 +705,17 @@ netEntry OBJECT-TYPE
 NetEntry ::= SEQUENCE {
 
 	mxnNIC         INTEGER,
-	ifInOctets     DisplayString,
-	ifInUcastPkts  DisplayString,
-	ifInErrors     DisplayString,
-	ifOutOctets    DisplayString,
-	ifOutUcastPkts DisplayString }
+	ifInOctets     INTEGER,
+	ifInUcastPkts  INTEGER,
+	ifInErrors     INTEGER,
+	ifOutOctets    INTEGER,
+	ifOutUcastPkts INTEGER }
 
 
 mxnNIC OBJECT-TYPE
 	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"NIC id on MXN."
 	-- 1.3.6.1.4.1.54450.5.100.1.1
@@ -708,7 +723,7 @@ mxnNIC OBJECT-TYPE
 
 
 ifInOctets OBJECT-TYPE
-	SYNTAX  DisplayString (SIZE (0..65535))
+	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
 	STATUS  optional
 	DESCRIPTION
@@ -718,9 +733,9 @@ ifInOctets OBJECT-TYPE
 
 
 ifInUcastPkts OBJECT-TYPE
-	SYNTAX  DisplayString (SIZE (0..65535))
+	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"The number of subnetwork-unicast packets delivered to a higher-layer protocol."
 	-- 1.3.6.1.4.1.54450.5.100.1.3
@@ -728,9 +743,9 @@ ifInUcastPkts OBJECT-TYPE
 
 
 ifInErrors OBJECT-TYPE
-	SYNTAX  DisplayString (SIZE (0..65535))
+	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
-	STATUS  mandatory
+	STATUS  optional
 	DESCRIPTION
 		"The number of inbound packets that contained errors preventing them from being deliverable to a higher-layer protocol."
 	-- 1.3.6.1.4.1.54450.5.100.1.4
@@ -738,7 +753,7 @@ ifInErrors OBJECT-TYPE
 
 
 ifOutOctets OBJECT-TYPE
-	SYNTAX  DisplayString (SIZE (0..65535))
+	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
 	STATUS  optional
 	DESCRIPTION
@@ -748,7 +763,7 @@ ifOutOctets OBJECT-TYPE
 
 
 ifOutUcastPkts OBJECT-TYPE
-	SYNTAX  DisplayString (SIZE (0..65535))
+	SYNTAX  INTEGER (0..65535)
 	ACCESS  read-only
 	STATUS  optional
 	DESCRIPTION
@@ -761,4 +776,41 @@ tsgoam OBJECT IDENTIFIER
 	-- 1.3.6.1.4.1.54450 ---- 1.3.6.1.4.1.54450
 ::= { enterprises 54450 }
 
+hwMCNEntry OBJECT-TYPE
+	SYNTAX  HwMCNEntry
+	ACCESS  not-accessible
+	STATUS  optional
+	DESCRIPTION
+		"An entry containing mcn hardware statistics."
+	INDEX {
+		hwMCNID }
+	-- 1.3.6.1.4.1.54450.1.100.1
+	::= { hwMCNTable 1 }
+
+
+HwMCNEntry ::= SEQUENCE {
+
+	hwMCNID          INTEGER,
+	hwHSCurrent0     DisplayString,
+	hwHSVolt0        DisplayString,
+	hwP1V05PCH       DisplayString,
+	hwP1V2DDR0       DisplayString,
+	hwP1V2DDR1       DisplayString,
+	hwP3V3B          DisplayString,
+	hwP5VB           DisplayString,
+	hwPVCCINCPU0     DisplayString,
+	hwPVCCINCPU1     DisplayString,
+	hwPVCCIO         DisplayString,
+	hwTempLL         INTEGER,
+	hwTempLR         INTEGER,
+	hwTempPCH        INTEGER,
+	hwTempUL         INTEGER,
+	hwTempUR         INTEGER,
+	hwTempXL71082599 INTEGER,
+	hwTempmIO0       INTEGER,
+	hwTempmIO1       INTEGER,
+	hwPECICPU0       INTEGER,
+	hwPECICPU1       INTEGER }
+
+
 END
diff --git a/TSG_MIB_Spec_0.3.pdf b/TSG_MIB_Spec_0.3.pdf
deleted file mode 100644
index ed161c8..0000000
--- a/TSG_MIB_Spec_0.3.pdf
+++ /dev/null
diff --git a/TSG_MIB_Spec_v0.5.pdf b/TSG_MIB_Spec_v0.5.pdf
new file mode 100644
index 0000000..1b61582
--- /dev/null
+++ b/TSG_MIB_Spec_v0.5.pdf
diff --git a/cli2.txt b/cli2.txt
new file mode 100644
index 0000000..ef3a2f5
--- /dev/null
+++ b/cli2.txt
@@ -0,0 +1,28 @@
+root用户登录，解压cli2.zip到/home/tsgroot/opt/tsg/cli/

+修改新文件owner为tsgadmin:root,

+

+chown tsgadmin:root tsg_help
+

+chown tsgadmin:root tsg_record

+
+chown tsgadmin:root tsg_show

+

+确认tsg_record权限为744，其他文件为777,

+chmod 744 tsg_record
+

+chmod 777 tsg_help

+
+chmod 777 tsg_show

+

+修改config.properties中的配置信息, 确定oam.influx.url指向mcn0计算板的influxDB。

+

+修改配置文件application.properties, #RestTemplate如下三个配置:

+由10000改为60000，否则大文件导出、导入会提示超时.

+#RestTemplate

+oam.rest.connection.connection-request-timeout=60000

+oam.rest.connection.connect-timeout=60000

+oam.rest.connection.read-timeout=60000

+

+注意，过渡阶段原cli配置文件同时需要保持正确配置。

+

+

diff --git a/cli2.zip b/cli2.zip
new file mode 100644
index 0000000..84b4921
--- /dev/null
+++ b/cli2.zip