Refresh IETF client/server models

[netconf.git] / protocol / netconf-client / src / main / yang / ietf-netconf-client@2023-12-28.yang

diff --git a/protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-04-17.yang b/protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-12-28.yang
similarity index 87%
rename from protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-04-17.yang
rename to protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-12-28.yang
index 08027a281fa186dbd9bd8147d3c276afdcf95dd0..21e567ab91300a937502757a819a6eaedd8174b8 100644 (file)
--- a/protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-04-17.yang
+++ b/protocol/netconf-client/src/main/yang/ietf-netconf-client@2023-12-28.yang
@@ -66,7 +66,7 @@ module ietf-netconf-client {
      (RFC 8174) when, and only when, they appear in all
      capitals, as shown here.";
 
-  revision 2023-04-17 {
+  revision 2023-12-28 {
     description
       "Initial version";
     reference
@@ -139,7 +139,7 @@ module ietf-netconf-client {
   grouping netconf-client-initiate-stack-grouping {
     description
       "A reusable grouping for configuring a NETCONF client
-       'initiate' protocol stack for a single connection.";
+       'initiate' protocol stack for a single outbound connection.";
     choice transport {
       mandatory true;
       description
@@ -148,12 +148,12 @@ module ietf-netconf-client {
         if-feature "ssh-initiate";
         container ssh {
           description
-            "Specifies IP and SSH specific configuration
+            "Specifies TCP, SSH, and NETCONF configuration
              for the connection.";
           container tcp-client-parameters {
             description
-              "A wrapper around the TCP client parameters
-               to avoid name collisions.";
+              "TCP-level client parameters to initiate
+               a NETCONF over SSH connection.";
             uses tcpc:tcp-client-grouping {
               refine "remote-port" {
                 default "830";
@@ -167,18 +167,14 @@ module ietf-netconf-client {
           }
           container ssh-client-parameters {
             description
-              "A wrapper around the SSH client parameters to
-               avoid name collisions.";
+              "SSH-level client parameters to initiate
+               a NETCONF over SSH connection.";
             uses sshc:ssh-client-grouping;
           }
           container netconf-client-parameters {
             description
-              "A wrapper around the NETCONF client parameters
-               to avoid name collisions.
-
-               This container does not define any nodes.  It
-               exists as a potential augmentation target by
-               other modules.";
+              "NETCONF-level client parameters to initiate
+               a NETCONF over SSH connection.";
             uses ncc:netconf-client-grouping;
           }
         }
@@ -187,12 +183,12 @@ module ietf-netconf-client {
         if-feature "tls-initiate";
         container tls {
           description
-            "Specifies IP and TLS specific configuration
+            "Specifies TCP, TLS, and NETCONF configuration
              for the connection.";
           container tcp-client-parameters {
             description
-              "A wrapper around the TCP client parameters
-               to avoid name collisions.";
+              "TCP-level client parameters to initiate
+               a NETCONF over TLS connection.";
             uses tcpc:tcp-client-grouping {
               refine "remote-port" {
                 default "6513";
@@ -211,18 +207,14 @@ module ietf-netconf-client {
                  authentication credentials.";
             }
             description
-              "A wrapper around the TLS client parameters
-               to avoid name collisions.";
+              "TLS-level client parameters to initiate
+               a NETCONF over TLS connection.";
             uses tlsc:tls-client-grouping;
           }
           container netconf-client-parameters {
             description
-              "A wrapper around the NETCONF client parameters
-               to avoid name collisions.
-
-               This container does not define any nodes.  It
-               exists as a potential augmentation target by
-               other modules.";
+              "NETCONF-level client parameters to initiate
+               a NETCONF over TLS connection.";
             uses ncc:netconf-client-grouping;
           }
         }
@@ -233,7 +225,7 @@ module ietf-netconf-client {
   grouping netconf-client-listen-stack-grouping {
     description
       "A reusable grouping for configuring a NETCONF client
-       'listen' protocol stack for a single connection.  The
+       'listen' protocol stack for listening on a single port.  The
        'listen' stack supports call home connections, as
        described in RFC 8071";
     reference
@@ -246,12 +238,12 @@ module ietf-netconf-client {
         if-feature "ssh-listen";
         container ssh {
           description
-            "SSH-specific listening configuration for inbound
-             connections.";
+            "TCP, SSH, and NETCONF configuration to listen
+             for NETCONF over SSH Call Home connections.";
           container tcp-server-parameters {
             description
-              "A wrapper around the TCP server parameters
-               to avoid name collisions.";
+              "TCP-level server parameters to listen for
+               NETCONF over SSH Call Home connections.";
             uses tcps:tcp-server-grouping {
               refine "local-port" {
                 default "4334";
@@ -264,18 +256,14 @@ module ietf-netconf-client {
           }
           container ssh-client-parameters {
             description
-              "A wrapper around the SSH client parameters
-               to avoid name collisions.";
+              "SSH-level client parameters to listen for
+               NETCONF over SSH Call Home connections.";
             uses sshc:ssh-client-grouping;
           }
           container netconf-client-parameters {
             description
-              "A wrapper around the NETCONF client parameters
-               to avoid name collisions.
-
-               This container does not define any nodes.  It
-               exists as a potential augmentation target by
-               other modules.";
+              "NETCONF-level client parameters to listen for
+               NETCONF over SSH Call Home connections.";
             uses ncc:netconf-client-grouping;
           }
         }
@@ -284,12 +272,12 @@ module ietf-netconf-client {
         if-feature "tls-listen";
         container tls {
           description
-            "TLS-specific listening configuration for inbound
-             connections.";
+            "TCP, TLS, and NETCONF configuration to listen
+             for NETCONF over TLS Call Home connections.";
           container tcp-server-parameters {
             description
-              "A wrapper around the TCP server parameters
-               to avoid name collisions.";
+              "TCP-level server parameters to listen for
+               NETCONF over TLS Call Home connections.";
             uses tcps:tcp-server-grouping {
               refine "local-port" {
                 default "4335";
@@ -307,18 +295,14 @@ module ietf-netconf-client {
                  authentication credentials.";
             }
             description
-              "A wrapper around the TLS client parameters
-               to avoid name collisions.";
+              "TLS-level client parameters to listen for
+               NETCONF over TLS Call Home connections.";
             uses tlsc:tls-client-grouping;
           }
           container netconf-client-parameters {
             description
-              "A wrapper around the NETCONF client parameters
-               to avoid name collisions.
-
-               This container does not define any nodes.  It
-               exists as a potential augmentation target by
-               other modules.";
+              "NETCONF-level client parameters to listen for
+               NETCONF over TLS Call Home connections.";
             uses ncc:netconf-client-grouping;
           }
         }
@@ -544,18 +528,22 @@ module ietf-netconf-client {
            number of seconds.  If set to zero, then the server
            will never drop a session because it is idle.";
       }
-      list endpoint {
-        key "name";
-        min-elements 1;
+      container endpoints {
         description
-          "List of endpoints to listen for NETCONF connections.";
-        leaf name {
-          type string;
+          "Container for a list of endpoints.";
+        list endpoint {
+          key "name";
+          min-elements 1;
           description
-            "An arbitrary name for the NETCONF listen endpoint.";
+            "List of endpoints to listen for NETCONF connections.";
+          leaf name {
+            type string;
+            description
+              "An arbitrary name for the NETCONF listen endpoint.";
+          }
+          uses netconf-client-listen-stack-grouping;
         }
-        uses netconf-client-listen-stack-grouping;
-      } // endpoint
+      }
     } // listen
   } // netconf-client-app-grouping