Merge pull request #4513 from OpcaoTelecom/datacom-transceiver

newdevice: Added Datacom Dbm Support

includes/discovery/sensors/dbm/datacom.inc.php

@@ -0,0 +1,37 @@
+<?php
+
+if ($device['os'] == 'datacom') {
+    echo 'Datacom';
+
+    $multiplier = 1;
+    $divisor = 100;
+    foreach ($datacom_oids as $index => $entry) {
+        if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversRxPower']))) {
+            $oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.4.' . $index;
+            $descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Rx Power';
+            /* Basic default values */
+            $limit_low = -30;
+            $warn_limit_low = -12.3;
+            $limit = 2.5;
+            $warn_limit = -3;
+            $current = $entry['ddTransceiversRxPower'];
+            $entPhysicalIndex = $index;
+            $entPhysicalIndex_measured = 'ports';
+            discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'rx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
+        }
+
+        if (is_numeric(str_replace('dBm', '', $entry['ddTransceiversTxPower']))) {
+            $oid = '.1.3.6.1.4.1.3709.3.5.201.1.28.1.1.5.' . $index;
+            $descr = dbFetchCell('SELECT `ifDescr` FROM `ports` WHERE `ifIndex`= ? AND `device_id` = ?', array($index, $device['device_id'])) . ' Tx Power';
+            /* Basic default values */
+            $limit_low = -30;
+            $warn_limit_low = -12.3;
+            $limit = 2.5;
+            $warn_limit = -3;
+            $current = $entry['ddTransceiversTxPower'];
+            $entPhysicalIndex = $index;
+            $entPhysicalIndex_measured = 'ports';
+            discover_sensor($valid['sensor'], 'dbm', $device, $oid, 'tx-' . $index, 'datacom', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $current, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured);
+        }
+    }
+}

includes/discovery/sensors/pre-cache/datacom.inc.php

@@ -0,0 +1,10 @@
+<?php
+
+if ($device['os'] == 'datacom') {
+    echo 'Pre-cache Datacom: ';
+
+    $datacom_oids = array();
+    echo 'Caching OIDs:';
+
+    $datacom_oids = snmpwalk_cache_multi_oid($device, 'ddTransceiversEntry', array(), 'DMswitch-MIB');
+}

mibs/DATA-DMSWITCH.mib

@@ -1,6 +1,6 @@
 --
 -- DATACOM Telematica
--- Copyright 2014 by DATACOM (Teracom Telematica Ltda). All Rights Reserved.
+-- Copyright 2015 by DATACOM (Teracom Telematica Ltda). All Rights Reserved.
 -- This DATACOM SNMP MIB Specification is DATACOM proprietary intellectual property.
 --
 -- This module will be extend, as required. The specification and other information
@@ -29,7 +29,7 @@ IMPORTS
 
 
 dmSwitchMIB MODULE-IDENTITY
-        LAST-UPDATED "201407180000Z"
+        LAST-UPDATED "201512100000Z"
         ORGANIZATION "DATACOM"
         CONTACT-INFO
                 "DATACOM
@@ -82,6 +82,7 @@ eapsMgt             OBJECT IDENTIFIER ::= { dmSwitchMIBObjects 24 }
 cfmProbeMgmt        OBJECT IDENTIFIER ::= { dmSwitchMIBObjects 25 }
 cpumonMgmt          OBJECT IDENTIFIER ::= { dmSwitchMIBObjects 26 }
 queuePortMgmt       OBJECT IDENTIFIER ::= { dmSwitchMIBObjects 27 }
+ddTransceiversMgmt  OBJECT IDENTIFIER ::= { dmSwitchMIBObjects 28 }
 
 -- -------------------------------------------------------------
 -- Textual Conventions
@@ -327,14 +328,12 @@ swProdModelId OBJECT-TYPE
            eth44gt4gc2xxsmplsdc(63),
            eth44gt4gc4xxmplsdc(64),
            eth24gx2x10gxhseriesII(65),
-           eth20gt4gc2xssl3(66),
+           eth20gt4gc4xs(66),
-           eth20gp4gc2xssl3(67),
+           eth24gxhseriesII(67),
-           eth20gt4gc4xsl3(68),
+           eth2x10gxhseriesII(68),
-           eth20gp4gc4xsl3(69),
+           eth48gxhseriesII(69),
-           eth44gt4gc2xssl3(70),
+           eth4x10gxhseriesII(70),
-           eth44gp4gc2xssl3(71),
+           eth24gx4xs(71)
-           eth44gt4gc4xsl3(72),
-           eth44gp4gc4xsl3(73)
         }
         MAX-ACCESS  read-only
         STATUS      current
