yc.o sync

experimental/ietf-extracted-YANG-modules/ietf-bmp-telemetry-message@2026-07-25.yang → experimental/ietf-extracted-YANG-modules/ietf-bmp-telemetry-message@2026-08-27.yang

@@ -54,8 +54,31 @@ module ietf-bmp-telemetry-message {
      to the license terms contained in, the Revised BSD License
      set forth in Section 4.c of the IETF Trust's Legal Provisions
      Relating to IETF Documents
-     (https://trustee.ietf.org/license-info).";
+     (https://trustee.ietf.org/license-info).
 
+     This version of this YANG module is part of RFC XXXX; see
+     the RFC itself for full legal notices.";
+
+  revision 2026-08-27 {
+    description
+      "Split the previously conflated 'rib-type' leaf into
+       separate 'rib-type' and 'address-family' leaves, matching
+       the tree diagram and the Section 5.4 prose, which already
+       described both as independent. Defined a new local identity
+       'bmp-rib-type' (adj-rib-in-pre, adj-rib-in-post, local-rib,
+       adj-rib-out-pre, adj-rib-out-post) as the base for
+       'rib-type', since I-D.ietf-grow-bmp-yang does not yet export
+       a dedicated RIB-type identity; 'rib-type' no longer uses
+       'bmp:afi-safi-type', which now belongs only to the new
+       'address-family' leaf. Qualified the 'bmp-session' when
+       clause's 'session-protocol' reference with the 'tm' prefix,
+       since that node belongs to the augmented base module's
+       namespace, not this module's own namespace. Added the RFC
+       8407 Appendix B boilerplate sentence to the module
+       description.";
+    reference
+      "RFC XXXX";
+  }
   revision 2026-07-25 {
     description
       "Initial revision.";
@@ -104,6 +127,35 @@ module ietf-bmp-telemetry-message {
     description "Route Mirroring Message.";
   }
 
+  identity bmp-rib-type {
+    description
+      "Base identity for BMP RIB types applicable to a Route
+       Monitoring or Statistics Report message, RFC 7854
+       Section 4.6 and Section 4.8. Defined locally pending a
+       dedicated RIB-type identity in I-D.ietf-grow-bmp-yang; see
+       the Note to WG following this module.";
+  }
+  identity adj-rib-in-pre {
+    base bmp-rib-type;
+    description "Adj-RIB-In, pre-policy.";
+  }
+  identity adj-rib-in-post {
+    base bmp-rib-type;
+    description "Adj-RIB-In, post-policy.";
+  }
+  identity local-rib {
+    base bmp-rib-type;
+    description "Loc-RIB.";
+  }
+  identity adj-rib-out-pre {
+    base bmp-rib-type;
+    description "Adj-RIB-Out, pre-policy.";
+  }
+  identity adj-rib-out-post {
+    base bmp-rib-type;
+    description "Adj-RIB-Out, post-policy.";
+  }
+
   identity bmp-stat-extension {
     description
       "Base identity for BMP Statistics Report Stat Type
@@ -147,7 +199,7 @@ module ietf-bmp-telemetry-message {
       "Augments telemetry-message-metadata with BMP-specific
        provenance metadata.";
     container bmp-session {
-      when "../session-protocol = 'bmp-tm:bmp'";
+      when "../tm:session-protocol = 'bmp-tm:bmp'";
       description
         "BMP-specific provenance for this telemetry message.";
       leaf monitoring-station-id {
@@ -174,9 +226,7 @@ module ietf-bmp-telemetry-message {
            Section 4.2, relevant to routing/filtering telemetry
            messages without payload inspection.";
         leaf peer-type {
-          type identityref {
-            base bmp:peer-type;
-          }
+          type bmp:peer-type;
           description "BMP peer type.";
         }
         leaf peer-distinguisher {
@@ -208,6 +258,15 @@ module ietf-bmp-telemetry-message {
           description "Network instance name.";
         }
         leaf rib-type {
+          type identityref {
+            base bmp-rib-type;
+          }
+          description
+            "RIB type (adj-rib-in-pre, adj-rib-in-post, local-rib,
+             adj-rib-out-pre, or adj-rib-out-post) that this
+             message concerns.";
+        }
+        leaf address-family {
           type identityref {
             base bmp:afi-safi-type;
           }