Skip to content

Commit

Permalink
Fix smartos-dcp-m.yaml (librenms#15295)
Browse files Browse the repository at this point in the history 
* Update smartos-dcp-m.yaml

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Remove bogus 0 values

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update DCP-INTERFACE-MIB

* Update SO-TC-MIB

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m.yaml

* Test data update

* Update smartos-dcp-m.yaml

* Update smartos-dcp-m_dcp-m40-pam4-zr.json

* Remove Grouping

* Update Test
  • Loading branch information
@electrocret
electrocret authored Sep 12, 2023
1 parent 28603f2 commit a1eb90f
Show file tree
Hide file tree
Showing 4 changed files with 552 additions and 4,325 deletions.
14 changes: 8 additions & 6 deletions includes/definitions/discovery/smartos-dcp-m.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ modules:
oid: dcpInterfaceTable
num_oid: '.1.3.6.1.4.1.30826.2.2.2.1.1.1.5.{{ $index }}'
value: dcpInterfaceStatus
descr: '{{ $dcpInterfaceChannelId }}'
descr: '{{ $dcpInterfaceName }}'
index: 'dcpInterfaceStatus.{{ $index }}'
state_name: InterfaceStatus
states:
Expand All @@ -31,18 +31,20 @@ modules:
data:
-
oid: dcpInterfaceTable
num_oid: '.1.3.6.1.4.1.30826.2.2.2.1.1.1.3.{{ $index }}'
num_oid: '.1.3.6.1.4.1.30826.2.2.1.1.1.1.3.{{ $index }}'
value: dcpInterfaceRxPower
divisor: 10
descr: '{{ $dcpInterfaceChannelId }} - RX'
descr: '{{ $dcpInterfaceName }} - RX'
index: 'dcpInterfaceRxPower.{{ $index }}'
skip_values: -990
-
oid: dcpInterfaceTable
num_oid: '.1.3.6.1.4.1.30826.2.2.2.1.1.1.4.{{ $index }}'
num_oid: '.1.3.6.1.4.1.30826.2.2.1.1.1.1.4.{{ $index }}'
divisor: 10
value: dcpInterfaceTxPower
descr: '{{ $dcpInterfaceChannelId }} - TX'
descr: '{{ $dcpInterfaceName }} - TX'
index: 'dcpInterfaceTxPower.{{ $index }}'
skip_values: -990
-
oid: dcpLinkviewTable
num_oid: '.1.3.6.1.4.1.30826.2.2.3.1.1.1.14.{{ $index }}'
Expand All @@ -56,4 +58,4 @@ modules:
divisor: 10
value: dcpLinkviewLocalPower
descr: '{{ $dcpLinkviewLocalName }} - {{ $dcpLinkviewRemoteName }} - Local Power'
index: 'dcpLinkviewLocalPower.{{ $index }}'
index: 'dcpLinkviewLocalPower.{{ $index }}'
50 changes: 46 additions & 4 deletions mibs/smartoptics/DCP-INTERFACE-MIB
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- DCP-INTERFACE-MIB.mib
-- Smartoptics DCP Interface Enterprise Specific MIB.
--
-- Copyright (c) 2018, Smartoptics
-- Copyright (c) 2022, Smartoptics
-- All rights reserved
--

Expand All @@ -16,16 +16,19 @@ IMPORTS
FROM SNMPv2-SMI
DisplayString
FROM SNMPv2-TC
OpticalPower1Decimal, ItuPerceivedSeverity, InterfaceStatus
OpticalPower1Decimal, ItuPerceivedSeverity, InterfaceStatus, InterfacePortMode
FROM SO-TC-MIB;

-- 1.3.6.1.4.1.30826.2.2.2
dcpInterface MODULE-IDENTITY
LAST-UPDATED "202102251200Z"
LAST-UPDATED "202203181300Z"
ORGANIZATION "Smartoptics."
CONTACT-INFO "http://www.smartoptics.com"
DESCRIPTION "This is the enterprise specific DCP INTERFACE MIB for Smartoptics"

REVISION "202203181300Z" -- March 18.
DESCRIPTION "Addition of dcpInterfacePortType, dcpInterfacePortMode attributes."

REVISION "202102251200Z" -- February 25.
DESCRIPTION "Update description for dcpInterfaceRxPower and dcpInterfaceTxPower."

Expand Down Expand Up @@ -85,7 +88,11 @@ DcpInterfaceEntry ::=
dcpInterfaceChannelId
DisplayString,
dcpInterfaceDescription
DisplayString
DisplayString,
dcpInterfacePortType
DisplayString,
dcpInterfacePortMode
InterfacePortMode
}

-- 1.3.6.1.4.1.30826.2.2.2.1.1.1.1
Expand Down Expand Up @@ -207,6 +214,23 @@ dcpInterfaceDescription OBJECT-TYPE
::= { dcpInterfaceEntry 10 }