@@ -780,7 +779,7 @@ swChassisModel OBJECT-TYPE
         ::= { switchMgt 17 }
 
 switchSessionTable OBJECT-TYPE
-    SYNTAX      SEQUENCE OF SwitchIndivAlarmOutEntry
+    SYNTAX      SEQUENCE OF SwitchSessionEntry
         MAX-ACCESS  not-accessible
         STATUS      current
         DESCRIPTION "Table about CLI sessions informations."
@@ -938,7 +937,8 @@ portType OBJECT-TYPE
             thousandBaseSfp(8),
             hundredBaseFxScSingleMode(9),
             hundredBaseFxScMultiMode(10),
-            tenG(11)
+            tenG(11),
+            tenGSfp(12)
                     }
         MAX-ACCESS  read-only
         STATUS      current
@@ -2876,7 +2876,10 @@ trapSystemWarningsUnits OBJECT-TYPE
                     sysWarUnitsHsEnNoError(1),
                     sysWarUnitsHsEnWES(2),
                     sysWarUnitsHsEnWHSDis(3),
-                    sysWarUnitsHsEnWDifMod(4)
+                    sysWarUnitsHsEnWDifMod(4),
+                    sysWarUnitsCommFail(5),
+                    sysWarUnitsMPLS(6),
+                    sysWarUnitsL3(7)
                 }
      MAX-ACCESS  accessible-for-notify
      STATUS      current
@@ -4527,7 +4530,7 @@ cpuActiveUsageTable OBJECT-TYPE
         ::= { cpumonMgmt 1 }
 
 cpuActiveUsageEntry OBJECT-TYPE
-        SYNTAX      CpuUsageEntry
+        SYNTAX      CpuActiveUsageEntry
         MAX-ACCESS  not-accessible
         STATUS      current
         DESCRIPTION "Table of cpu usage."
@@ -4603,7 +4606,7 @@ cpuStandbyUsageTable OBJECT-TYPE
         ::= { cpumonMgmt 3 }
 
 cpuStandbyUsageEntry OBJECT-TYPE
-        SYNTAX      CpuUsageEntry
+        SYNTAX      CpuStandbyUsageEntry
         MAX-ACCESS  not-accessible
         STATUS      current
         DESCRIPTION "Table of cpu usage."
@@ -4668,4 +4671,153 @@ memStandbyUsageValue OBJECT-TYPE
         STATUS      current
         DESCRIPTION "The memory usage (percentage)."
         ::= { memStandbyUsageEntry 2 }
