Merge branch 'master' into dplore/pf-match-clarification

release/models/bgp/openconfig-bgp-policy.yang

@@ -28,7 +28,13 @@ module openconfig-bgp-policy {
     It augments the base routing-policy module with BGP-specific
     options for conditions and actions.";
 
-  oc-ext:openconfig-version "8.0.0";
+  oc-ext:openconfig-version "8.1.0";
+
+  revision "2024-11-13" {
+    description
+      "Add use-last-as leaf to set-as-path-prepend to prepend last AS.";
+    reference "8.1.0";
+  }
 
   revision "2024-08-23" {
     description
@@ -920,9 +926,19 @@ module openconfig-bgp-policy {
     leaf asn {
       type oc-inet:as-number;
       description
-        "The AS number to prepend to the AS path. If this leaf is
-        not specified and repeat-n is set, then the local AS
-        number will be used for prepending.";
+        "The AS number to prepend to the AS path. If neither this
+        leaf nor use-last-as leaf is specified but repeat-n is set, then
+        the local AS number will be used for prepending.";
+    }
+
+    leaf use-last-as {
+      type boolean;
+      description
+        "Indicates whether to use the last AS number, which is also the
+        most recent AS number, to prepend to the AS path.
+        If neither this leaf nor asn leaf is specified
+        but repeat-n is set, then the local AS number will be
+        used for prepending.";
     }
   }
 

release/models/interfaces/openconfig-interfaces.yang

@@ -51,7 +51,14 @@ 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.7.1";
+  oc-ext:openconfig-version "3.7.2";
+
+  revision "2024-12-05" {
+      description
+        "Description typo for unnumbered/interface-ref/config/subinterface leaf";
+      reference
+        "3.7.2";
+  }
 
   revision "2024-04-04" {
       description
@@ -230,7 +237,7 @@ module openconfig-interfaces {
         "Reference to a subinterface -- this requires the base
         interface to be specified using the interface leaf in
         this container.  If only a reference to a base interface
-        is requuired, this leaf should not be set.";
+        is required, this leaf should not be set.";
     }
   }
 

release/models/multicast/openconfig-pim.yang

@@ -25,9 +25,15 @@ module openconfig-pim {
     www.openconfig.net";
 
   description
-    "An OpenConfig model for Protocol Independent Multicast (PIM).";
+    "An OpenConfig model for Protocol Independent Multicast (PIM) that supports IPv4 address family.";
 
-  oc-ext:openconfig-version "0.4.3";
+  oc-ext:openconfig-version "0.4.4";
+
+  revision "2024-12-06" {
+    description
+      "Update PIM documentation to clarify that only ipv4 AF is supported.";
+    reference "0.4.4";
+  }
 
   revision "2023-03-06" {
     description

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;
     }
   }