diff --git a/release/models/aft/openconfig-aft-types.yang b/release/models/aft/openconfig-aft-types.yang index 4594d4aa0..56d920b5f 100644 --- a/release/models/aft/openconfig-aft-types.yang +++ b/release/models/aft/openconfig-aft-types.yang @@ -16,13 +16,7 @@ module openconfig-aft-types { "Types related to the OpenConfig Abstract Forwarding Table (AFT) model"; - oc-ext:openconfig-version "1.3.0"; - - revision "2025-01-28" { - description - "Deprecated UDP enum and replaced it by more fine-grained enums UDPV4 and UDPV6."; - reference "1.3.0"; - } + oc-ext:openconfig-version "1.2.0"; revision "2024-07-18" { description @@ -103,16 +97,7 @@ module openconfig-aft-types { } enum UDP { description - "DEPRECATED. The encapsulation header is UDP packet header. This node - is deprecated in favor of UDPV4 and UDPV6 nodes."; - } - enum UDPV4 { - description - "The encapsulation header is a UDP + IPv4 header."; - } - enum UDPV6 { - description - "The encapsulation header is a UDP + IPv6 header."; + "The encapsulation header is UDP packet header."; } } description diff --git a/release/models/lldp/openconfig-lldp.yang b/release/models/lldp/openconfig-lldp.yang index e687b7c61..80530b657 100644 --- a/release/models/lldp/openconfig-lldp.yang +++ b/release/models/lldp/openconfig-lldp.yang @@ -535,6 +535,43 @@ module openconfig-lldp { description "Top-level grouping "; + container interface-defaults { + description + "Container of LLDP attributes that applys to all interfaces + of the system."; + + container config { + description + "Configuration data for LLDP on all interface. Any leaf set + here could be overwriten on per-interfaces basis in + /lldp/interfaces/interface/* hirarchy"; + + leaf enabled { + type boolean; + default "true"; + description + "Enable or disable the LLDP protocol on all + interfaces by default"; + } + } + container state { + + config false; + + description + "Configuration data for LLDP on all interface. Any leaf set + here could be overwriten on per-interfaces basis in + /lldp/interfaces/interface/* hirarchy"; + + leaf enabled { + type boolean; + description + "Enable or disable the LLDP protocol on all + interfaces by default"; + } + } + } + container interfaces { description "Enclosing container "; @@ -655,6 +692,4 @@ module openconfig-lldp { // data definition statements uses lldp-top; - - -} +} \ No newline at end of file diff --git a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang index 9485ab3c4..6dccf8ab6 100644 --- a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang +++ b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang @@ -21,8 +21,14 @@ submodule openconfig-pf-forwarding-policies { "This submodule contains configuration and operational state relating to the definition of policy-forwarding policies."; - oc-ext:openconfig-version "0.6.1"; + oc-ext:openconfig-version "0.7.0"; + revision "2025-02-11" { + description + "Add model for support of URPF source address verification"; + reference "0.7.0"; + } + revision "2023-04-25" { description "Clarify use of interface-ref."; diff --git a/release/models/policy-forwarding/openconfig-pf-interfaces.yang b/release/models/policy-forwarding/openconfig-pf-interfaces.yang index 705e7f795..6e4f4db04 100644 --- a/release/models/policy-forwarding/openconfig-pf-interfaces.yang +++ b/release/models/policy-forwarding/openconfig-pf-interfaces.yang @@ -19,12 +19,12 @@ submodule openconfig-pf-interfaces { "This submodule contains groupings related to the association between interfaces and policy forwarding rules."; - oc-ext:openconfig-version "0.6.1"; + oc-ext:openconfig-version "0.7.0"; - revision "2023-04-25" { + revision "2025-02-11" { description - "Clarify use of interface-ref."; - reference "0.6.1"; + "Add model for support of URPF source address verification"; + reference "0.7.0"; } revision "2023-03-27" { diff --git a/release/models/policy-forwarding/openconfig-pf-path-groups.yang b/release/models/policy-forwarding/openconfig-pf-path-groups.yang index c1c9283cb..fda11c0ef 100644 --- a/release/models/policy-forwarding/openconfig-pf-path-groups.yang +++ b/release/models/policy-forwarding/openconfig-pf-path-groups.yang @@ -18,8 +18,14 @@ submodule openconfig-pf-path-groups { forwarding entities together to be used as policy forwarding targets."; - oc-ext:openconfig-version "0.6.1"; + oc-ext:openconfig-version "0.7.0"; + revision "2025-02-11" { + description + "Add model for support of URPF source address verification"; + reference "0.7.0"; + } + revision "2023-04-25" { description "Clarify use of interface-ref."; diff --git a/release/models/policy-forwarding/openconfig-policy-forwarding.yang b/release/models/policy-forwarding/openconfig-policy-forwarding.yang index c6d37209a..516129064 100644 --- a/release/models/policy-forwarding/openconfig-policy-forwarding.yang +++ b/release/models/policy-forwarding/openconfig-policy-forwarding.yang @@ -81,8 +81,14 @@ module openconfig-policy-forwarding { The forwarding action of the corresponding policy is set to PATH_GROUP and references the configured group of LSPs."; - oc-ext:openconfig-version "0.6.1"; + oc-ext:openconfig-version "0.7.0"; + revision "2025-02-11" { + description + "Add model for support of URPF source address verification"; + reference "0.7.0"; + } + revision "2023-04-25" { description "Clarify use of interface-ref."; @@ -158,4 +164,4 @@ module openconfig-policy-forwarding { uses pf-path-groups-structural; } } -} +} \ No newline at end of file