From 055fc8f3a1f9cd1b2d312d1cc7d12184defee908 Mon Sep 17 00:00:00 2001
From: Brian Neville <29639579+brianneville@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:09:49 +0000
Subject: [PATCH] gnsi: align with latest certz version

The certz yang file was updated since
the PR to move from openconfig/gnsi to
openconfig/public, and this updated
version of certz had not been
included in the PR.

see the changes to gnsi-certz.yang at:
https://github.com/openconfig/gnsi/pull/156

This commit also sets the container
name for the certz counters to be just
"counters" to be backward-compatible
with the existing gnsi-certz.yang.

The module name/prefix already
mark these counters as certz-related,
so we don't need to duplicate this
information in the container name too.
---
 .../models/gnsi/openconfig-gnsi-certz.yang    | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/release/models/gnsi/openconfig-gnsi-certz.yang b/release/models/gnsi/openconfig-gnsi-certz.yang
index 9b5e9a1ca..33016f316 100644
--- a/release/models/gnsi/openconfig-gnsi-certz.yang
+++ b/release/models/gnsi/openconfig-gnsi-certz.yang
@@ -32,6 +32,14 @@ module openconfig-gnsi-certz {
 
   oc-ext:openconfig-version "0.5.0";
 
+  revision 2024-03- {
+    description
+      "align yang with the openconfig/gnsi version as of:
+      https://github.com/openconfig/gnsi/tree/e08ebfe537e1603015291898e6d5e9abe1562a0b
+      (update counter names)";
+    reference "0.6.0";
+  }
+
   revision 2024-02-13 {
     description
       "Major style updates and move to openconfig/public from openconfig/gnsi.
@@ -87,36 +95,36 @@ module openconfig-gnsi-certz {
       "A collection of counters that were collected while evaluating
       access to the gRPC server.";
 
-    container certz-counters {
+    container counters {
       config false;
       description
-        "A collection of counters that were collected by the gRPC during
-        the authentication process.";
+      "A collection of counters that were collected by the gRPC during
+      the authentication process.";
 
-      leaf access-rejects {
+      leaf connection-rejects {
         type oc-yang:counter64;
         description
-          "The total number of times a TLS handshake failure has occurred and
-          the gRPC server denied access a client.";
+        "The total number of times that gRPC clients have failed
+        in establishing a connection to the server.";
       }
-      leaf last-access-reject {
+      leaf last-connection-reject {
         type oc-types:timeticks64;
         description
-          "A timestamp of the last time the gRPC denied access to
-          the server.";
+        "A timestamp of the last time a gRPC client failed
+        in establishing a connection to the server.";
       }
-      leaf access-accepts {
+      leaf connection-accepts {
         type oc-yang:counter64;
         description
-          "The total number of times a successful TLS handshake is completed
-          and the gPRC server allows access to a client.";
+        "The total number of times that gRPC clients have succeeded
+        in establishing a connection to the server.";
       }
-      leaf last-access-accept {
+      leaf last-connection-accept {
         type oc-types:timeticks64;
         description
-          "A timestamp of the last time the gRPC allowed access to
-          the server.";
-      }
+        "A timestamp of the last time a gRPC client succeeded
+        in establishing a connection to the server.";
+        }
     }
   }