yc.o sync (#1657)

Co-authored-by: Joe Clarke <[email protected]>

Author: xorrkaz

experimental/ietf-extracted-YANG-modules/[email protected] renamed to experimental/ietf-extracted-YANG-modules/[email protected]

@@ -6,9 +6,12 @@ module iana-display-hints {
   import ietf-amm {
     prefix amm;
   }
+  import ietf-amm-base {
+    prefix amm-base;
+  }
 
   organization
-    "IANA" {
+    "Internet Assigned Numbers Authority (IANA)" {
     amm:enum 2;
   }
   contact
@@ -21,17 +24,17 @@ module iana-display-hints {
      Tel:    +1 310 301 5800
      <mailto:[email protected]>";
   description
-    "This module defines intermediate and leaf IDENT objects usable as
-     display-hint annotations derived from the base
-     <ari://ietf/amm/IDENT/display-hint> object.
+    "This module defines leaf IDENT objects usable as 'display-hint'
+     semantic type annotations derived from the base
+     <ari://ietf/amm-base/ident/display-hint> object.
 
      The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
      NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
      'MAY', and 'OPTIONAL' in this document are to be interpreted as
      described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
      they appear in all capitals, as shown here.
 
-     Copyright (c) 2024 IETF Trust and the persons identified as
+     Copyright (c) 2025 IETF Trust and the persons identified as
      authors of the code.  All rights reserved.
 
      Redistribution and use in source and binary forms, with or
@@ -41,13 +44,13 @@ module iana-display-hints {
      Relating to IETF Documents
      (https://trustee.ietf.org/license-info).
 
-     The initial version of this YANG module is part of RFC XXXX
+     This version of this YANG module is part of RFC XXXX
      (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
      for full legal notices.";
   reference
     "https://www.iana.org/assignments/DTNMA-TBA";
 
-  revision 2025-01-31 {
+  revision 2025-07-03 {
     description
       "Updated for latest ADM document.";
     reference
@@ -56,138 +59,90 @@ module iana-display-hints {
   amm:enum 0;
 
   // Integer number hints
-  amm:ident base-integer {
-    amm:enum 1;
-    description
-      "Intermediate base IDENT of display hints for integer values.
-       Hints derived from this object SHALL only apply to built-in types
-       BYTE, INT, UINT, VAST, and UVAST.";
-    amm:base "//ietf/amm/IDENT/display-hint";
-  }
   amm:ident display-int-dec {
     amm:enum 2;
     description
       "Display integers as decimal (base 10).";
-    amm:base "//ietf/amm/IDENT/base-integer";
+    amm:base "//ietf/amm-base/ident/display-hint-integer";
   }
   amm:ident display-int-bin {
     amm:enum 3;
     description
       "Display integers as binary (base 2).";
-    amm:base "//ietf/amm/IDENT/base-integer";
+    amm:base "//ietf/amm-base/ident/display-hint-integer";
   }
   amm:ident display-int-hex {
     amm:enum 4;
     description
       "Display integers as hexadecimal (base 16).";
-    amm:base "//ietf/amm/IDENT/base-integer";
+    amm:base "//ietf/amm-base/ident/display-hint-integer";
   }
 
   // Floating-point number hints
-  amm:ident base-float {
-    amm:enum 5;
-    description
-      "Intermediate base IDENT of display hints for floating point values.
-       Hints derived from this object SHALL only apply to built-in types
-       REAL32 and REAL64.";
-    amm:base "//ietf/amm/IDENT/display-hint";
-  }
   amm:ident display-float-dec {
     amm:enum 6;
     description
       "Display floating point values as decimal fraction.";
-    amm:base "//ietf/amm/IDENT/base-float";
+    amm:base "//ietf/amm-base/ident/display-hint-float";
   }
   amm:ident display-float-exp {
     amm:enum 7;
     description
       "Display floating point values as decimal exponential form.";
-    amm:base "//ietf/amm/IDENT/base-float";
+    amm:base "//ietf/amm-base/ident/display-hint-float";
   }
   amm:ident display-float-hex {
     amm:enum 8;
     description
-      "Display floating point values as hexadecimal exponential form.";
-    amm:base "//ietf/amm/IDENT/base-float";
+      "Display floating point values as hexadecimal exponential
+       form.";
+    amm:base "//ietf/amm-base/ident/display-hint-float";
   }
 
   // Byte-string hints
-  amm:ident base-bstr {
-    amm:enum 9;
-    description
-      "Intermediate base IDENT of display hints for byte string values.
-       Hints derived from this object SHALL only apply to built-in type
-       BYTESTR.";
-    amm:base "//ietf/amm/IDENT/display-hint";
-  }
   amm:ident display-bstr-text {
     amm:enum 10;
     description
       "Display byte string values as UTF-8 text where possible.
        The base16 encoding is used otherwise.";
     reference
       "draft-ietf-dtn-ari";
-    amm:base "//ietf/amm/IDENT/base-bstr";
+    amm:base "//ietf/amm-base/ident/display-hint-bstr";
   }
   amm:ident display-bstr-base16 {
     amm:enum 11;
     description
       "Display byte string values as base16-encoded.";
     reference
       "draft-ietf-dtn-ari";
-    amm:base "//ietf/amm/IDENT/base-bstr";
+    amm:base "//ietf/amm-base/ident/display-hint-bstr";
   }
   amm:ident display-bstr-base64 {
     amm:enum 12;
     description
       "Display byte string values as base64url-encoded.";
     reference
       "draft-ietf-dtn-ari";
-    amm:base "//ietf/amm/IDENT/base-bstr";
-  }
-  amm:ident display-bstr-ipaddress {
-    amm:enum 16;
-    description
-      "Interpret byte string values as either IPv4 address (4-octet length)
-       or IPv6 address (16-octet length) and display as human-friendly text
-       according to RFC 4001 conventions.";
-    reference
-      "RFC 4001: Textual Conventions for Internet Network Addresses";
-    amm:base "//ietf/amm/IDENT/base-bstr";
-  }
-  amm:ident display-bstr-uuid {
-    amm:enum 17;
-    description
-      "Interpret byte string values as UUID and display as human-friendly text
-       according to RFC 4122 conventions.";
-    reference
-      "RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace";
-    amm:base "//ietf/amm/IDENT/base-bstr";
+    amm:base "//ietf/amm-base/ident/display-hint-bstr";
   }
 
   // TIME type (TP or TD built-ins) hints
-  amm:ident base-time {
-    amm:enum 13;
-    description
-      "Intermediate base IDENT of display hints for time values.
-       Hints derived from this object SHALL only apply to built-in types
-       TP and TD.";
-    amm:base "//ietf/amm/IDENT/display-hint";
-  }
   amm:ident display-time-text {
     amm:enum 14;
     description
-      "Display TP and TD values as text in accordance with RFC 3339.";
+      "Display TP and TD values as text in accordance with
+       RFC 3339 not using separator characters.";
     reference
       "draft-ietf-dtn-ari";
-    amm:base "//ietf/amm/IDENT/base-time";
+    amm:base "//ietf/amm-base/ident/display-hint-time";
   }
   amm:ident display-time-dec {
     amm:enum 15;
     description
-      "Display TP and TD values as decimal fraction.";
+      "Display TP and TD values as decimal fraction with units of
+       seconds, which may or may not include a fractional part.";
     reference
       "draft-ietf-dtn-ari";
-    amm:base "//ietf/amm/IDENT/base-time";
+    amm:base "//ietf/amm-base/ident/display-hint-time";
   }
 }