+
+
+
+--
+-- queuePortMgmt
+--
+
+queuePortTable OBJECT-TYPE
+        SYNTAX      SEQUENCE OF QueuePortEntry
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "Table for statistics of interface queues."
+        ::= { queuePortMgmt 1 }
+
+queuePortEntry OBJECT-TYPE
+        SYNTAX      QueuePortEntry
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "An entry in the table, containing information
+                     about configuration in one switch port of the switch."
+        INDEX       { queuePortIfIndex, queuePortQueueIndex }
+        ::= { queuePortTable 1 }
+
+QueuePortEntry ::= SEQUENCE
+{
+    queuePortIfIndex         Integer32,
+    queuePortQueueIndex      Integer32,
+    queuePortSentPackets     Counter64,
+    queuePortSentBytes       Counter64,
+    queuePortDroppedPackets  Counter64,
+    queuePortDroppedBytes    Counter64
+}
+
+queuePortIfIndex OBJECT-TYPE
+        SYNTAX      Integer32
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "This is defined as ifIndex in the IF-MIB."
+        ::= { queuePortEntry 1 }
+
+queuePortQueueIndex OBJECT-TYPE
+        SYNTAX      Integer32
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "The COS queue from the interface."
+        ::= { queuePortEntry 2 }
+
+queuePortSentPackets OBJECT-TYPE
+        SYNTAX      Counter64
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Counter of sent packets."
+        ::= { queuePortEntry 3 }
+
+queuePortSentBytes OBJECT-TYPE
+        SYNTAX      Counter64
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Counter of sent bytes."
+        ::= { queuePortEntry 4 }
+
+queuePortDroppedPackets OBJECT-TYPE
+        SYNTAX      Counter64
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Counter of dropped packets."
+        ::= { queuePortEntry 5 }
+
+queuePortDroppedBytes OBJECT-TYPE
+        SYNTAX      Counter64
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Counter of dropped bytes."
+        ::= { queuePortEntry 6 }
+
+
+
+--
+-- ddTransceiversMgmt
+--
+
+ddTransceiversTable OBJECT-TYPE
+        SYNTAX      SEQUENCE OF DdTransceiversEntry
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "Transceivers digital diagnostic table."
+        ::= { ddTransceiversMgmt 1 }
+
+ddTransceiversEntry OBJECT-TYPE
+        SYNTAX      DdTransceiversEntry
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "An entry in the table, containing information
+                     about digital diagnostic."
+        INDEX       { ddTransceiversIfIndex}
+        ::= { ddTransceiversTable 1 }
+
+DdTransceiversEntry ::= SEQUENCE
+{
+    ddTransceiversIfIndex      Integer32,
+    ddTransceiversTemperature  DisplayString,
+    ddTransceiversVcc3v3       DisplayString,
+    ddTransceiversRxPower      DisplayString,
+    ddTransceiversTxPower      DisplayString,
+    ddTransceiversTxBias       DisplayString
+}
+
+ddTransceiversIfIndex OBJECT-TYPE
+      SYNTAX      Integer32
+        MAX-ACCESS  not-accessible
+        STATUS      current
+        DESCRIPTION "This is defined as ifIndex in the IF-MIB."
+        ::= { ddTransceiversEntry 1 }
+
+ddTransceiversTemperature OBJECT-TYPE
+        SYNTAX      DisplayString (SIZE(0..20))
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Transceiver temperature information in Celsius"
+        ::= { ddTransceiversEntry 2 }
+
+ddTransceiversVcc3v3 OBJECT-TYPE
+        SYNTAX      DisplayString (SIZE(0..20))
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Transceiver Vcc 3v3 information in Volts"
+        ::= { ddTransceiversEntry 3 }
+
+ddTransceiversRxPower OBJECT-TYPE
+        SYNTAX      DisplayString (SIZE(0..20))
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Transceiver rx power information in Decibels"
+        ::= { ddTransceiversEntry 4 }
+
+ddTransceiversTxPower OBJECT-TYPE
+        SYNTAX      DisplayString (SIZE(0..20))
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Transceiver tx power information in Decibels"
+        ::= { ddTransceiversEntry 5 }
+
+ddTransceiversTxBias OBJECT-TYPE
+        SYNTAX      DisplayString (SIZE(0..20))
+        MAX-ACCESS  read-only
+        STATUS      current
+        DESCRIPTION "Transceiver tx bias information in Amperes"
+        ::= { ddTransceiversEntry 6 }
+
 END

mibs/DATACOM-REG.mib

@@ -1,6 +1,6 @@
 --
 -- DATACOM Telematica
--- Copyright 1999-2011 by DATACOM (Teracom Telematica Ltda). All Rights Reserved.
+-- Copyright 1999-2013 by DATACOM (Teracom Telematica Ltda). All Rights Reserved.
 -- This DATACOM SNMP MIB Specification is Datacom proprietary intellectual property.
 --
 -- This module will be extend, as required. The specification and other information
@@ -12,25 +12,24 @@ DATACOM-REG	DEFINITIONS ::= BEGIN
 
 IMPORTS
   datacomModules, datacomManagementCards, datacomModems,
-  datacomAccessDevices
+  datacomAccessDevices, datacomDevices
     FROM DATACOM-SMI;
 
 
 datacomRegistrationModule OBJECT IDENTIFIER ::={ datacomModules 2 }
 --  MODULE-IDENTITY
---	LAST-UPDATED	"1112200000Z"
 --	ORGANIZATION	"DATACOM"
 --	CONTACT-INFO
 --		        "DATACOM
 --
 --		         Postal: DATACOM
---			         Av. Fran<61>a, 735
+--			         Rua America, 1000
---			         Navegantes, POA, RS
+--			         Eldorado do Sul, RS
---			         CEP 90230-220
+--			         CEP 92990-000
 --     		                 BRAZIL
 --
