Merge branch 'master' into lacp_test

openconfig · Sep 13, 2024 · f6c2b6d · f6c2b6d
2 parents 4442419 + 27eabe3
commit f6c2b6d
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 7 deletions.
diff --git a/release/models/platform/openconfig-platform-common.yang b/release/models/platform/openconfig-platform-common.yang
@@ -20,7 +20,13 @@ 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.28.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,13 @@ 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.28.0";
+
+  revision "2024-08-08" {
+    description
+      "Update description of model-name leaf.";
+    reference "0.28.0";
+  }
 
   revision "2024-05-29" {
     description
@@ -540,11 +546,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 {

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 "2.1.0";
+  oc-ext:openconfig-version "2.2.0";
+
+  revision "2024-08-13" {
+    description
+      "Added additional auth key types";
+    reference "2.2.0";
+  }
 
   revision "2024-07-15" {
     description
@@ -233,6 +239,42 @@ module openconfig-system {
       "MD5 encryption method";
   }
 
+  identity NTP_AUTH_SHA1 {
+    base NTP_AUTH_TYPE;
+    description
+      "SHA1 encryption method";
+  }
+
+  identity NTP_AUTH_SHA256 {
+    base NTP_AUTH_TYPE;
+    description
+      "SHA256 encryption method";
+  }
+
+  identity NTP_AUTH_SHA384 {
+    base NTP_AUTH_TYPE;
+    description
+      "SHA384 encryption method";
+  }
+
+  identity NTP_AUTH_SHA512 {
+    base NTP_AUTH_TYPE;
+    description
+      "SHA512 encryption method";
+  }
+
+  identity NTP_AUTH_AES_CBC_128 {
+    base NTP_AUTH_TYPE;
+    description
+      "AES-CBC-128 encryption method";
+  }
+
+  identity NTP_AUTH_AES_CBC_256 {
+    base NTP_AUTH_TYPE;
+    description
+      "AES-CBC-256 encryption method";
+  }
+
   // typedef statements
 
   typedef timezone-name-type {