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.

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

YC.o sync #1583

Merged
merged 16 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,23 @@ module ietf-ac-ntw {
uses nw:node-ref;
}

grouping attachment-circuit-references {
description
"This grouping can be used to reference a list of attachment
circuits in a specific node.";
leaf-list ac-ref {
type leafref {
path "/nw:networks/nw:network[nw:network-id=current()/../"
+ "network-ref]/nw:node[nw:node-id=current()/../"
+ "node-ref]/ac-ntw:ac/ac-ntw:name";
require-instance false;
}
description
"A type for an absolute reference to an attachment circuit.";
}
uses nw:node-ref;
}

grouping ac-profile-reference {
description
"This grouping can be used to reference an attachment circuit
Expand Down Expand Up @@ -1119,7 +1136,8 @@ module ietf-ac-ntw {
description
"Indicates the RIP timers.";
reference
"RFC 2453: RIP Version 2";
"RFC 2080: RIPng for IPv6
RFC 2453: RIP Version 2";
leaf update-interval {
type uint16 {
range "1..32767";
Expand Down Expand Up @@ -1671,6 +1689,7 @@ module ietf-ac-ntw {
units "milliseconds";
description
"Expected BFD holdtime.

The customer may impose some fixed values for the holdtime
period if the provider allows the customer to use this
function.";
Expand Down Expand Up @@ -1833,6 +1852,27 @@ module ietf-ac-ntw {
}
}

// Parent and Child ACs

grouping ac-hierarchy {
description
"Container for parent and child AC references.";
container ac-parent-ref {
description
"Specifies the parent AC that is inherited by an AC.
Parent ACs are used, e.g., in contexts where multiple
CEs are terminating the same AC, but some specific
information is required for each peer SAP.";
uses ac-ntw:attachment-circuit-reference;
}
container ac-child-ref {
config false;
description
"Specifies a child AC that relies upon a parent AC.";
uses ac-ntw:attachment-circuit-references;
}
}

// AC network provisioning

grouping ac {
Expand Down Expand Up @@ -1970,14 +2010,7 @@ module ietf-ac-ntw {
"List of AC profiles.";
uses ac-profile-reference;
}
container ac-parent-ref {
description
"Specifies the parent AC that is inherited by an AC.
Parent ACs are used, e.g., in contexts where multiple
CEs are terminating the same AC, but some specific
information is required for each peer SAP.";
uses ac-ntw:attachment-circuit-reference;
}
uses ac-hierarchy;
leaf-list peer-sap-id {
type string;
description
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ module ietf-altmark {
/*
* IDENTITIES
*/

identity filter {
description
"Base identity to represent a filter. A filter is used to
Expand Down Expand Up @@ -182,7 +181,6 @@ module ietf-altmark {
description
"It indicates the AltMark Period.";
}

identity flow-mon-id {
description
"It indicates the FlowMonID.";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ module ietf-isis-flex-algo {
organization
"IETF LSR - Link State Routing Working Group";
contact
"WG Web: <http://datatracker.ietf.org/wg/lsr>
"WG Web: <https://datatracker.ietf.org/wg/lsr>
WG List: <mailto:spring@ietf.org>

Author: Yingzhen Qu
<mailto:yingzhen.qu@futurewei.com>
<mailto:yingzhen.ietf@gmail.com>
Author: Acee Lindem
<mailto:acee.ietf@gmail.com>
Author: Stephane Litkowski
Expand All @@ -46,12 +46,12 @@ module ietf-isis-flex-algo {

description
"The YANG module defines the configuration and operational
state for ISIS Flexible Algorithm as defined in RFC xxxx.
state for ISIS Flexible Algorithm as defined in RFC 9350.

This YANG model conforms to the Network Management
Datastore Architecture (NMDA) as described in RFC 8342.

Copyright (c) 2023 IETF Trust and the persons identified as
Copyright (c) 2024 IETF Trust and the persons identified as
authors of the code. All rights reserved.

Redistribution and use in source and binary forms, with or
Expand All @@ -73,7 +73,7 @@ module ietf-isis-flex-algo {
reference
"RFC XXXX: YANG Data Model for ISIS Flexible Algorithm.";

revision 2023-03-06 {
revision 2024-09-02 {
description
"Initial Version";
reference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ module ietf-isis-link-attr {
"IETF LSR - Link State Routing Working Group";

contact
"WG Web: <http://datatracker.ietf.org/wg/lsr>
"WG Web: <https://datatracker.ietf.org/wg/lsr>
WG List: <mailto:lsr@ietf.org>

Author: Yingzhen Qu
<mailto:yqu@futurewei.com>
<mailto:yingzhen.ietf@gmail.com>
Author: Acee Lindem
<mailto:acee.ietf@gmail.com>
Author: Stephane Litkowski
Expand All @@ -39,11 +39,11 @@ module ietf-isis-link-attr {
description
"This YANG module defines the configuration and operational
state for IS-IS application specific link attributes feature as
defined in RFC 8919.
defined in RFC 9479.
This YANG model conforms to the Network Management
Datastore Architecture (NMDA) as described in RFC 8342.

Copyright (c) 2023 IETF Trust and the persons identified as
Copyright (c) 2024 IETF Trust and the persons identified as
authors of the code. All rights reserved.

Redistribution and use in source and binary forms, with or
Expand All @@ -64,7 +64,7 @@ module ietf-isis-link-attr {

reference "RFC XXXX";

revision 2023-03-06 {
revision 2024-09-02 {
description
"Initial version";
reference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ module ietf-isis-msd {
organization
"IETF LSR - LSR Working Group";
contact
"WG Web: <http://datatracker.ietf.org/wg/lsr>
"WG Web: <https://datatracker.ietf.org/wg/lsr>
WG List: <mailto:mpls@ietf.org>

Author: Yingzhen Qu
<mailto:yingzhen.qu@futurewei.com>
<mailto:yingzhen.ietf@gmail.com>
Author: Acee Lindem
<mailto:acee.ietf@gmail.com>
Author: Stephane Litkowski
Expand All @@ -41,7 +41,7 @@ module ietf-isis-msd {
This YANG model conforms to the Network Management
Datastore Architecture (NMDA) as described in RFC 8342.

Copyright (c) 2023 IETF Trust and the persons identified as
Copyright (c) 2024 IETF Trust and the persons identified as
authors of the code. All rights reserved.

Redistribution and use in source and binary forms, with or
Expand All @@ -63,7 +63,7 @@ module ietf-isis-msd {
reference
"RFC XXXX: YANG Data Model for ISIS MSD";

revision 2023-03-06 {
revision 2024-09-02 {
description
"Initial Version";
reference
Expand All @@ -76,18 +76,7 @@ module ietf-isis-msd {
container link-msd-sub-tlv {
list link-msds {
key "msd-type";
leaf msd-type {
type identityref {
base mpls-msd:msd-base-type;
}
description
"MSD-Types";
}
leaf msd-value {
type uint8;
description
"MSD value, in the range of 0-255.";
}
uses mpls-msd:msd-type-value;
description
"List of link MSDs";
}
Expand All @@ -112,18 +101,7 @@ module ietf-isis-msd {
container node-msd-tlv {
list node-msds {
key "msd-type";
leaf msd-type {
type identityref {
base mpls-msd:msd-base-type;
}
description
"MSD-Types";
}
leaf msd-value {
type uint8;
description
"MSD value, in the range of 0-255.";
}
uses mpls-msd:msd-type-value;
description
"Node MSD is the smallest link MSD supported by
the node.";
Expand All @@ -136,7 +114,6 @@ module ietf-isis-msd {
}

/* link MSD sub-tlv */

augment "/rt:routing/"
+ "rt:control-plane-protocols/rt:control-plane-protocol"
+ "/isis:isis/isis:database/isis:levels/isis:lsp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ module ietf-isis-remaining-lifetime {
"IETF LSR - Link State Routing Working Group";

contact
"WG Web: <http://datatracker.ietf.org/wg/lsr>
"WG Web: <https://datatracker.ietf.org/wg/lsr>
WG List: <mailto:lsr@ietf.org>

Author: Yingzhen Qu
<mailto:yqu@futurewei.com>
<mailto:yingzhen.ietf@gmail.com>
Author: Acee Lindem
<mailto:acee.ietf@gmail.com>
Author: Stephane Litkowski
<mailto:slitkows.ietf@gmail.com>";

description
"This YANG module defines the configuration and operational
state for IS-IS Minimum Remaining Lifetime feature as defined
in RFC 7987.
"This YANG module defines a notification which is sent when the
IS-IS system detects corrupted lifetime of an LSP. This is for
IS-IS Minimum Remaining Lifetime feature as defined in RFC 7987.

Copyright (c) 2023 IETF Trust and the persons identified as
Copyright (c) 2024 IETF Trust and the persons identified as
authors of the code. All rights reserved.

Redistribution and use in source and binary forms, with or
Expand All @@ -44,7 +44,7 @@ module ietf-isis-remaining-lifetime {

reference "RFC XXXX";

revision 2023-03-06 {
revision 2024-09-02 {
description
"Initial version";
reference
Expand Down
Loading
Loading