---	 	         Tel:+55(051)3358-0100
+--	 	         Tel:+55(51)3933 3000
---			     Fax:+55(051)3358-0101
+--			     Fax:+55(51)3933 3003
 --
 --			     E-mail: datacom@datacom.ind.br "
 --	DESCRIPTION
@@ -49,7 +48,6 @@ datacomRegistrationModule OBJECT IDENTIFIER ::={ datacomModules 2 }
 --
 
 
-
 -- Management cards
 
 datacomModemManagCardDMG20  OBJECT IDENTIFIER ::={ datacomManagementCards 1 }
@@ -128,9 +126,9 @@ datacomDm881ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 20 }
 -- 	DESCRIPTION
 --		" DATACOM DM881 SNMP Management Card. "
 
-datacomDm814ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 21 }
+datacomDm820ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 21 }
 -- 	DESCRIPTION
---		" DATACOM DM814 SNMP Management Card. "
+--		" DATACOM DM820 SNMP Management Card. "
 
 datacomDm830ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 22 }
 -- 	DESCRIPTION
@@ -308,14 +306,10 @@ datacomDm4000Eth48GXHSeriesManagCard OBJECT IDENTIFIER ::={ datacomManagementCar
 --  DESCRIPTION
 --  	" DATACOM DM4000 ETH48GX HSERIES SNMP Management Card. "
 
-datacomDm4000Eth10GX32E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 66 }
+datacomDm4000Eth10GX32E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 67 }
 --  DESCRIPTION
 --  	" DATACOM DM4000 ETH10GX+32E1 SNMP Management Card. "
 
-datacomDm4000EthSceqManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 67 }
---  DESCRIPTION
---  	" DM4000 SCEQ - Ethernet commuter -  Service Card Enhanced Queuing SNMP Management Card. "
-
 datacomDm4000Eth24GXHSeriesManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 68 }
 -- 	DESCRIPTION
 --		" DATACOM DM4000 ETH24GX HSERIES SNMP Management Card. "
@@ -324,9 +318,9 @@ datacomDm705CPU34ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 69 }
 -- 	DESCRIPTION
 --		" DATACOM DM705-CPU34 MUX SNMP Management Card. "
 
-datacomDm4650ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 70 }
+datacomDm4600IpsanMpu10ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 70 }
 -- 	DESCRIPTION
---		" DATACOM IP - SAN SNMP Management Card. "
+--		" DATACOM DM4600 IPSAN MPU10 SNMP Management Card. "
 
 datacomPabxManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 71 }
 -- 	DESCRIPTION
@@ -356,9 +350,9 @@ datacomDm2106-4GX-ManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 77 }
 --  DESCRIPTION
 --  	" DATACOM DM2106 4GX SNMP Management Card."
 
-datacomDm2106-4GXx8E1-EddManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 78 }
+datacomDm2106-4GXxE1-EddManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 78 }
 --  DESCRIPTION
---  	" DATACOM DM2106 4GX+8E1 SNMP Management Card."
+--  	" DATACOM DM2106 4GX+E1 SNMP Management Card."
 
 datacomDmSwitch2104G2-EDDxE1-EddManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 79 }
 --  DESCRIPTION
@@ -381,7 +375,7 @@ datacomDm4000Mpu512ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 84 }
 
 datacomDmSwitch2104G2S3Wri-EddManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 85 }
 --  DESCRIPTION
---  	" DATACOM EDDs3 modelo DM2104G2 <20> EDD WRI SNMP Management Card. "
+--  	" DATACOM EDDs3 modelo DM2104G2 <20> EDD WRI SNMP Management Card. "
 
 ---
 datacomDm4100Eth24GXx4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 86 }
@@ -428,9 +422,9 @@ datacomDmSwitchEddE1S2ManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 9
 --  DESCRIPTION
 --      " DATACOM DmSwitch 2104G2 - EDD E1 (SERIES II) SNMP Management Card."
 
-datacomDm4100Eth44GPx4GCManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 97 }
+datacomDm4100Eth44GTx4GCManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 97 }
 --  DESCRIPTION
---      " DATACOM DmSwitch DM4100 ETH44GP+4GC SNMP Management Card."
+--      " DATACOM DmSwitch DM4100 ETH44GT+4GC SNMP Management Card."
 
 datacomDm4100Eth44GTx4GCx2XXManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 98 }
 --  DESCRIPTION
