Upgrade IANA models

Adopt:
- iana-if-type@2023-01-26.yang
- iana-routing-types@2022-08-19.yang

Change-Id: I9ce147047714d8f8ee38fd6119fa47d5954acafc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/iana/iana-if-type/src/main/yang/iana-if-type@2021-06-21.yang b/model/iana/iana-if-type/src/main/yang/iana-if-type@2023-01-26.yang
similarity index 98%
rename from model/iana/iana-if-type/src/main/yang/iana-if-type@2021-06-21.yang
rename to model/iana/iana-if-type/src/main/yang/iana-if-type@2023-01-26.yang
index e36ee3873b7f235fb113573f88d16b633f27124a..fea9330bf2ef0aa266646a661ae65f7d90db2100 100644 (file)
--- a/model/iana/iana-if-type/src/main/yang/iana-if-type@2021-06-21.yang
+++ b/model/iana/iana-if-type/src/main/yang/iana-if-type@2023-01-26.yang
@@ -46,22 +46,46 @@ module iana-if-type {
     "IANA 'ifType definitions' registry.
      <http://www.iana.org/assignments/smi-numbers>";
 
+  revision 2023-01-26 {
+    description
+      "Fix incorrect quotation for previous 3 revision statements.";
+  }
+  
+  revision 2022-08-24 {
+    description
+      "Updated reference for ifType 303.";
+  }
+
+  revision 2022-08-17 {
+    description
+      "Changed gpon description to refer to G.984.";
+  }
+
+  revision 2022-03-07 {
+    description
+      "Coalesced revision history entries for 2018-06-28.";
+  }
+
   revision 2021-06-21 {
     description
       "Corrected reference for ifType 303.";
   }
+
   revision 2021-05-17 {
     description
       "Registered ifType 303.";
   }
+
   revision 2021-04-22 {
     description
       "Registered ifType 302.";
   }
+
   revision 2021-04-01 {
     description
       "Updated reference for 301.";
   }
+
   revision 2021-02-18 {
     description
       "Registered ifType 301.";
@@ -122,12 +146,7 @@ module iana-if-type {
 
   revision 2018-06-28 {
     description
-      "Registered ifType 294.";
-  }
-
-  revision 2018-06-28 {
-    description
-      "Registered ifType 293.";
+      "Registered ifTypes 293 and 294.";
   }
 
   revision 2018-06-22 {
@@ -1509,7 +1528,7 @@ module iana-if-type {
     base iana-interface-type;
     description
       "Gigabit-capable passive optical networks (G-PON) as per
-       ITU-T G.948.";
+       ITU-T G.984.";
   }
   identity vdsl2 {
     base iana-interface-type;
@@ -1827,6 +1846,6 @@ module iana-if-type {
     description
       "Point to Point over LAN interface.";
     reference
-      "RFC 5309 - Point-to-Point Operation over LAN in Link State Routing Protocols";
+      "RFC 9296 - ifStackTable for the Point-to-Point (P2P) Interface over a LAN Type: Definition and Examples";
   }
 }

diff --git a/model/iana/iana-routing-types/src/main/yang/iana-routing-types@2021-10-19.yang b/model/iana/iana-routing-types/src/main/yang/iana-routing-types@2022-08-19.yang
similarity index 95%
rename from model/iana/iana-routing-types/src/main/yang/iana-routing-types@2021-10-19.yang
rename to model/iana/iana-routing-types/src/main/yang/iana-routing-types@2022-08-19.yang
index 01d28ead045d20bd613f1e9b6aebc7e08c25f2c4..fcad71351938e1401159aba89412f46d347d4360 100644 (file)
--- a/model/iana/iana-routing-types/src/main/yang/iana-routing-types@2021-10-19.yang
+++ b/model/iana/iana-routing-types/src/main/yang/iana-routing-types@2022-08-19.yang
@@ -32,6 +32,18 @@ module iana-routing-types {
      This version of this YANG module is part of RFC 8294; see
      the RFC itself for full legal notices.";
 
+   revision 2022-08-19 {
+     description "Added SAFI value 85.";
+  }
+
+   revision 2022-04-13 {
+     description "Added SAFI values 83 and 84.";
+  }
+
+   revision 2022-02-11 {
+     description "Added SAFI value 80.";
+  }
+
    revision 2021-10-19 {
      description "Added Address Family Number value 16399.";
   }
@@ -564,6 +576,30 @@ module iana-routing-types {
           "BGP-DPS (Dynamic Path Selection) SAFI.";
       }
 
+      enum bgp-ls-spf-safi {
+        value 80;
+        description
+          "BGP-LS-SPF SAFI.";
+      }
+
+      enum bgp-car-safi {
+        value 83;
+        description
+          "BGP CAR SAFI.";
+      }
+
+      enum bgp-vpn-car-safi {
+        value 84;
+        description
+          "BGP VPN CAR SAFI.";
+      }
+
+      enum bgp-mup-safi {
+        value 85;
+        description
+          "BGP-MUP SAFI.";
+      }
+
       enum labeled-vpn-safi {
         value 128;
         description