Merge pull request #1463 from yang-catalog/main

Cronjob - daily update of yang files.
YangModels · Aug 15, 2023 · 23459ac · 23459ac
2 parents 5096888 + dc7ca63
commit 23459ac
Showing 1 changed file with 35 additions and 53 deletions.
diff --git a/.../[email protected] → .../[email protected] b/.../[email protected] → .../[email protected]
@@ -53,6 +53,7 @@ module ietf-ospfv3-extended-lsa {
 
      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
      authors of the code.  All rights reserved.
 
@@ -62,7 +63,6 @@ module ietf-ospfv3-extended-lsa {
      forth in Section 4.c of the IETF Trust's Legal Provisions
      Relating to IETF Documents
      (https://trustee.ietf.org/license-info).
-
      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.
@@ -75,7 +75,7 @@ module ietf-ospfv3-extended-lsa {
 
   reference "RFC XXXX - YANG Model for OSPFv3 Extended LSAs";
 
-  revision 2023-07-23 {
+  revision 2023-08-13 {
     description
       "Initial revision.";
     reference
@@ -111,7 +111,6 @@ module ietf-ospfv3-extended-lsa {
       "RFC 8362: OSPFv3 Link State Advertisement (LSA)
        Extensibility, Section 4.3 and Section 4.4";
   }
-
   identity ospfv3-e-inter-area-prefix-lsa {
     base ospfv3-e-summary-lsa-type;
     description
@@ -267,16 +266,39 @@ module ietf-ospfv3-extended-lsa {
        Extensibility, Section 6.3";
   }
 
+  grouping ospfv3-lsa-prefix {
+    description
+      "OSPFv3 LSA prefix";
+    leaf prefix {
+      type inet:ip-prefix;
+      description
+        "LSA Prefix";
+    }
+    container prefix-options {
+      leaf-list prefix-options {
+        type identityref {
+          base ospfv3-e-prefix-option;
+        }
+        description
+          "OSPFv3 prefix option flag list. This list will
+           contain the identities for the OSPFv3 options
+           that are set for the OSPFv3 prefix.";
+      }
+      description
+        "Prefix options.";
+      reference
+        "RFC 8362:  OSPFv3 Link State Advertisement (LSA)
+         Extensibility, Section 3.1";
+    }
+    reference
+      "RFC 8362: OSPFv3 Link State Advertisement (LSA)
+       Extensibility, Section 3";
+  }
+
   grouping external-prefix-tlv {
     container external-prefix-tlv {
       description
         "External Prefix LSA TLV";
-      leaf length {
-        type uint16;
-        description
-          "External Prefix TLV Length - Variable dependent
-           on sub-TLVs";
-      }
       container flags {
         leaf-list ospfv3-e-external-prefix-bits {
           type identityref {
@@ -293,7 +315,7 @@ module ietf-ospfv3-extended-lsa {
         description
           "External Prefix Metric";
       }
-      uses ospf:ospfv3-lsa-prefix;
+      uses ospfv3-lsa-prefix;
       list sub-tlvs {
         description
           "External Prefix TLV Sub-TLVs";
@@ -349,18 +371,12 @@ module ietf-ospfv3-extended-lsa {
     container intra-prefix-tlv {
       description
         "Intra-Area Prefix LSA TLV";
-      leaf length {
-        type uint16;
-        description
-          "Intra-Area Prefix TLV Length - Variable dependent
-           on sub-TLVs";
-      }
       leaf metric {
         type rt-types:uint24;
         description
           "Intra-Area Prefix Metric";
       }
-      uses ospf:ospfv3-lsa-prefix;
+      uses ospfv3-lsa-prefix;
       list sub-tlvs {
         description
           "Intra-Area Prefix TLV Sub-TLVs";
@@ -378,12 +394,6 @@ module ietf-ospfv3-extended-lsa {
     container ipv6-link-local-tlv {
       description
         "IPv6 Link-Local LSA TLV";
-      leaf length {
-        type uint16;
-        description
-          "IPv6 Link-Local TLV Length - Variable dependent
-           on sub-TLVs";
-      }
       leaf link-local-address {
         type inet:ipv6-address;
         description
@@ -406,12 +416,6 @@ module ietf-ospfv3-extended-lsa {
     container ipv4-link-local-tlv {
       description
         "IPv4 Link-Local LSA TLV";
-      leaf length {
-        type uint16;
-        description
-          "IPv4 Link-Local TLV Length - Variable dependent
-           on sub-TLVs";
-      }
       leaf link-local-address {
         type inet:ipv4-address;
         description
@@ -485,6 +489,7 @@ module ietf-ospfv3-extended-lsa {
          Extensibility, Appendix B - AreaExtendedLSASupport";
     }
   }
+
   /*
    * Link State Database (LSDB) Augmentations
   */
@@ -582,11 +587,6 @@ module ietf-ospfv3-extended-lsa {
         container link-tlv {
           description
             "E-Router LSA TLV";
-          leaf length {
-            type uint16;
-            description
-              "Link TLV Length - Variable dependent on sub-TLVs";
-          }
           leaf interface-id {
             type uint32;
             description
@@ -647,12 +647,6 @@ module ietf-ospfv3-extended-lsa {
         container attached-router-tlv {
           description
             "Attached Router TLV";
-          leaf length {
-            type uint16;
-            description
-              "Attached Router TLV Length - Variable dependent
-               on sub-TLVs";
-          }
           leaf-list adjacent-neighbor-router-id {
             type rt-types:router-id;
             description
@@ -707,18 +701,12 @@ module ietf-ospfv3-extended-lsa {
         container inter-prefix-tlv {
           description
             "Unknown E-Inter-Area-Prefix LSA TLV";
-          leaf length {
-            type uint16;
-            description
-              "Inter-Area-Prefix TLV Length - Variable dependent
-               on sub-TLVs";
-          }
           leaf metric {
             type rt-types:uint24;
               description
                 "Inter-Area Prefix Metric";
           }
-          uses ospf:ospfv3-lsa-prefix;
+          uses ospfv3-lsa-prefix;
           list sub-tlvs {
             description
               "Inter-Area Prefix TLV Sub-TLVs";
@@ -750,12 +738,6 @@ module ietf-ospfv3-extended-lsa {
         container inter-router-tlv {
           description
             "Unknown E-Inter-Area-Router LSA TLV";
-          leaf length {
-            type uint16;
-            description
-              "Inter-Area-Router TLV Length - Variable dependent
-               on sub-TLVs";
-          }
           uses ospf:ospfv3-lsa-options;
           leaf metric {
             type rt-types:uint24;