-- 1.3.6.1.4.1.30826.2.2.2.1.1.1.11
dcpInterfacePortType OBJECT-TYPE
SYNTAX DisplayString (SIZE(0..128))
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Port type of the interface."
::= { dcpInterfaceEntry 11 }

-- 1.3.6.1.4.1.30826.2.2.2.1.1.1.12
dcpInterfacePortMode OBJECT-TYPE
SYNTAX InterfacePortMode
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"Interface portmode."
::= { dcpInterfaceEntry 12 }

-- 1.3.6.1.4.1.30826.2.2.2.2
dcpInterfaceMIBCompliance OBJECT IDENTIFIER ::= { dcpInterface 2 }
Expand All @@ -232,6 +256,15 @@ dcpInterfaceTableGroupV2 OBJECT-GROUP
"The interface table objects V2."
::= { dcpInterfaceMIBGroups 2 }

-- 1.3.6.1.4.1.30826.2.2.2.2.1.3
dcpInterfaceTableGroupV3 OBJECT-GROUP
OBJECTS { dcpInterfaceName, dcpInterfaceRxPower, dcpInterfaceTxPower, dcpInterfaceStatus,
dcpInterfaceAlarm, dcpInterfaceFormat, dcpInterfaceChannelId, dcpInterfaceWavelength, dcpInterfaceDescription, dcpInterfacePortType, dcpInterfacePortMode }
STATUS current
DESCRIPTION
"The interface table objects V3."
::= { dcpInterfaceMIBGroups 3 }

-- 1.3.6.1.4.1.30826.2.2.2.2.2
dcpInterfaceMIBCompliances OBJECT IDENTIFIER ::= { dcpInterfaceMIBCompliance 2 }

Expand All @@ -255,6 +288,15 @@ dcpInterfaceBasicComplV2 MODULE-COMPLIANCE
dcpInterfaceTableGroupV2 }
::= { dcpInterfaceMIBCompliances 2 }

-- 1.3.6.1.4.1.30826.2.2.2.2.2.3
dcpInterfaceBasicComplV3 MODULE-COMPLIANCE
STATUS current
DESCRIPTION
"Basic implementation requirements for the DCP-INTERFACE-MIB V3."
MODULE
MANDATORY-GROUPS {
dcpInterfaceTableGroupV3 }
::= { dcpInterfaceMIBCompliances 3 }

END

Expand Down
39 changes: 36 additions & 3 deletions mibs/smartoptics/SO-TC-MIB
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-- SO-TC-MIB.mib
-- Smartoptics Enterprise Specific TC MIB
--
-- Copyright (c) 2021, Smartoptics
-- Copyright (c) 2022, Smartoptics
-- All rights reserved
--

Expand All @@ -16,12 +16,18 @@ IMPORTS
FROM SO-MIB;

soTcMIB MODULE-IDENTITY
LAST-UPDATED "202104121049Z"
LAST-UPDATED "202209051410Z"
ORGANIZATION "Smartoptics"
CONTACT-INFO "http://www.smartoptics.com"
DESCRIPTION "This is the enterprise specific TC MIB for
Smartoptics containing common textual conventions."


REVISION "202209051410Z"
DESCRIPTION "Added xc4Wss1-5 to InterfacePortMode."

REVISION "202203181349Z"
DESCRIPTION "Added InterfacePortMode."

REVISION "202104121049Z"
DESCRIPTION "Added DcpTenth, DcpHundreds, OchPortMode textual convention.
Updated description for InterfaceStatus."
Expand Down Expand Up @@ -106,6 +112,33 @@ OchPortMode ::= TEXTUAL-CONVENTION
express (4)
}

InterfacePortMode ::= TEXTUAL-CONVENTION
STATUS current
DESCRIPTION
"The interface port mode for a service.
na - Not applicable.
localAD - The service is added to the chosen channel on the local Add/drop ports.
xc1 - The service is added to the cross connect port XC1.
xc2 - The service is added to the cross connect port XC2.
xc3 - The service is added to the cross connect port XC3.
xc4Wss1 - The service is added to the cross connect port XC4:Wss1.
xc4Wss2 - The service is added to the cross connect port XC4:Wss2.
xc4Wss3 - The service is added to the cross connect port XC4:Wss2.
xc4Wss4 - The service is added to the cross connect port XC4:Wss4.
xc4Wss5 - The service is added to the cross connect port XC4:Wss5."
SYNTAX INTEGER
{
na (1),
localAD (2),
xc1 (3),
xc2 (4),
xc3 (5),
xc4Wss1 (6),
xc4Wss2 (7),
xc4Wss3 (8),
xc4Wss4 (9),
xc4Wss5 (10)
}
END

--
Expand Down
Loading

0 comments on commit a1eb90f

Please sign in to comment.