Merge branch 'master' into afi-safi-send-community

openconfig · Jan 18, 2024 · bba2375 · bba2375
2 parents fff8e4a + aa1a546
commit bba2375
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 10 deletions.
diff --git a/release/models/aft/openconfig-aft-summary.yang b/release/models/aft/openconfig-aft-summary.yang
@@ -6,7 +6,6 @@ module openconfig-aft-summary {
   prefix "oc-aftsummary";
 
   import openconfig-extensions { prefix "oc-ext"; }
-  import openconfig-yang-types { prefix "oc-yang-types"; }
   import openconfig-policy-types { prefix "oc-pol-types"; }
   import openconfig-network-instance { prefix "oc-ni"; }
 
@@ -21,7 +20,13 @@ module openconfig-aft-summary {
     "This module provides summary of aft entry counts per protocol type for each network
     instance.";
 
-  oc-ext:openconfig-version "0.1.0";
+  oc-ext:openconfig-version "0.2.0";
+
+  revision "2024-01-12" {
+    description
+      "Change count of entries from counter64 to uint64.";
+    reference "0.2.0";
+  }
 
   revision "2023-11-09" {
     description
@@ -49,7 +54,7 @@ module openconfig-aft-summary {
       leaf aft-entries {
         description
           "Total number of entries in the aft.";
-        type oc-yang-types:counter64;
+        type uint64;
       }
     }
   }

diff --git a/release/models/optical-transport/openconfig-transport-types.yang b/release/models/optical-transport/openconfig-transport-types.yang
@@ -22,7 +22,16 @@ module openconfig-transport-types {
     "This module contains general type definitions and identities
     for optical transport models.";
 
-  oc-ext:openconfig-version "0.20.0";
+  oc-ext:openconfig-version "0.21.0";
+
+  revision "2024-01-16" {
+    description
+      "Added form factors QSFP28_DD and CSFP.
+       Added new PMDs: ETH_100GBASE_ER4L (MSA 100GBASE-ER4 Lite),
+       ETH_1GBASE_LX10.
+       Added References for 100GBASE-CR4 and 40GGBASE-CR4 for DACs";
+     reference "0.21.0";
+  }
 
   revision "2023-08-03" {
     description
@@ -831,6 +840,14 @@ module openconfig-transport-types {
       channels";
   }
 
+  identity QSFP28_DD {
+    base TRANSCEIVER_FORM_FACTOR_TYPE;
+    description
+      "QSFP-DD with electrical interfaces consisting of 8 lanes that operate at up to
+      25 Gbps with NRZ modulation";
+    reference "http://qsfp-dd.com";
+  }
+
   identity QSFP56 {
     base TRANSCEIVER_FORM_FACTOR_TYPE;
     description
@@ -884,6 +901,16 @@ module openconfig-transport-types {
       up to 16 Gb/s signals, including 10 GbE and OTU2";
   }
 
+  identity CSFP {
+    base TRANSCEIVER_FORM_FACTOR_TYPE;
+    description
+      "Compact Small form-factor pluggable transceiver. It is a version
+      of SFP with the same mechanical form factor allowing two independent
+      bidirectional channels per port.";
+  }
+
+
+
   identity SFP28 {
     base TRANSCEIVER_FORM_FACTOR_TYPE;
     description
@@ -989,6 +1016,12 @@ module openconfig-transport-types {
       "Ethernet compliance codes (PMD) supported by transceivers";
   }
 
+  identity ETH_1000BASE_LX10 {
+    base ETHERNET_PMD_TYPE;
+    description "Ethernet compliance code: ETH_1000BASE_LX10";
+    reference "802.3ah-2004(CL59)";
+  }
+
   identity ETH_10GBASE_LRM {
     base ETHERNET_PMD_TYPE;
     description "Ethernet compliance code: 10GBASE_LRM";
@@ -1016,7 +1049,10 @@ module openconfig-transport-types {
 
   identity ETH_40GBASE_CR4 {
     base ETHERNET_PMD_TYPE;
-    description "Ethernet compliance code: 40GBASE_CR4";
+    description "Ethernet compliance code: 40GBASE_CR4.
+    This PMD is used in Direct Attach Cables (DAC)
+    and Active Optical Cables (AOC)";
+    reference "IEEE 802.3ba 40GBASE-CR4";
   }
 
   identity ETH_40GBASE_SR4 {
@@ -1074,6 +1110,11 @@ module openconfig-transport-types {
     description "Ethernet compliance code: 100GBASE_LR4";
   }
 
+  identity ETH_100GBASE_ER4L {
+    base ETHERNET_PMD_TYPE;
+    description "Ethernet compliance code: 100GBASE_ER4L";
+  }
+
   identity ETH_100GBASE_ER4 {
     base ETHERNET_PMD_TYPE;
     description "Ethernet compliance code: 100GBASE_ER4";
@@ -1096,7 +1137,10 @@ module openconfig-transport-types {
 
   identity ETH_100GBASE_CR4 {
     base ETHERNET_PMD_TYPE;
-    description "Ethernet compliance code: 100GBASE_CR4";
+    description "Ethernet compliance code: 100GBASE_CR4.
+      This PMD is used in Direct Attach Cables (DAC)
+      and Active Optical Cables (AOC)";
+    reference "IEEE 802.3bj 100GBASE-CR4";
   }
 
   identity ETH_100GBASE_FR {

diff --git a/release/models/system/openconfig-system.yang b/release/models/system/openconfig-system.yang
@@ -47,7 +47,13 @@ module openconfig-system {
     Section 4.c of the IETF Trust's Legal Provisions Relating
     to IETF Documents (http://trustee.ietf.org/license-info).";
 
-  oc-ext:openconfig-version "0.17.1";
+  oc-ext:openconfig-version "1.0.0";
+
+revision "2023-10-26" {
+    description
+      "Add up-time leaf and promote module to version 1.0.";
+    reference "1.0.0";
+  }
 
   revision "2023-06-16" {
     description
@@ -371,6 +377,14 @@ module openconfig-system {
           "The current system date and time.";
     }
 
+    leaf up-time {
+        type oc-types:timeticks64;
+        units "nanoseconds";
+        description
+          "The amount of time since the network operating system was
+          initialized.";
+    }
+
     leaf boot-time {
         type oc-types:timeticks64;
         units "nanoseconds";

diff --git a/release/models/types/openconfig-inet-types.yang b/release/models/types/openconfig-inet-types.yang
@@ -31,7 +31,14 @@ module openconfig-inet-types {
     Section 4.c of the IETF Trust's Legal Provisions Relating
     to IETF Documents (http://trustee.ietf.org/license-info).";
 
-  oc-ext:openconfig-version "0.6.0";
+  oc-ext:openconfig-version "0.7.0";
+
+  revision "2024-01-05" {
+    description
+      "Change ipv6-address-zoned typedef to conform to W3C standard
+      regex pattern.";
+    reference "0.7.0";
+  }
 
   revision "2023-02-06" {
     description
@@ -198,7 +205,7 @@ module openconfig-inet-types {
         pattern
           // Must support compression through different lengths
           // therefore this regexp is complex.
-          '^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|'         +
+          '(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|'          +
           '([0-9a-fA-F]{1,4}:){1,7}:|'                        +
           '([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|'        +
           '([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|' +
@@ -207,7 +214,7 @@ module openconfig-inet-types {
           '([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|' +
           '[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|'      +
           ':((:[0-9a-fA-F]{1,4}){1,7}|:)'                     +
-          ')(%[a-zA-Z0-9_]+)$';
+          ')(%[a-zA-Z0-9_]+)';
         oc-ext:posix-pattern
           // Must support compression through different lengths
           // therefore this regexp is complex.