diff --git a/release/models/interfaces/openconfig-if-ethernet.yang b/release/models/interfaces/openconfig-if-ethernet.yang index 3991923f6..6c1dae27d 100644 --- a/release/models/interfaces/openconfig-if-ethernet.yang +++ b/release/models/interfaces/openconfig-if-ethernet.yang @@ -24,7 +24,15 @@ module openconfig-if-ethernet { "Model for managing Ethernet interfaces -- augments the OpenConfig model for interface configuration and state."; - oc-ext:openconfig-version "2.13.0"; + oc-ext:openconfig-version "2.14.0"; + + revision "2024-09-17" { + description + "Refactor config/state nodes to account for physical ethernet vs. + aggregate interface characteristics along with description updates + to indicate applicability."; + reference "2.14.0"; + } revision "2023-03-10" { description @@ -294,7 +302,9 @@ module openconfig-if-ethernet { // grouping statements grouping ethernet-interface-config { - description "Configuration items for Ethernet interfaces"; + description + "Common interface configuration for physical ethernet + logical + aggregate interfaces"; leaf mac-address { type oc-yang:mac-address; @@ -304,6 +314,31 @@ module openconfig-if-ethernet { expected to show the system-assigned MAC address."; } + leaf enable-flow-control { + type boolean; + default false; + description + "Enable or disable flow control for this interface. + Ethernet flow control is a mechanism by which a receiver + may send PAUSE frames to a sender to stop transmission for + a specified time. + + This setting should override auto-negotiated flow control + settings. If left unspecified, and auto-negotiate is TRUE, + flow control mode is negotiated with the peer interface."; + reference + "IEEE 802.3x"; + } + } + + grouping physical-interface-config { + description + "Configuration specific to physical ethernet interfaces. Note + that this grouping is to only apply when the interface `type` is + set to 'ianaift:ethernetCsmacd'. This is not currently restricted + by YANG language statements (must/when) due to uses of this module + within other domains (e.g. wifi)."; + leaf auto-negotiate { type boolean; default true; @@ -365,22 +400,6 @@ module openconfig-if-ethernet { by ETHERNET_SPEED identities"; } - leaf enable-flow-control { - type boolean; - default false; - description - "Enable or disable flow control for this interface. - Ethernet flow control is a mechanism by which a receiver - may send PAUSE frames to a sender to stop transmission for - a specified time. - - This setting should override auto-negotiated flow control - settings. If left unspecified, and auto-negotiate is TRUE, - flow control mode is negotiated with the peer interface."; - reference - "IEEE 802.3x"; - } - leaf fec-mode { type identityref { base INTERFACE_FEC; @@ -596,9 +615,13 @@ module openconfig-if-ethernet { } - grouping ethernet-interface-state { + grouping physical-interface-state { description - "Grouping for defining Ethernet-specific operational state"; + "Grouping for operational state specific to physical ethernet + interfaces. Note that this grouping is to only apply when the + interface `type` is set to 'ianaift:ethernetCsmacd'. This is not + currently restricted by YANG language statements (must/when) due + to uses of this module within other domains (e.g. wifi)."; leaf hw-mac-address { type oc-yang:mac-address; @@ -631,6 +654,11 @@ module openconfig-if-ethernet { completed auto-negotiation with the remote peer, this value shows the interface speed that has been negotiated."; } + } + + grouping ethernet-interface-state { + description + "Common state for physical ethernet and aggregate interfaces"; container counters { description "Ethernet interface counters"; @@ -653,7 +681,7 @@ module openconfig-if-ethernet { description "Configuration data for ethernet interfaces"; uses ethernet-interface-config; - + uses physical-interface-config; } container state { @@ -662,6 +690,8 @@ module openconfig-if-ethernet { description "State variables for Ethernet interfaces"; uses ethernet-interface-config; + uses physical-interface-config; + uses physical-interface-state; uses ethernet-interface-state; } diff --git a/release/models/interfaces/openconfig-if-ip.yang b/release/models/interfaces/openconfig-if-ip.yang index 8aebaaa06..e5632af50 100644 --- a/release/models/interfaces/openconfig-if-ip.yang +++ b/release/models/interfaces/openconfig-if-ip.yang @@ -44,7 +44,13 @@ module openconfig-if-ip { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; - oc-ext:openconfig-version "3.5.1"; + oc-ext:openconfig-version "3.6.0"; + + revision "2024-05-28" { + description + "Add gratuitous-arp-accepted for IPv4 and unsolicited-na-accepted for IPv6."; + reference "3.6.0"; + } revision "2024-03-13" { description @@ -480,6 +486,15 @@ revision "2023-06-30" { "RFC 791: Internet Protocol"; } + leaf gratuitous-arp-accepted { + type boolean; + description + "When set to true, gratuitous ARPs will be accepted and + the ARP table will be updated."; + reference + "RFC 826: An Ethernet Address Resolution Protocol"; + } + uses ip-common-global-config; @@ -605,6 +620,30 @@ revision "2023-06-30" { "RFC 4862: IPv6 Stateless Address Autoconfiguration"; } + leaf learn-unsolicited { + type enumeration { + enum NONE { + value 0; + } + enum GLOBAL { + value 1; + } + enum LINK_LOCAL { + value 2; + } + enum BOTH { + value 3; + } + } + default "NONE"; + description + "Sets if neighbors should be learned from unsolicited neighbor + advertisements for global or link local addresses or both."; + reference + "RFC 9131: Routers Creating Cache Entries upon + Receiving Unsolicited Neighbor Advertisements"; + } + uses ip-common-global-config; } diff --git a/release/models/oam/.spec.yml b/release/models/oam/.spec.yml new file mode 100644 index 000000000..c72f72b7f --- /dev/null +++ b/release/models/oam/.spec.yml @@ -0,0 +1,9 @@ +- name: openconfig-oam + docs: + - yang/oam/openconfig-oam.yang + - yang/oam/openconfig-cfm-types.yang + - yang/oam/openconfig-oam-cfm.yang + build: + - yang/oam/openconfig-oam.yang + - yang/oam/openconfig-oam-cfm.yang + run-ci: true diff --git a/release/models/oam/openconfig-cfm-types.yang b/release/models/oam/openconfig-cfm-types.yang new file mode 100644 index 000000000..c1f1ccae1 --- /dev/null +++ b/release/models/oam/openconfig-cfm-types.yang @@ -0,0 +1,392 @@ +module openconfig-cfm-types { + + yang-version "1"; + + // namespace + namespace "http://openconfig.net/yang/oam/cfm-types"; + + prefix "oc-cfm-types"; + + // import some basic types + import openconfig-extensions { prefix oc-ext; } + + // google + organization + "OpenConfig working group"; + + contact + "OpenConfig working group + netopenconfig@googlegroups.com"; + + description + "This module contains general data definitions for use in CFM"; + + oc-ext:openconfig-version "0.1.0"; + + revision "2024-09-11" { + description + "Initial revision"; + reference "0.1.0"; + } + +typedef name-key-type { + type string { + length "1..255"; + pattern '[0-9a-zA-Z\-_.]*'; + oc-ext:posix-pattern '^[0-9a-zA-Z\-_.]*$'; + } + description + "String type with at least 1 and up to 255 of the specified + characters."; +} + +typedef config-error-type { + type enumeration { + enum CFM_LEAK { + description + "MA x is associated with a specific VID list, one or more of + the VIDs in MA x can pass through the Bridge Port, no Down MEP + is configured on any Bridge Port for MA x, and some other MA + y, at a higher MD Level than MA x, and associated with at + least one of the VID(s) also in MA x, does have a MEP + configured on the Bridge Port."; + } + enum CONFLICTING_VIDS { + description + "MA x is associated with a specific VID list, an Up MEP is + configured on MA x on the Bridge Port, and some other MA y, + associated with at least one of the VID(s) also in MA x, also + has an Up MEP configured on some Bridge Port."; + } + enum EXCESSIVE_LEVELS { + description + "The number of different MD Levels at which MIPs are to be + created on this port exceeds the Bridge's capabilities."; + } + enum OVERLAPPED_LEVELS { + description + "A MEP is created for one VID at one MD Level, but a MEP is + configured on another VID at that MD Level or higher, + exceeding the Bridge's capabilities."; + } + } + description + "While making the MIP creation evaluation described in 22.2.3, the + management entity can encounter errors in the configuration."; + } + + typedef mep-id-type { + description + "Maintenance association End Point Identifier (MEPID): A 12-bit + identifier, unique over a given Maintenance Association, identifying + a specific MEP."; + reference "[802.1q] 3.19 and 19.2.1"; + type uint16 { + range "1..8191"; + } + } + + typedef remote-mep-state-type { + description + "Operational state of the remote MEP state machine. This state + machine monitors the reception of valid CCMs from a remote MEP + with a specific MEPID. It uses a timer that expires in 3.5 times + the length of time indicated by the MA's ccm-interval object."; + + type enumeration { + enum RMEP_IDLE { + value 1; + description + "Momentary state during reset."; + } + enum RMEP_START { + value 2; + description + "The timer has not expired since the state machine was reset, + and no valid CCM has yet been received."; + } + enum RMEP_FAILED { + value 3; + description + "The timer has expired, both since the state machine was + reset, and since a valid CCM was received."; + } + enum RMEP_OK { + value 4; + description + "The timer has not expired since a valid CCM was received."; + } + } + } + + typedef mep-defects-type { + type enumeration { + enum DEF_RDI_CCM { + value 1; + description + "A REMOTE MEP reported that RDI bit in its last CCM."; + } + enum DEF_MAC_STATUS { + value 2; + description + "Either some remote MEP is reporting its Interface Status TLV + as not isUp, or all remote MEPs are reporting a Port Status + TLV that contains some value other than psUp."; + } + enum DEF_REMOTE_CCM { + value 3; + description + "The MEP is not receiving valid CCMs from at least one of the + remote MEPs."; + } + enum DEF_ERROR_CCM { + value 4; + description + "The MEP has received at least one invalid CCM whose CCM + Interval has not yet timed out."; + } + enum DEF_XCON_CCM { + value 5; + description + "The MEP has received at last one CCM from either another MAID + or a lower MD level whose CCM Interval has not yet timed out."; + } + } + description + "A MEP can detect and report a number of defects, and multiple + defects can be present at the same time."; + } + + typedef fng-state-type { + type enumeration { + enum FNG_RESET { + value 1; + description + "No defect has been present since the MEP's fng-reset-time + timer expired, or since the state machine was last reset."; + } + enum FNG_DEFECT { + value 2; + description + "A defect is present, but not for a long enough time to be + reported."; + } + enum FNG_REPORT_DEFECT { + value 3; + description + "A momentary state during which the defect is reported by + sending a fault-alarm notification, if that action is enabled."; + } + enum FNG_DEFECT_REPORTED { + value 4; + description + "A defect is present, and some defect has been reported."; + } + enum FNG_DEFECT_CLEARING { + value 5; + description + "No defect is present, but the MEP's fng-reset-time timer has + not yet expired."; + } + } + description + "Indicates the different states of the MEP Fault Notification + Generator State Machine."; + } + + typedef operational-state-type { + + type enumeration { + enum ENABLED { + description + "The MEP is able to provide OAM capabilities and has been set to + active via the 'administrative-state' leaf."; + } + enum DISABLED { + description + "The MEP is not able to provide OAM capabilities, for example + because it has been disabled via the administrative-state leaf, + has detected an operational failure condition, or has failed an + internal test."; + } + enum UNKNOWN { + description + "The MEP is unable to report the operational state."; + } + } + description + "This attribute indicates the operational state (current capability) of + a MEP."; + reference + "[MEF7.1] 9.2.5"; + } + + typedef fault-alarm-type { + type enumeration { + enum ADDRESS { + value 1; + description + "Indicates that a Network address to which Fault Alarms are to + be transmitted should be used."; + } + enum NOT_TRANSMITTED { + value 2; + description + "Indicates that Fault alarms are not to be transmitted."; + } + } + description + "The Fault Alarm indicators."; + } + typedef interface-status-type { + + type enumeration { + enum NO_STATUS_TLV { + description "Indicates either that no CCM has been received or that + no interface status TLV was present in the last CCM received."; + } + enum UP { + description "The interface is ready to pass packets."; + } + enum DOWN { + description "The interface cannot pass packets."; + } + enum TESTING { + description "The interface is in some test mode."; + } + enum UNKNOWN { + description "The interface status cannot be determined for some reason."; + } + enum DORMANT { + description "The interface is not in a state to pass packets but is in + a pending state, waiting for some external event."; + } + enum NOT_PRESENT { + description "Some component of the interface is missing."; + } + enum LOWER_LAYER_DOWN { + description "The interface is down due to state of the lower layer + interfaces."; + } + } + description + "The set of values available from the Interface Status TLV in CCM PDUs + including the default no-status-tlv"; + reference + "[802.1q] 20.19.4, 12.14.7.6.3:g + IEEE8021-CFM-MIB.Dot1agCfmInterfaceStatus"; + } + + typedef port-status-type { + type enumeration { + enum NO_STATUS_TLV { + description "Indicates either that no CCM has been received or that + no port status TLV was present in the last CCM received."; + } + enum BLOCKED { + description "Ordinary data cannot pass freely through the port on + which the remote MEP resides. Value of enableRmepDefect + is equal to false."; + } + enum UP { + description "Ordinary data can pass freely through the port on which + the remote MEP resides. Value of enableRmepDefect is + equal to true."; + } + } + description + "The set of values available from the Port Status TLV in CCM PDUs + including the default no-status-tlv"; + reference + "[802.1q] 20.19.3, 12.14.7.6.3:f + IEEE8021-CFM-MIB.Dot1agCfmPortStatus"; + } + + typedef highest-defect-priority-type { + type enumeration { + enum NONE { + value 0; + description + "No defects since Fault Notification Generator state machine + reset."; + } + enum DEF_RDI_CCM { + value 1; + description + "The last CCM received by this MEP from some remote MEP + contained the RDI bit set."; + } + enum DEF_MAC_STATUS { + value 2; + description + "The last CCM received by this MEP from some remote MEP + indicating that the transmitting MEP's associated MAC is + reporting its status via the Port Status TLV or Interface + Status TLV."; + } + enum DEF_REMOTE_CCM { + value 3; + description + "This MEP is not receiving CCMs from some other MEP in its + configured list."; + } + enum DEF_ERROR_CCM { + value 4; + description + "This MEP is receiving invalid CCMs."; + } + enum DEF_XCON_CCM { + value 5; + description + "This MEP is receiving CCMs that could be from some other MA."; + } + } + description + "An enumerated value, equal to the contents of the variable + highestDefect (20.35.9 and Table 20-1), indicating the + highest-priority defect that has been present since the MEP Fault + Notification Generator State Machine was last in the FNG_RESET + state. The integer value assigned to the enum value determines the + priority. The higher value corresponds to the higher priority."; + } + typedef lowest-alarm-priority-type { + type enumeration { + enum ALL_DEF { + value 1; + description + "Includes def_rdi-ccm, def_mac_status, def_remote_ccm, + def_error_ccm, and def_xcon_ccm."; + } + enum MAC_REMOTE_ERROR_XCON { + value 2; + description + "Only includes def_mac_status, def_remote_ccm, def_error_ccm, + and def_xcon_ccm."; + } + enum REMOTE_ERROR_XCON { + value 3; + description + "Includes def_remote_ccm, def_error_ccm, and def_xcon_ccm."; + } + enum ERROR_XCON { + value 4; + description + "Includes def_error_ccm and def_xcon_ccm."; + } + enum XCON { + value 5; + description + "Only def_xcon_ccm"; + } + enum NO_XCON { + value 6; + description + "No defects def_xcon or lower are to be reported."; + } + } + description + "Specifies the lowest priority defect that is allowed to generate + a Fault Alarm (20.9.5). The to be reported defects are identified + per enum value."; + } +} \ No newline at end of file diff --git a/release/models/oam/openconfig-oam-cfm.yang b/release/models/oam/openconfig-oam-cfm.yang new file mode 100644 index 000000000..dbf0888e7 --- /dev/null +++ b/release/models/oam/openconfig-oam-cfm.yang @@ -0,0 +1,1318 @@ +module openconfig-oam-cfm { + + yang-version "1"; + + // namespace + namespace "http://openconfig.net/yang/oam/cfm"; + + prefix "oc-oam-cfm"; + import openconfig-vlan-types { prefix oc-vlan-types; } + import openconfig-interfaces { prefix oc-if; } + import openconfig-extensions { prefix oc-ext; } + import openconfig-yang-types { prefix oc-yang; } + import openconfig-cfm-types { prefix oc-cfm-types; } + import openconfig-oam { prefix oc-oam; } // imports the module being augmented + + + // google + organization "OpenConfig working group"; + + contact + "OpenConfig working group + www.openconfig.net"; + + description + "This module defines a YANG data model for configuring and managing CFM + (Connectivity Fault Management) in a network device. The module includes + maintenance domains, associations, maintenance endpoints, + performance management policies and remote defect handling features"; + + oc-ext:openconfig-version "0.1.0"; + + revision "2024-09-11" { + description + "Initial revision"; + reference "0.1.0"; + } + + grouping cfm-top { + description "Top-level grouping for CFM configuration and state"; + + container cfm { + description + "Container for CFM configuration, state and perfomance measurement policies"; + + container domains { + description "A Container for CFM maintenance domain state and Configuration + on the local system"; + + list maintenance-domain { + key "md-id"; + description + "A Maintenance Domain managed object is required in order to create + an MA with a MAID that includes that Maintenance Domain’s Name. From + this Maintenance Domain managed object, all Maintenance + Association managed objects associated with that Maintenance + Domain managed object can be accessed, and thus controlled."; + reference "[802.1q] 12.14.5"; + + leaf md-id { + type leafref { + path "../config/md-id"; + } + description + "A unique maintenance domain name identifying the domain"; + reference + "[802.1q] 12.14.5"; + } + + container config { + description "Configuration data for a maintenance domain."; + uses cfm-domain-config; + } + + container state { + description "Operational data for a maintenance domain."; + config false; + uses cfm-domain-config; + } + + container maintenance-associations { + description + "Collection of maintenance associations within a + maintenance domain.Provides configuration and operational data + for the Maintenance Associations. A Maintenance Association is a set + of MEPs, each configured with the same MAID and MD level, + established to verify the integrity of a single service + instance. A Maintenance Association can be thought of as a + full mesh of Maintenance Entities among a set of MEPs so + configured."; + + list maintenance-association { + key "ma-id"; + description "Collection of maintenance associations within a maintenance domain."; + + leaf ma-id { + description "Key of the Maintenance Association list of entries."; + type leafref { + path "../config/ma-id"; + } + reference + "[802.1q] 12.14.6"; + } + + container config { + description "Configuration data for a maintenance association."; + uses maintenance-association-config; + } + + container state { + description "Operational data for a maintenance association."; + config false; + uses maintenance-association-config; + } // End MA State + + container mep-endpoints { + description "Container for full mesh MEPs under the maintenance association."; + + list mep-endpoint { + key "local-mep-id"; + description "collection of full mesh MEPs under the maintenance association."; + + leaf local-mep-id { + description "Local MEP identifier."; + type leafref { + path "../config/local-mep-id"; + } + } + + container config { + description "Configuration data for a MEP."; + uses mep-config; + } // end container config + + container state { + config false; + description " Operational tate data for a MEP."; + uses mep-config; + uses mep-oper-states; + } //end container mep state + + container pm-profiles { + description + "This container includes configuration and state objects for the Frame Loss + Measurement & Delay Measurement functions defined in [Y.1731] and [MEF SOAM PM IA]."; + + list pm-profile { + description " Measurement profile name and state."; + key "profile-name"; + + leaf "profile-name" { + description "A unique profile name identifying the profile"; + type leafref { + path "../config/profile-name"; + } + } + + container config { + description "Associated performance Measurement profile."; + + leaf "profile-name" { + description "A unique profile name identifying the profile"; + type string; + } + } + + container state { + description "Operational data for loss measurement."; + config false; + uses performance-measurement-config; + uses performance-measurement-state; + } + } + } + + container rdi { + description "rdi config for a mep."; + container config { + description "rdi config for a mep."; + uses rdi-config; + } + + container state { + description "rdi state for a mep."; + config false; + uses rdi-config; + } + + } + + container link-loss-forwarding { + description "link loss forwarding config for a mep."; + container config { + description + "Enable propagation of the remote + attachment-circuit link state to the + localattachment-circuit link state"; + uses link-loss-forwarding-config; + } + + container state { + description "link loss forwarding state for a mep."; + config false; + uses link-loss-forwarding-config; + } + } + container remote-meps { + description "Remote meps associated to a local mep"; + + list remote-mep { + description "Remote meps associated to a local mep"; + key "id"; + + leaf id { + description "Remote mep id."; + type leafref{ + path "../config/id"; + } + } + + container config { + description "Configuration data for a remote mep."; + uses remote-mep-config; + } + + container state { + description "Operational data for a remote mep."; + config false; + uses remote-mep-config; + uses mep-oper-states; + } + } // end list remote-mep + } // end container remote-meps + } // end list mep-endpoint + } // end container mep-enpoints + } // end MA list + } // end container MA + } // end list MD + } // end container domains + + container state { + description "Operational data for CFM."; + config false; + uses cfm-global-state; + } + + container performance-measurement-profiles-global { + description "This container includes configuration and state objects + for the Frame Loss Measurement and Delay measurement + functions as defined in [Y.1731] and [MEF SOAM PM IA]."; + + list performance-measurement-profile { + description "Performance measurement configuration and state."; + key "profile-name"; + + leaf "profile-name" { + description + "A unique profile name identifying the + Performance measurement profile"; + type leafref { + path "../config/profile-name"; + } + } + container config { + description + "Configuration data for Performance measurement profile."; + uses performance-measurement-config; + } + + container state { + description + "Statistical data for performance measurement profiles."; + config false; + uses performance-measurement-config; + uses performance-measurement-state; + } + } + } + } // End container cfm + } // End grouping cfm + + grouping maintenance-association-config { + description "Configuration for a maintenance association"; + + leaf ma-id { + type oc-cfm-types:name-key-type; + description "Key of the Maintenance Association list of entries."; + reference + "[802.1q] 12.14.6"; + } + + leaf group-name { + type string; + description + "Optional Bridge Group or Cross-connect Group name, if + Service Type is BridgeDomain or + CrossConnect"; +} + + leaf ma-name-type { + type enumeration { + enum PRIMARY_VID { + description + "Specifies the Primary VLAN ID."; + } + enum CHARACTER_STRING { + description + "RFC2579 DisplayString, except that the character + codes 0-31 (decimal) are not used."; + } + enum UINT16 { + description "2-octet integer/big endian."; + } + enum RFC2685_VPN_ID { + description "Specifies the RFC 2685 VPN ID."; + } + } + description + "Name type discriminator for the 'name' leaf."; + reference + "[802.1q] 12.14.5.3.2:b, Table 21-20 + IEEE8021-CFM-MIB.Dot1agCfmMaintAssocNameType"; + } + + + leaf primary-vid { + when "../ma-name-type = 'PRIMARY_VID'"; + mandatory true; + type oc-vlan-types:vlan-id; + description + "Primary VLAN ID. 12 bits represented in a 2-octet integer."; + } + + + leaf char-string { + when "../ma-name-type = 'CHARACTER_STRING'"; + mandatory true; + type string { + length "1..45"; + pattern '[ -~]*'; + oc-ext:posix-pattern '^[ -~]*$'; + } + description + "RFC2579 DisplayString, except that the character codes 0-31 + (decimal) are not used."; + } + + + leaf unsigned-int16 { + when "../ma-name-type = 'UINT16'"; + type uint16; + mandatory true; + description + "2-octet integer."; + } + + leaf vpn-oui { + when "../ma-name-type = 'RFC2685_VPN_ID'"; + type uint32 { + range "0..16777215"; + } + mandatory true; + description + "RFC2685 VPN ID. 3 octet VPN authority Organizationally + Unique Identifier followed by 4 octet VPN index identifying + VPN according to the OUI. 3 octet VPN authority + Organizationally Unique Identifier."; + } + + leaf vpn-index { + when "../ma-name-type = 'RFC2685_VPN_ID'"; + type uint32; + mandatory true; + description + "RFC2685 VPN ID. 3 octet VPN authority Organizationally + Unique Identifier followed by 4 octet VPN index identifying + VPN according to the OUI. + vpn-index is a 4 octet index identifying VPNaccording to the OUI."; + } + + leaf ccm-interval { + description "CCM transmission interval."; + type enumeration { + enum "300MS" { + description "300 milli milliseconds interval."; } + enum "1S" { + description "1 second interval."; } + enum "10S" { + description "10 seconds interval."; } + } + } // end ccm-interval + + leaf loss-threshold { + type uint16; + description "number of consecutive loss frames to trigger a loss event."; + } // end loss-threshold + } // end grouping maintenance-association-config + + grouping remote-mep-config { + description "Configuration for remote MEPS"; + + leaf id { + type oc-cfm-types:mep-id-type; + description "Remote MEP IDs in full mesh."; + reference + "Item a in 12.14.7.6.3, 20.20 of IEEE Std 802.1Q-2022"; + } + + leaf mac-address { + type oc-yang:mac-address; + description "Remote MEP IDs in full mesh."; + reference + "Item d in 12.14.7.6.3, 20.19.7 of IEEE Std 802.1Q-2022"; + } + } // end grouping + + grouping mep-oper-states { + description "Operational state of a MEP"; + + leaf oper-state { + type oc-cfm-types:operational-state-type; + description "Operational state of the MEP."; + } + + leaf interface-state { + type oc-cfm-types:interface-status-type; + description + "The state of the interface last reported by the local MEP in the TLV."; + reference + "[802.1q] 17.5"; + } + + leaf fng-state { + type oc-cfm-types:fng-state-type; + default "FNG_RESET"; + description + "The current state of the MEP Fault Notification Generator + state machine."; + reference + "Item f in 12.14.7.1.3, 20.35 of IEEE Std 802.1Q-2022"; + } + + leaf highest-priority-defect { + type oc-cfm-types:highest-defect-priority-type; + description + "The highest priority defect that has been present since + the MEPs Fault Notification Generator state machine was + last in the FNG_RESET state."; + reference + "Item n in 12.14.7.1.3, 20.35.9 of IEEE Std 802.1Q-2022"; + } + + leaf-list mep-defects { + type oc-cfm-types:mep-defects-type; + max-elements 5; + description + "Vector of boolean error conditions. + Multiple defects can be present at the same time."; + reference + "12.14.7.1.3 of IEEE Std 802.1Q-2022"; + } + + leaf present-rdi { + type boolean; + description + "A boolean value indicating the state of the RDI bit in CCMs + transmitted by this MEP. present-rdi is true if and only if one or more + of the variables someRMEPCCMdefect, someMACstatusDefect, errorCCMdefect, + or xconCCMdefect is true, and if the corresponding priority of that + variable, from mep-defects above, is greater than or equal to the + value of the variable lowestAlarmPri."; + } + + leaf-list config-errors-detected { + type oc-cfm-types:config-error-type; + max-elements 4; + description "Vector of enums of config error detected. i.e. [cfm-leak]"; + } + + leaf error-ccm-last-failure { + type binary { + length "1..128"; + } + description + "The last received CCM that triggered a def-error-ccm + fault."; + reference + "Itemt in 12.14.7.1.3, 20.21.2 of IEEE Std 802.1Q-2022"; + } + uses mep-counters-state; + } // end grouping mep-oper-states. + + grouping mep-counters-state { + description "Counters for a remote MEP"; + container counters { + description + "A collection of mep-related statistics objects."; + leaf mep-ccm-sequence-errors { + type oc-yang:counter64; + mandatory true; + description + "The total number of out-of-sequence CCMs received from + all remote MEPs."; + reference + "Item v in 12.14.7.1.3, 20.16.12 of IEEE Std 802.1Q-2022"; + } + + leaf mep-ccms-sent { + type oc-yang:counter64; + mandatory true; + description + "Total number of CCMs transmitted by the local MEP"; + reference + "Item w in 12.14.7.1.3, 20.10.2 of IEEE Std 802.1Q-2022"; + } + } + } + + grouping rmep-oper-states { + description "Operational state of a MEP"; + + leaf rmep-state { + type oc-cfm-types:remote-mep-state-type; + description + "The operational state of the remote MEP state machine"; + reference + "Item b in 12.14.7.6.3, 20.20 of IEEE Std 802.1Q-2022"; + } + + leaf rmep-failed-ok-time { + type oc-yang:counter32; + description + "The time (SysUpTime) at which the Remote MEP state + machine last entered either the RMEP_FAILED or RMEP_OK + state"; + reference + "Item c in 12.14.7.6.3 of IEEE Std 802.1Q-2022"; + } + leaf mac-address { + type oc-yang:mac-address; + description + "The MAC address of the remote MEP."; + reference + "Item d in 12.14.7.6.3, 20.19.7 of IEEE Std 802.1Q-2022"; + } + + leaf remote-defect-condition { + type boolean; + default false; + description + "State of the RDI bit in the last received CCM (true for + RDI=1), or false if none has been received.;"; + } + + leaf-list config-errors-detected { + type oc-cfm-types:config-error-type; + max-elements 4; + description "Vector of enums for config errors detected. i.e. [cfm-leak]"; + } + + leaf interface-status-tlv { + type oc-cfm-types:interface-status-type; + description + "An enumerated value of the Interface status TLV sent in the last CCM + from the local MEP or the default value no-status-tlv + indicating no CCM has been sent or no Interface Status TLV has + been sent."; + reference + "[802.1q] 17.5"; + } + + leaf port-status-tlv { + type oc-cfm-types:port-status-type; + description + "The enumerated value from the Port Status TLV from the last + CCM received from the remote MEP."; + reference + "[802.1q] 12.14.7.6.3:f"; + } + uses rmep-counters-state; + + } // end grouping mep-oper-states. + + + grouping rmep-counters-state { + description "Counters for a remote MEP"; + container counters { + description + "A collection of rmep-related statistics objects."; + leaf mep-ccm-sequence-errors { + type oc-yang:counter64; + mandatory true; + description + "The total number of out-of-sequence CCMs received from + the remote MEP."; + reference + "Item v in 12.14.7.1.3, 20.16.12 of IEEE Std 802.1Q-2022"; + } + leaf ccms-sent { + type oc-yang:counter64; + mandatory true; + description + "Total number of CCMs transmitted towards the Remote MEP"; + reference + "Item w in 12.14.7.1.3, 20.10.2 of IEEE Std 802.1Q-2022"; + } + } + } + + grouping mep-config { + description "Configuration for a MEP."; + + leaf ccm-enabled { + type boolean; + default "false"; + description + "Indicates whether the MEP can generate CCMs. If TRUE, the + MEP will generate CCM PDUs."; + reference + "Item g in 12.14.7.1.3, 20.10.1 of IEEE Std 802.1Q-2022"; + } + + leaf lowest-priority-defect { + type oc-cfm-types:lowest-alarm-priority-type; + default "MAC_REMOTE_ERROR_XCON"; + description + "The lowest priority defect that is allowed to generate + fault alarms."; + reference + "Item k in 12.14.7.1.3, 20.9.5 of IEEE Std 802.1Q-2022"; + } + + leaf fng-alarm-time { + type uint16 { + range "2500..10000"; + } + units "milliseconds"; + default "2500"; + description + "The time that defect must be present before a Fault Alarm + is issued."; + reference + "Item l in 12.14.7.1.3, 20.35.3 of IEEE Std 802.1Q-2022"; + } + + leaf fng-reset-time { + type uint16 { + range "2500..10000"; + } + units "milliseconds"; + default "10000"; + description + "The time that defects must be absent before resetting a + Fault Alarm."; + reference + "Item m in 12.14.7.1.3, 20.35.4 of IEEE Std 802.1Q-2022"; + } + + leaf local-mep-id { + type oc-cfm-types:mep-id-type; + description "The identifier of a Local MEP. Unique per given MA "; + } // end local-mep-id + + leaf interface { + type leafref { + path "/oc-if:interfaces/oc-if:interface/oc-if:name"; + } + description "Interface directly associated with the MEP id."; + } // end leaf interface + + leaf include-mep-port-status-in-tlv { + type boolean; + default true; + description + "Indicates whether a Port Status TLV is included in CCM frame + transmission. A value of 'true' indicates that the Port Status + TLV is to be included. A value of 'false' indicates that the + Port Status TLV is not to be included."; + reference + "[MEF7.1] 9.2.2"; + } + leaf include-mep-interface-status-in-tlv { + type boolean; + default true; + description + "Indicates whether a Interface Status TLV is included in CCM frame + transmission. A value of 'true' indicates that the Interface Status TLV + is to be included. A value of 'false' indicates that the Interface + Status TLV is not to be included."; + reference + "[MEF7.1] 9.2.2"; + } + + leaf direction { + description "The direction in which the MEP faces on the Bridge/Xconnect + Port. Example, up or down."; + type enumeration { + enum DOWN { + value 1; + description + "Down maintenance point, where CFM protocol messages are + dispatched away from the MAC Relay entity."; + } + enum UP { + value 2; + description + "Up maintenance point, where CFM protocol messages are + dispatched towards the MAC Relay entity."; + } + } + reference + "Item c in 12.14.7.1.3, 19.2 of IEEE Std 802.1Q-2022"; + } + + leaf auto-discovery { + type boolean; + description + "A boolean value to enable or disable auto-discovery. + users must configure explicitly true or false. + If unset, then it’s implementation specific."; + } + } + + grouping cfm-domain-config { + description "Config parameters relating to a CFM Maintenance Domain."; + + leaf md-id { + type oc-cfm-types:name-key-type; + description "The unique identifier for a Maintenance Domain."; + reference + "[802.1q] 12.14.5"; + } + + leaf level { + description "Level of the maintenance domain."; + type uint8 { + range "0..7"; + } + reference + "3.123, Item b in 12.14.5.1.3 of IEEE Std 802.1Q-2022"; + } + + leaf md-name-type { + type enumeration { + enum NONE { + description + "No format specified."; + } + enum DOMAIN_NAME { + description + "Domain Name like string, globally unique text string + derived from a DNS name."; + } + enum MAC_ADDRESS_AND_UINT { + description + "MAC address + 2-octet (unsigned) integer."; + } + enum CHARACTER_STRING { + description + "RFC2579 DisplayString, except that the character + codes 0-31 (decimal) are not used."; + } + } + description + "Type discriminator for the value described in the md 'name' leaf."; + reference + " IEEE8021-CFM-MIB.Dot1agCfmMaintDomainNameType"; + } + + + leaf none { + when "../md-name-type = 'NONE'"; + type boolean; + description + "No format specified, usually because there is not a + Maintenance Domain Name. The Maintenance Domain name + inserted in CFM protocol messages will be a zero length + OCTET string."; + } + + leaf dns-like-name { + when "../md-name-type = 'DOMAIN_NAME'"; + description + "Domain name like string, globally unique text string + derived from a DNS name."; + type string { + length "1..43"; + } + } + + leaf address { + when "../md-name-type = 'MAC_ADDRESS_AND_UINT'"; + type oc-yang:mac-address; + mandatory true; + description + "The MAC address."; + } + leaf unsigned-int { + when "../md-name-type = 'MAC_ADDRESS_AND_UINT'"; + type uint16; + mandatory true; + description + "The additional 2-octet (unsigned) integer."; + } + + leaf char-string { + when "../md-name-type = 'CHARACTER_STRING'"; + description + "The character string name of the Maintenance Domain."; + type string { + length "1..43"; + pattern "[ -~]*"; + oc-ext:posix-pattern '^[ -~]*$'; + } + } + } + + grouping cfm-global-state { + description "Operational parameters relating to a CFM Maintenance Domain."; + + leaf local-meps { + type uint32; + description "The total number of local-meps configured on the local system."; + } + + leaf local-meps-operational { + type uint32; + description "The total number of local-meps operational on the local system."; + } + + leaf cfm-domains { + type uint32; + description "The total number cfm domains configured on the local system."; + } + + leaf cfm-services { + type uint32; + description "The total number cfm services configured on the local system."; + } + + leaf down-meps { + type uint32; + description "The total number cfm down meps configured on the local system."; + } + + leaf up-meps { + type uint32; + description "The total number cfm down meps configured on the local system."; + } + + leaf disabled-misconfigured { + type uint32; + description "The total number of disabled cfm down meps configured on the local system."; + } + + leaf disabled-operational-errors { + type uint32; + description "The total number cfm operational errors on the local system."; + } + + leaf disabled-out-of-resources { + type uint32; + description "The total number cfm endpoints disabled due to lack of resources on the local system."; + } + + leaf peer-meps{ + type uint32; + description "The total number cfm peer meps configured."; + } + + leaf operational-peer-meps { + type uint32; + description + "The total number cfm peer meps operational."; + } + + leaf peer-meps-with-defects { + type uint32; + description "The total number cfm peer meps with defects."; + } + + leaf peer-meps-timed-out { + type uint32; + description "The total number cfm peer meps timed out."; + } + + // End cfm-global-state + } + + grouping delay-measurement-state { + description "Delay measurement state."; + + container delay-measurement-state { + description "Delay measurement state."; + + leaf frame-delay-two-way-min { + type uint32; + units microseconds; + description + "This object contains the minimum two-way frame delay calculated by this + MEP for this Measurement Interval. + + This object is undefined if measurement-type is dm1-transmitted + or dm1-received."; + } + leaf frame-delay-two-way-max { + type uint32; + units microseconds; + description + "This object contains the maximum two-way frame delay calculated by this + MEP for this Measurement Interval. + + This object is undefined if measurement-type is dm1DmTx or + dm1-received."; + } + leaf frame-delay-two-way-average { + type uint32; + units microseconds; + description + "This object contains the average two-way frame delay calculated by this + MEP for this Measurement Interval. + + This object is undefined if measurement-type is dm1-transmitted or + dm1-received."; + } + + leaf frame-delay-two-way-stddev { + type uint32; + units microseconds; + description + "This object contains the standard deviation of two-way frame delay calculated by this + MEP for this Measurement Interval. + + This object is undefined if measurement-type is dm1DmTx or + dm1-received."; + } + uses delay-measurement-counters-state; + } + } + + grouping loss-measurement-state { + description "Loss measurement state grouping."; + + container loss-measurement-state { + description "Loss measurement state container."; + + leaf far-end-min-frame-loss-ratio { + type uint32 { + range "0..100000"; + } + units milli-percent; + description + "This object contains the minimum one-way availability flr in the + egress direction (source --> destination), + from among the set of availability flr values + calculated by the MEP in this Measurement Interval. There is + one availability flr value for each 'delta_t' time period + within the Measurement Interval, as specified in MEF 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsForwardMinFlr"; + } + leaf far-end-max-frame-loss-ratio { + type uint32 { + range "0..100000"; + } + units milli-percent; + description + "This object contains the maximum one-way availability flr in the + forward direction (source --> destination), + from among the set of availability flr + values calculated by the MEP in this Measurement Interval. + There is one availability flr value for each 'delta_t' time + period within the Measurement Interval, as specified in MEF + 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsForwardMaxFlr"; + } + leaf far-end-average-frame-loss-ratio { + + type uint32 { + range "0..100000"; + } + units milli-percent; + + description + "This object contains the average one-way availability flr in the + forward direction, from among the set of availability flr + values calculated by the MEP in this Measurement Interval. + There is one availability flr value for each 'delta_t' time + period within the Measurement Interval, as specified in MEF + 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsForwardAvgFlr"; + } + + leaf near-end-min-frame-loss-ratio { + type uint32 { + range "0..100000"; + } + units milli-percent; + description + "This object contains the minimum one-way availability flr in the + backward direction (destination --> source), + from among the set of availability flr + values calculated by the MEP in this Measurement Interval. + There is one availability flr value for each 'delta_t' time + period within the Measurement Interval, as specified in MEF + 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsBackwardMinFlr"; + } + leaf near-end-max-frame-loss-ratio { + type uint32 { + range "0..100000"; + } + units milli-percent; + description + "This object contains the maximum one-way availability flr in the + backward direction, from among the set of availability flr + values calculated by the MEP in this Measurement Interval. + There is one availability flr value for each 'delta_t' time + period within the Measurement Interval, as specified in MEF + 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + Service OAM Performance Monitoring YANG Module + MEF 39 + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsBackwardMaxFlr"; + } + + leaf near-end-average-frame-loss-ratio { + + type uint32 { + range "0..100000"; + } + units milli-percent; + + description + "This object contains the average one-way availability flr in the + backward direction, from among the set of availability flr + values calculated by the MEP in this Measurement Interval. + There is one availability flr value for each 'delta_t' time + period within the Measurement Interval, as specified in MEF + 10.2.1. + + The flr value is a ratio that is expressed as a percent with a + value of 0 (ratio 0.00) through 100000 (ratio 1.00). + + Units are in milli-percent, where 1 indicates 0.001 percent."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCurrentAvailStatsBackwardAvgFlr"; + } + + uses loss-measurement-counters-state; + } + } + + grouping loss-measurement-counters-state { + description "Loss-measurement-related measurement counters state."; + + container counters { + description + "A collection of loss-measurement-related statistics objects."; + + leaf slm-sent { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf slm-received { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf slr-sent { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf slr-received { + type oc-yang:counter64; + description "slm Probes sent."; + } + } + } + + grouping delay-measurement-counters-state { + description "Delay measurement counters state."; + + container counters { + description + "A collection of delay-measurement-related statistics objects."; + + leaf dmm-sent { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf dmm-received { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf dmr-sent { + type oc-yang:counter64; + description "slm Probes sent."; + } + + leaf dmr-received { + type oc-yang:counter64; + description "slm Probes sent."; + } + } + } + + grouping performance-measurement-state { + description "Performance measurement state grouping."; + + uses loss-measurement-state; + uses delay-measurement-state; + } + + grouping performance-measurement-config { + description "Performance measurement configuration."; + + leaf profile-name { + type string; + description "Name of the measurement profile."; + } + + leaf enable { + type boolean; + default false; + description "Enable or disable measurement."; + } + + leaf measurement-type { + type enumeration { + enum LMM { + description + "LMM SOAM PDU generated and received LMR responses tracked."; + } + enum SLM { + description + "SLM SOAM PDU generated and received SLR responses tracked."; + } + enum DMM { + description + "DMM SOAM PDU generated and received DMR responses tracked."; + } + enum CCM { + description + "CCM SOAM PDU generated and received CCM PDUs tracked."; + } + } + default SLM; + description + "This object specifies what type of Performance Measurement will be + performed."; + reference + "ITU Y1731"; + } + + leaf protocol-type { + description "protocol type."; + type enumeration { + enum SINGLE_ENDED { + description "single-ended measurement mode."; + } + enum DUAL_ENDED { + description "dual-ended measurement mode."; + } + } + reference + "https://datatracker.ietf.org/doc/html/rfc7456#section-4"; + } + + leaf frame-size { + type uint16; + description "Probe Frame size for measurement."; + } + + leaf measurement-interval { + type uint32 { + range "1..525600"; + } + units "minutes"; + description + "This object specifies the Measurement Interval for FLR statistics, in + minutes. + A Measurement Interval of 15 minutes needs to be supported, + other intervals may be supported."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCfgMeasurementInterval"; + } + + leaf repetition-period { + type uint32; + default 0; + description + "This object specifies a configurable repetition time between + Measurement Intervals in a Measurement session in hundredths of a + second. + + If the value is less than or equal to one Measurement Interval + there is no time gap between the end of one Measurement + Interval and the start of a new Measurement Interval. This is + the normal usage case. + + If the value is greater than one Measurement Interval there is + time gap between the end of one Measurement Interval and the + start of the next Measurement Interval."; + reference + "[MEF SOAM PM IA] R18, D3, R19, R20"; + } + + leaf intervals-archived { + type uint16; + description + "This object specifies the number of completed measurement intervals to + store in the history statistic table. + + At least 32 completed measurement intervals are to be + stored. 96 measurement intervals are recommended to be stored."; + reference + "MEF-SOAM-PM-MIB.mefSoamLmCfgNumIntervalsStored"; + } + + leaf packets-per-meaurement-period { + type uint16; + description "Number of probe packets to send within a measurement interval."; + } + + leaf burst-interval { + type uint32; + units "milliseconds"; + description "Interval between bursts within a measurement interval."; + } + + leaf packet-per-burst { + type uint32; + description + "if burst enabled. The leaf defines the number of packet per burst of probes. + packets-per-measurement-period / burst-interval"; + } + } + + grouping rdi-config { + description "Remote Defect Indication (RDI) configuration."; + + leaf transmit-on-defect { + type boolean; + description "Transmit RDI when a defect is detected."; + } + } + + grouping link-loss-forwarding-config { + description "Link loss forwarding configuration."; + + leaf enable { + type boolean; + description + "Enable propagation of the remote + attachment-circuit link state to the + local attachment-circuit link state"; + } + leaf damping-timer { + type uint64; + units milliseconds; + description + "The damping timer is the amount of time that the local + attachment-circuit link state will be held in the down state + after the remote attachment-circuit link state has been + detected to be up. The damping timer is used to prevent + flapping of the local attachment-circuit link state."; + } + + leaf action { + type enumeration { + enum "SHUTDOWN" { description "Shutdown action on link loss."; } + enum "ALARM" { description "Raise an alarm on link loss."; } + enum "DISABLE_ROUTING" { description "Mark interface non-routable."; } + } + description "Action to take on link loss."; + } + } + + // augment statements + + augment "/oc-oam:oam" { + description + "Add cfm related state and config to oam"; + uses cfm-top; + } +} \ No newline at end of file diff --git a/release/models/oam/openconfig-oam.yang b/release/models/oam/openconfig-oam.yang new file mode 100644 index 000000000..12a755874 --- /dev/null +++ b/release/models/oam/openconfig-oam.yang @@ -0,0 +1,53 @@ +module openconfig-oam { + + yang-version "1"; + + // namespace + namespace "http://openconfig.net/yang/oam"; + + prefix "oc-oam"; + import openconfig-extensions { prefix oc-ext; } + + // google + organization "OpenConfig working group"; + + contact + "OpenConfig working group + www.openconfig.net"; + + description + "This module defines a YANG data model for configuring and managing + EthernetOAM functions"; + + oc-ext:openconfig-version "0.1.0"; + + revision "2024-09-11" { + description + "Initial revision"; + reference "0.1.0"; + } + + grouping oam-top{ + description + "top level grouping for configuration and operational state parameters relating + to Ethernet OAM"; + + container oam { + description + "Operational state and configuration parameters relating to + Ethernet OAM"; + + container config { + description + "Configuration parameters relating to Ethernet OAM"; + } + container state { + config false; + description + "Operational state parameters relating to Ethernet OAM"; + } + } + } + + uses oam-top; +} \ No newline at end of file diff --git a/release/models/optical-transport/openconfig-transport-types.yang b/release/models/optical-transport/openconfig-transport-types.yang index 7c3c6a481..34e2f8a65 100644 --- a/release/models/optical-transport/openconfig-transport-types.yang +++ b/release/models/optical-transport/openconfig-transport-types.yang @@ -22,7 +22,13 @@ module openconfig-transport-types { "This module contains general type definitions and identities for optical transport models."; - oc-ext:openconfig-version "1.0.0"; + oc-ext:openconfig-version "1.1.0"; + + revision "2024-11-21" { + description + "Add PROT_OTSI_A protocol type."; + reference "1.1.0"; + } revision "2024-07-24" { description @@ -855,6 +861,14 @@ module openconfig-transport-types { "FlexO protocol as defined in ITU-T G.709.1 and ITU-T G.709.3"; } + identity PROT_OTSI_A { + base TRIBUTARY_PROTOCOL_TYPE; + description + "OTSI_A is the digital adaptation between the OTSi and the + FlexO-x, or the regenerator section layer of the FlexO"; + reference "ITU-T G.798"; + } + identity PROT_ODUFLEX_GFP { base TRIBUTARY_PROTOCOL_TYPE; description "ODU Flex with GFP protocol"; diff --git a/release/models/platform/openconfig-platform-transceiver.yang b/release/models/platform/openconfig-platform-transceiver.yang index e60220563..5a43801fe 100644 --- a/release/models/platform/openconfig-platform-transceiver.yang +++ b/release/models/platform/openconfig-platform-transceiver.yang @@ -66,21 +66,27 @@ module openconfig-platform-transceiver { specify a physical-channel within a TRANSCEIVER component (i.e. gray optic) that it is associated with."; - oc-ext:openconfig-version "0.15.0"; + oc-ext:openconfig-version "0.16.0"; -revision "2024-09-21" { + revision "2024-10-09" { + description + "Add status flags for transceiver host lanes and media channels."; + reference "0.16.0"; + } + + revision "2024-09-21" { description "Clearly define how physical channel power leaves are used."; reference "0.15.0"; } -revision "2023-08-30" { + revision "2023-08-30" { description "Clarify transceiver module threshold for input-power."; reference "0.14.0"; } -revision "2023-08-30" { + revision "2023-08-30" { description "Add transceiver module temperature thresholds"; reference "0.13.0"; @@ -407,6 +413,29 @@ revision "2023-08-30" { uses oc-opt-types:avg-min-max-instant-stats-precision2-pct; } + leaf tx-failure { + type boolean; + description + "Transmitter failure flag. + In earlier standards, including SFF-8436, SFF-8472, and QSFP-DD CMIS 4.0, + this flag was named Tx Fault."; + reference "QSFP-DD CMIS 5.0 Table 8-77, SFF-8472 Table 9-11, SFF-8436 Table 19"; + } + + leaf rx-los { + type boolean; + description + "Receiver loss-of-signal flag."; + reference "QSFP-DD CMIS 5.0 Table 8-78, SFF-8472 Table 9-11, SFF-8436 Table 19"; + } + + leaf rx-cdr-lol { + type boolean; + description + "Receiver clock-and-data-recovery loss-of-lock flag."; + reference "QSFP-DD CMIS 5.0 Table 8-78"; + } + uses output-optical-frequency; uses optical-power-state; } @@ -455,6 +484,83 @@ revision "2023-08-30" { } } + grouping host-lane-config { + description + "Configuration data for electrical host lanes."; + + leaf lane-number { + type uint8 { + range 1..max; + } + description + "Number identifying an electrical host lane carrying one serial + signal. Lanes are numbered starting with 1."; + reference "CMIS 5.0 section 2.3.4"; + } + } + + grouping host-lane-state { + description + "Operational state data for electrical host lanes."; + + leaf tx-los { + type boolean; + description + "Transmitter loss-of-signal flag."; + reference "CMIS 5.0 Table 8-77, SFF-8436 Table 19"; + } + + leaf tx-cdr-lol { + type boolean; + description + "Transmitter clock-and-data-recovery loss-of-lock flag."; + reference "CMIS 5.0 Table 8-77"; + } + } + + grouping host-lane-top { + description + "Top-level grouping for electrical host lanes."; + + container host-lanes { + description + "Enclosing container for host lanes."; + + list lane { + key "lane-number"; + description + "List of electrical host lanes, keyed by lane number. + The host lanes of a transceiver constitute its electrical interface + with the host system."; + reference "CMIS 5.0 section 4.1"; + + leaf lane-number { + type leafref { + path "../config/lane-number"; + } + description + "Reference to the host lane number."; + } + + container config { + description + "Configuration data for host lanes."; + + uses host-lane-config; + } + + container state { + config false; + description + "Operational state data for host lanes."; + + uses host-lane-config; + uses host-lane-state; + } + } + } + } + grouping transceiver-threshold-top { description "Top-level grouping for transceiver alarm thresholds for @@ -926,6 +1032,7 @@ revision "2023-08-30" { // physical channels are associated with a transceiver // component uses physical-channel-top; + uses host-lane-top; uses transceiver-threshold-top; } } diff --git a/release/models/platform/openconfig-platform-types.yang b/release/models/platform/openconfig-platform-types.yang index 88b0ef521..e2a1aacb6 100644 --- a/release/models/platform/openconfig-platform-types.yang +++ b/release/models/platform/openconfig-platform-types.yang @@ -22,9 +22,15 @@ module openconfig-platform-types { "This module defines data types (e.g., YANG identities) to support the OpenConfig component inventory model."; - oc-ext:openconfig-version "1.8.0"; + oc-ext:openconfig-version "1.9.0"; + revision "2024-11-04" { + description + "Add FAN_TRAY_CONTROLLER"; + reference "1.9.0"; + } + revision "2024-04-30" { description "Add FAN_TRAY"; @@ -339,6 +345,12 @@ module openconfig-platform-types { "Contains multiple fans that work in unison to cool the router components."; } + identity FAN_TRAY_CONTROLLER { + base OPENCONFIG_HARDWARE_COMPONENT; + description + "Controls the fan trays."; + } + identity SENSOR { base OPENCONFIG_HARDWARE_COMPONENT; description