@@ -459,6 +453,183 @@ datacomDm4100Eth44GTx4GCx2XSxSManagCard  OBJECT IDENTIFIER ::={ datacomManagemen
 datacomDm4100Eth44GTx4GCx4XSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 104 }
 --  DESCRIPTION
 --      " DATACOM DmSwitch DM4100 ETH44GT+4GC+4XS SNMP Management Card."
+
+datacomDm4000Eth24GTHSeriesManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 106 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH24GT HSERIES SNMP Management Card. "
+
+datacomDm4000Eth48GTHSeriesManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 107 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH48GT HSERIES SNMP Management Card. "
+
+datacomDm4000Eth10GX4STM1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 108 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH10GX+4STM1 SNMP Management Card. "
+
+datacomDm4100Eth20GTx4GCx2XSxSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 109 }
+--  DESCRIPTION
+--      " DATACOM DM4100 20GT+4GC+2XS+S SNMP Management Card."
+
+datacomDm2290ShdslEfm1ftSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 110 }
+--  DESCRIPTION
+--      " DATACOM DM2290 SHDSL EFM 1FT SNMP Management Card."
+
+datacomDm2290ShdslEfm4ftSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 111 }
+--  DESCRIPTION
+--      " DATACOM DM2290 SHDSL EFM 4FT SNMP Management Card."
+
+datacomDm2290ShdslEfm1ftSeriesIISManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 112 }
+--  DESCRIPTION
+--      " DATACOM DM2290 SHDSL EFM 1FT Series II SNMP Management Card."
+
+datacomDm2295ShdslEfm4ftSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 113 }
+--  DESCRIPTION
+--      " DATACOM DM2295 SHDSL EFM 4FT SNMP Management Card."
+
+datacomDm2295ShdslEfm4ftE1SManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 114 }
+--  DESCRIPTION
+--      " DATACOM DM2295 SHDSL EFM 4FT + E1 SNMP Management Card."
+
+datacomDm4000Eth20GX32E1HSeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 115 }
+--  DESCRIPTION
+--      " DATACOM DM4000 PWE3 ETH20GX+32E1 H SERIES Management Card."
+
+datacomDm4000Eth20GX2x10GX32E1HSeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 116 }
+--  DESCRIPTION
+--      " DATACOM DM4000 PWE3 ETH20GX+2x10GX+32E1 H SERIES Management Card."
+
+datacomDm4000Eth16GX2x10GX4xSTM1HSeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 117 }
+--  DESCRIPTION
+--      " DATACOM DM4000 PWE3 ETH16GX+2x10GX+4STM1 H SERIES Management Card."
+
+datacomDm4000Eth16GX4xSTM1HSeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 118 }
+--  DESCRIPTION
+--      " DATACOM DM4000 PWE3 ETH16GX+4STM1 H SERIES Management Card."
+
+datacomDm4000Eth24gx2x10gxESeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 119 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH24GX 2x10GX E SERIES Management Card."
+
+datacomDm4000Eth24gxESeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 120 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH24GX E SERIES Management Card."
+
+datacomDm4000Eth4x10gxESeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 121 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH4x10GX E SERIES Management Card."
+
+datacomDm4000Eth48gtESeriesManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 122 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH48GT E SERIES Management Card."
+
+datacomDm4000Mpu960ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 123 }
+--  DESCRIPTION
+--      " DATACOM DM4000 MPU960 SNMP Management Card. "
+
+datacomDm4000Eth44GT4GCSMPLSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 124 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH44GT 4GC S MPLS DC Management Card."
+
+datacomDm4000Eth44GT4GC2XXSMPLSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 125 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH44GT 4GC 2XX S MPLS DC Management Card."
+
+datacomDm4000Eth44GT4GC4XXSMPLSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 126 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH44GT 4GC 4XX MPLS DC Management Card."
+
+datacomDm4000Eth24GX2X10GXHSeriesIIManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 127 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH24GX+2x10GX H Series II Management Card."
+
+datacomDm4100Eth20GT4GC4XSManagCard  OBJECT IDENTIFIER ::={ datacomManagementCards 128 }
+--  DESCRIPTION
+--      " DATACOM DM4100 ETH20GT 4GC 4XS Management Card."
+
+datacomDm2301-4GT4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 129 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+4GX Management Card."
+
+datacomDm4000EthETH24GXHSeriesIIManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 130 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH24GX H Series II Management Card."
+
+datacomDm4000EthETH2x10GXHSeriesIIManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 131 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH2x10GX H Series II Management Card."
+
+datacomDm4000EthETH48GXHSeriesIIManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 132 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH48GX H Series II Management Card."
+
+datacomDm4000EthETH4x10GXHSeriesIIManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 133 }
+--  DESCRIPTION
+--      " DATACOM DM4000 ETH4x10GX H Series II Management Card."
+
+datacomDm4600IpsanMpu20ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 134 }
+-- 	DESCRIPTION
+--		" DATACOM DM4600 IPSAN MPU20 Management Card. "
+
+datacomDm2301-4GT2GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 135 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+2GX Management Card."
+
+datacomDm4100Eth24GX4XSManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 136 }
+--  DESCRIPTION
+--      " DATACOM DM4100 ETH24GX 4XS Management Card."
+
+datacomDmOSManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 137 }
+--  DESCRIPTION
+--      " DATACOM DmOS Management Card."
+
+datacomDm2301-4GT2GX8E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 138 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+2GX+8E1 Management Card."
+
+datacomDm2301-4GT4GX8E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 139 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+4GX+8E1 Management Card."
+
+datacomDm2302-4GT4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 140 }
+--  DESCRIPTION
+--      " DATACOM DM2302 4GT+4GX Management Card."
+
+datacomDm2302-4GT4GX8E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 141 }
+--  DESCRIPTION
+--      " DATACOM DM2302 4GT+4GX+8E1 Management Card."
+
+datacomDm2303-4GT2GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 142 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+2GX Management Card."
+
+datacomDm2303-4GT4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 143 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+4GX Management Card."
+
+datacomDm2303-4GT4GX8E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 144 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+4GX+8E1 Management Card."
+
+datacomDm2351-4GT4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 145 }
+--  DESCRIPTION
+--      " DATACOM DM2351 4GT+4GX Management Card."
+
+datacomDm2351-4GT4GX8E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 146 }
+--  DESCRIPTION
+--      " DATACOM DM2351 4GT+4GX+8E1 Management Card."
+
+datacomDm2352-4GT4GX16E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 147 }
+--  DESCRIPTION
+--      " DATACOM DM2352 4GT+4GX+16E1 Management Card."
+
+datacomDm2353-4GT4GXManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 148 }
+--  DESCRIPTION
+--      " DATACOM DM2353 4GT+4GX Management Card."
+
+datacomDm2353-4GT4GX16E1ManagCard OBJECT IDENTIFIER ::={ datacomManagementCards 149 }
+--  DESCRIPTION
+--      " DATACOM DM2353 4GT+4GX+16E1 Management Card."
+
 -- Modems
 --
 -- datacomModems 1
