Merge branch 'master' into ptp_0501

openconfig · Sep 17, 2024 · 7ec631e · 7ec631e
2 parents c9dae3f + 9b0a82e
commit 7ec631e
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 8 deletions.
diff --git a/release/models/gnsi/openconfig-gnsi-credentialz.yang b/release/models/gnsi/openconfig-gnsi-credentialz.yang
@@ -39,7 +39,13 @@ module openconfig-gnsi-credentialz {
       /system/aaa/authentication/users/user/config/password-hashed
       /system/aaa/authentication/users/user/state/password-hashed";
 
-  oc-ext:openconfig-version "0.6.0";
+  oc-ext:openconfig-version "0.7.0";
+
+  revision 2024-09-10 {
+    description
+      "Adding GLOME capabilities.";
+    reference "0.7.0";
+  }
 
   revision 2024-02-13 {
     description
@@ -142,6 +148,26 @@ module openconfig-gnsi-credentialz {
     }
   }
 
+  // GLOME related definitions.
+
+  grouping glome-key-version {
+    description
+      "Version identifier for the configured GLOME key.";
+
+    leaf active-glome-key-version {
+      type version;
+      description
+        "The version of the GLOME key.";
+    }
+
+    leaf active-glome-key-created-on {
+      type created-on;
+      description
+        "The timestamp of the moment when the GLOME key
+        was created.";
+    }
+  }
+
   // Success/failure counters.
   grouping counters {
     description
@@ -232,9 +258,16 @@ module openconfig-gnsi-credentialz {
           "Console-related state.";
 
         uses counters;
+
+        leaf enabled {
+          type boolean;
+          description
+            "Whether GLOME is enabled or not.";
+        }
       }
     }
   }
+
   // System role console related definitions.
 
   grouping user-console-credentials-version {

diff --git a/release/models/lacp/openconfig-lacp.yang b/release/models/lacp/openconfig-lacp.yang
@@ -26,7 +26,13 @@ module openconfig-lacp {
     managing aggregate interfaces.   It works in conjunction with
     the OpenConfig interfaces and aggregate interfaces models.";
 
-  oc-ext:openconfig-version "2.0.0";
+  oc-ext:openconfig-version "2.1.0";
+
+  revision "2024-09-24" {
+    description
+      "Add LACP fallback leaf under both config and state.";
+    reference "2.1.0";
+  }
 
   revision "2023-12-11" {
     description
@@ -407,6 +413,15 @@ grouping aggregation-lacp-members-statistics {
         system-id";
     }
 
+    leaf fallback {
+      type boolean;
+      description
+        "If the fallback is set to true, current LACP interface is
+        able to establish a Link Aggregation (LAG) before it receives
+        LACP PDUs from its peer, and fallback to a single port active
+        after the expiry of the timeout period.";
+    }
+
     uses aggregation-lacp-global-config;
   }
 

diff --git a/release/models/platform/openconfig-platform-common.yang b/release/models/platform/openconfig-platform-common.yang
@@ -20,7 +20,19 @@ submodule openconfig-platform-common {
     "This modules contains common groupings that are used in multiple
     components within the platform module.";
 
-  oc-ext:openconfig-version "0.27.0";
+  oc-ext:openconfig-version "0.29.0";
+
+  revision "2024-10-13" {
+    description
+      "Deprecate component id leaf";
+    reference "0.29.0";
+  }
+
+  revision "2024-08-08" {
+    description
+      "Update description of model-name leaf.";
+    reference "0.28.0";
+  }
 
   revision "2024-05-29" {
     description

diff --git a/release/models/platform/openconfig-platform.yang b/release/models/platform/openconfig-platform.yang
@@ -65,7 +65,19 @@ module openconfig-platform {
     (presence or absence of a component) and state (physical
     attributes or status).";
 
-  oc-ext:openconfig-version "0.27.0";
+  oc-ext:openconfig-version "0.29.0";
+
+  revision "2024-10-13" {
+    description
+      "Deprecate component id leaf";
+    reference "0.29.0";
+  }
+
+  revision "2024-08-08" {
+    description
+      "Update description of model-name leaf.";
+    reference "0.28.0";
+  }
 
   revision "2024-05-29" {
     description
@@ -417,6 +429,7 @@ module openconfig-platform {
 
     leaf id {
       type string;
+      status deprecated;
       description
         "Unique identifier assigned by the system for the
         component";
@@ -540,11 +553,13 @@ module openconfig-platform {
     }
 
     leaf model-name {
+      when "../removable = 'true' or ../type = 'oc-platform-types:CHASSIS'";
+      mandatory true;
       type string;
       description
-        "A human readable string describing the model of a component.
-        This string is optional and should only be populated if part-no
-        is also populated.";
+        "Model name that would be found in a catalog of stock keeping
+        units (SKU) and should be the orderable name of the
+        component.";
     }
 
     leaf clei-code {

diff --git a/release/models/system/openconfig-system-logging.yang b/release/models/system/openconfig-system-logging.yang
@@ -23,7 +23,13 @@ module openconfig-system-logging {
     "This module defines configuration and operational state data
     for common logging facilities on network systems.";
 
-  oc-ext:openconfig-version "0.6.0";
+  oc-ext:openconfig-version "0.7.0";
+
+revision "2024-08-20" {
+    description
+      "Adding tls support for syslog.";
+    reference "0.7.0";
+  }
 
 revision "2023-07-20" {
     description
@@ -429,6 +435,22 @@ revision "2023-07-20" {
         "Sets the destination port number for syslog UDP messages to
         the server.  The default for syslog is 514.";
     }
+
+    leaf transport-security {
+      type boolean;
+      description
+      "Indicates if syslog transport layer security (TLS) is enabled.";
+    }
+
+    leaf tls-profile-id {
+      type string;
+      description
+        "The ID of this syslog client's TLS profile.  TLS profiles are managed
+        using the gNSI Certz service or other certificate management service
+        provided by the system.";
+      reference
+        "https://github.com/openconfig/gnsi/tree/main/certz";
+    }
   }
 
   grouping logging-remote-state {