Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add multicast counters to ip interface, remove physical counters from subinterface #905

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Add multicast counters to ip interface, remove physical counters from subinterface #905

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
826cbcd
add multicast to ip if, remove physical counters from subinterface
dplore Jul 6, 2023
1553133
add in deprecated leaves to subif for backwards compat
dplore Jul 7, 2023
a9f8ca4
trim whitespace
dplore Jul 7, 2023
5314392
add if common submodule
dplore Jul 14, 2023
98628fa
update spec.yml
dplore Jul 14, 2023
aad3de9
use common grouping for if counters
dplore Jul 14, 2023
4e5e12a
cleanup
dplore Jul 15, 2023
b187aa1
don't deprecate
dplore Jul 15, 2023
a9d718a
bump versions
dplore Jul 15, 2023
650b8f0
bump versions
dplore Jul 15, 2023
7a7a74f
merge submodule to openconfig-interfaces
dplore Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion release/models/interfaces/openconfig-if-ip.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0";
oc-ext:openconfig-version "3.4.0";

revision "2023-07-06" {
description
"Add multicast-pkts counters.";
reference "3.4.0";
}

revision "2023-04-12" {
description
Expand Down Expand Up @@ -296,6 +302,21 @@ module openconfig-if-ip {
Internet Protocol (IP)";
}

leaf in-multicast-pkts {
dplore marked this conversation as resolved.
Show resolved Hide resolved
type oc-yang:counter64;
description
"The total number of multicast IP packets received for the
specified address family, including those received in error.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 4293 - Management Information Base for the
Internet Protocol (IP)";
}

leaf out-pkts {
type oc-yang:counter64;
description
Expand Down Expand Up @@ -369,6 +390,23 @@ module openconfig-if-ip {
"RFC 4293 - Management Information Base for the
Internet Protocol (IP)";
}
leaf out-multicast-pkts {
dplore marked this conversation as resolved.
Show resolved Hide resolved
type oc-yang:counter64;
description
"The total number of multicast IP packets for the specified address
family that the device supplied to the lower layers for
transmission. This includes packets generated locally and those
forwarded by the device.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 4293 - Management Information Base for the
Internet Protocol (IP)";
}

}

}
Expand Down
310 changes: 307 additions & 3 deletions release/models/interfaces/openconfig-interfaces.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,15 @@ module openconfig-interfaces {
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.0.2";
oc-ext:openconfig-version "3.4.0";

revision "2023-02-06" {
revision "2023-07-06" {
description
"Add multicast-pkts counters.";
reference "3.4.0";
}

revision "2023-02-06" {
description
"Add further specification to interface-ref type to
clarify that the interface and subinterface leaves
Expand Down Expand Up @@ -931,6 +937,304 @@ revision "2023-02-06" {
}
}

grouping subinterface-counters-state {
dplore marked this conversation as resolved.
Show resolved Hide resolved
description
"Operational state representing subinterface counters and statistics.
Error counters such as fcs errors can only be accounted for at the
physical interface level. Likewise, carrier transitions is only a
property of the physical interface.";

oc-ext:operational;
dplore marked this conversation as resolved.
Show resolved Hide resolved

container counters {
description
"A collection of interface-related statistics objects.";

leaf in-octets {
type oc-yang:counter64;
description
"The total number of octets received on the interface,
including framing characters.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifHCInOctets";
}

leaf in-pkts {
type oc-yang:counter64;
description
"The total number of packets received on the interface,
including all unicast, multicast, broadcast and bad packets
etc.";
reference
"RFC 2819: Remote Network Monitoring Management Information
Base";
}

leaf in-unicast-pkts {
type oc-yang:counter64;
description
"The number of packets, delivered by this sub-layer to a
higher (sub-)layer, that were not addressed to a
multicast or broadcast address at this sub-layer.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
}

leaf in-broadcast-pkts {
type oc-yang:counter64;
description
"The number of packets, delivered by this sub-layer to a
higher (sub-)layer, that were addressed to a broadcast
address at this sub-layer.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB -
ifHCInBroadcastPkts";
}

leaf in-multicast-pkts {
type oc-yang:counter64;
description
"The number of packets, delivered by this sub-layer to a
higher (sub-)layer, that were addressed to a multicast
address at this sub-layer. For a MAC-layer protocol,
this includes both Group and Functional addresses.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB -
ifHCInMulticastPkts";
}

leaf in-discards {
type oc-yang:counter64;
description
"The number of inbound packets that were chosen to be
discarded even though no errors had been detected to
prevent their being deliverable to a higher-layer
protocol. One possible reason for discarding such a
packet could be to free up buffer space.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";


reference
"RFC 2863: The Interfaces Group MIB - ifInDiscards";
}

leaf in-errors {
type oc-yang:counter64;
description
"For packet-oriented interfaces, the number of inbound
packets that contained errors preventing them from being
deliverable to a higher-layer protocol. For character-
oriented or fixed-length interfaces, the number of
inbound transmission units that contained errors
preventing them from being deliverable to a higher-layer
protocol.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifInErrors";
}

leaf in-unknown-protos {
type oc-yang:counter64;
description
"For packet-oriented interfaces, the number of packets
received via the interface that were discarded because
of an unknown or unsupported protocol. For
character-oriented or fixed-length interfaces that
support protocol multiplexing, the number of
transmission units received via the interface that were
discarded because of an unknown or unsupported protocol.
For any interface that does not support protocol
multiplexing, this counter is not present.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
}

leaf out-octets {
type oc-yang:counter64;
description
"The total number of octets transmitted out of the
interface, including framing characters.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
}

leaf out-pkts {
type oc-yang:counter64;
description
"The total number of packets transmitted out of the
interface, including all unicast, multicast, broadcast,
and bad packets etc.";
reference
"RFC 2819: Remote Network Monitoring Management Information
Base";
}

leaf out-unicast-pkts {
type oc-yang:counter64;
description
"The total number of packets that higher-level protocols
requested be transmitted, and that were not addressed
to a multicast or broadcast address at this sub-layer,
including those that were discarded or not sent.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
}

leaf out-broadcast-pkts {
type oc-yang:counter64;
description
"The total number of packets that higher-level protocols
requested be transmitted, and that were addressed to a
broadcast address at this sub-layer, including those
that were discarded or not sent.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB -
ifHCOutBroadcastPkts";
}


leaf out-multicast-pkts {
type oc-yang:counter64;
description
"The total number of packets that higher-level protocols
requested be transmitted, and that were addressed to a
multicast address at this sub-layer, including those
that were discarded or not sent. For a MAC-layer
protocol, this includes both Group and Functional
addresses.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB -
ifHCOutMulticastPkts";
}

leaf out-discards {
type oc-yang:counter64;
description
"The number of outbound packets that were chosen to be
discarded even though no errors had been detected to
prevent their being transmitted. One possible reason
for discarding such a packet could be to free up buffer
space.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifOutDiscards";
}

leaf out-errors {
type oc-yang:counter64;
description
"For packet-oriented interfaces, the number of outbound
packets that could not be transmitted because of errors.
For character-oriented or fixed-length interfaces, the
number of outbound transmission units that could not be
transmitted because of errors.

Discontinuities in the value of this counter can occur
at re-initialization of the management system, and at
other times as indicated by the value of
'last-clear'.";
reference
"RFC 2863: The Interfaces Group MIB - ifOutErrors";
}

leaf in-fcs-errors {
status deprecated;
type oc-yang:counter64;
description
"This leaf is only valid for physical ports and is deprecated
for subinterfces.

Number of received packets which had errors in the frame check
sequence (FCS), i.e., framing errors.

Discontinuities in the value of this counter can occur
when the device is re-initialization as indicated by the
value of 'last-clear'.";
}

leaf carrier-transitions {
status deprecated;
type oc-yang:counter64;
description
"This leaf is only valid for physical ports and is deprecated
for subinterfces.

Number of times the interface state has transitioned
between up and down since the time the device restarted
or the last-clear time, whichever is most recent.";
oc-ext:telemetry-on-change;
}

leaf last-clear {
type oc-types:timeticks64;
description
"Timestamp of the last time the interface counters were
cleared.

The value is the timestamp in nanoseconds relative to
the Unix Epoch (Jan 1, 1970 00:00:00 UTC).";
oc-ext:telemetry-on-change;
}
}
}

// data definition statements

grouping sub-unnumbered-config {
Expand Down Expand Up @@ -1020,7 +1324,7 @@ revision "2023-02-06" {
}

uses interface-common-state;
uses interface-counters-state;
uses subinterface-counters-state;
}

grouping subinterfaces-top {
Expand Down