@@ -1189,9 +1360,9 @@ dmAdMuxDatacomMuxDM881 	OBJECT IDENTIFIER ::={ dmAdMuxDatacom 116 }
 --	DESCRIPTION
 --		"DATACOM Mux DM881."
 
-dmAdMuxDatacomMuxDM814 	OBJECT IDENTIFIER ::={ dmAdMuxDatacom 117 }
+dmAdMuxDatacomMuxDM820 	OBJECT IDENTIFIER ::={ dmAdMuxDatacom 117 }
 --	DESCRIPTION
---		"DATACOM Mux DM814."
+--		"DATACOM Mux DM820."
 
 dmAdMuxDatacomMuxDM830 	OBJECT IDENTIFIER ::={ dmAdMuxDatacom 118 }
 --	DESCRIPTION
@@ -1206,4 +1377,62 @@ dmAdMuxDatacomMuxDM810 	OBJECT IDENTIFIER ::={ dmAdMuxDatacom 120 }
 --		"DATACOM Mux DM810."
 
 
+-- Devices
+
+datacomDm2301-4GT4GXDevice OBJECT IDENTIFIER ::={ datacomDevices 1 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+4GX Device."
+
+datacomDm2301-4GT2GXDevice OBJECT IDENTIFIER ::={ datacomDevices 2 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+2GX Device."
+
+datacomDm2301-4GT2GX8E1Device OBJECT IDENTIFIER ::={ datacomDevices 3 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+2GX+8E1 Device."
+
+datacomDm2301-4GT4GX8E1Device OBJECT IDENTIFIER ::={ datacomDevices 4 }
+--  DESCRIPTION
+--      " DATACOM DM2301 4GT+4GX+8E1 Device."
+
+datacomDm2302-4GT4GXDevice OBJECT IDENTIFIER ::={ datacomDevices 5 }
+--  DESCRIPTION
+--      " DATACOM DM2302 4GT+4GX Device."
+
+datacomDm2302-4GT4GX8E1Device OBJECT IDENTIFIER ::={ datacomDevices 6 }
+--  DESCRIPTION
+--      " DATACOM DM2302 4GT+4GX+8E1 Device."
+
+datacomDm2303-4GT2GXDevice OBJECT IDENTIFIER ::={ datacomDevices 7 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+2GX Device."
+
+datacomDm2303-4GT4GXDevice OBJECT IDENTIFIER ::={ datacomDevices 8 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+4GX Device."
+
+datacomDm2303-4GT4GX8E1Device OBJECT IDENTIFIER ::={ datacomDevices 9 }
+--  DESCRIPTION
+--      " DATACOM DM2303 4GT+4GX+8E1 Device."
+
+datacomDm2351-4GT4GXDevice OBJECT IDENTIFIER ::={ datacomDevices 10 }
+--  DESCRIPTION
+--      " DATACOM DM2351 4GT+4GX Device."
+
+datacomDm2351-4GT4GX8E1Device OBJECT IDENTIFIER ::={ datacomDevices 11 }
+--  DESCRIPTION
+--      " DATACOM DM2351 4GT+4GX+8E1 Device."
+
+datacomDm2352-4GT4GX16E1Device OBJECT IDENTIFIER ::={ datacomDevices 12 }
+--  DESCRIPTION
+--      " DATACOM DM2352 4GT+4GX+16E1 Device."
+
+datacomDm2353-4GT4GXDevice OBJECT IDENTIFIER ::={ datacomDevices 13 }
+--  DESCRIPTION
+--      " DATACOM DM2353 4GT+4GX Device."
+
+datacomDm2353-4GT4GX16E1Device OBJECT IDENTIFIER ::={ datacomDevices 14 }
+--  DESCRIPTION
+--      " DATACOM DM2353 4GT+4GX+16E1 Device."
+
 END

mibs/DATACOM-SMI.mib

@@ -17,21 +17,20 @@ IMPORTS
 
 datacom OBJECT IDENTIFIER ::={ enterprises 3709 }
 -- MODULE-IDENTITY
---	LAST-UPDATED "9912150000Z"
+--	ORGANIZATION	"DATACOM"
---	ORGANIZATION "Datacom Telem<65>tica"
 --	CONTACT-INFO
---		     "Datacom Telem<65>tica
+--		        "DATACOM
 --
---		      Postal: Datacom Telematica
+--		         Postal: DATACOM
---			           Av. Fran<61>a, 735
+--			         Rua America, 1000
---			           Navegantes, POA, RS
+--			         Eldorado do Sul, RS
---			           CEP 90230-220 
+--			         CEP 92990-000
 --     		                 BRAZIL
 --
--- 		    Tel:   +55(051)3358-0100
+--	 	         Tel:+55(51)3933 3000
---	   	    Fax:   +55(051)3358-0101
+--			     Fax:+55(51)3933 3003
 --
--- 		      E-mail: datacom@datacom-telematica.com.br"
+--			     E-mail: datacom@datacom.ind.br "
 --	DESCRIPTION
 --		" The Structure of Management Information for 
 --      Datacom Telematica enterprise. "
@@ -50,8 +49,6 @@ datacomExperimental	OBJECT IDENTIFIER ::={ datacom 4 }
 
 
 
-
-
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
 
@@ -74,6 +71,9 @@ datacomModems		      OBJECT IDENTIFIER ::={ datacomRegistrations 3 }
 datacomAccessDevices		OBJECT IDENTIFIER ::={ datacomRegistrations 5 }
 
 
+-- Register the devices.
+datacomDevices				OBJECT IDENTIFIER ::={ datacomRegistrations 6 }
+
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- --
 --
@@ -85,7 +85,8 @@ datacomModemsMIBs		OBJECT IDENTIFIER ::={ datacomProductsMIBs 3 }
 -- Access Devices MIBs 
 datacomAccessDevicesMIBs	OBJECT IDENTIFIER ::={ datacomProductsMIBs 5 }
 
-
+-- Devices MIBs 
+datacomDevicesMIBs	OBJECT IDENTIFIER ::={ datacomProductsMIBs 6 }
 
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- --