Obsolete non-transport ssh-host-key

[netconf.git] / netconf / callhome-model / src / main / yang / odl-netconf-callhome-server.yang

diff --git a/netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang b/netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang
index dab83dd79e1129757eaf542f989bbb4a5a2c202f..74989cf6b7d6ceaaa8ca71a74b347824283f06b6 100644 (file)
--- a/netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang
+++ b/netconf/callhome-model/src/main/yang/odl-netconf-callhome-server.yang
@@ -12,6 +12,14 @@ module odl-netconf-callhome-server {
   description
    "This module defines the northbound interface for OpenDaylight NETCONF Callhome.";
 
+  revision 2024-01-29 {
+    description
+      "A number of improvements to the sematics of this model. In concrete terms:
+       - every device now has to have a transport
+       - previously-deprecated 'ssh-host-key' is now obsolete
+       - 'credentials; is obsoleted as well";
+  }
+
   revision 2023-04-28 {
     description "This revision integrates device-status leaf, formerly hosted in callhome-device.yang";
   }
@@ -57,8 +65,8 @@ module odl-netconf-callhome-server {
 
       leaf mount-point-naming-strategy {
         type enumeration {
-            enum IP_PORT;
-            enum IP_ONLY;
+          enum IP_PORT;
+          enum IP_ONLY;
         }
         default IP_PORT;
         description "Mount name will be chosen as per this strategy in the absence of per device settings. Default is IP_PORT";
@@ -73,17 +81,11 @@ module odl-netconf-callhome-server {
           description "Identifier of device, which will be used to identify device.";
           type string;
         }
-        leaf ssh-host-key {
-          description "BASE-64 encoded public key which device will use during connection.
-                       Deprecated, a 'host-key' from the  'ssh-client-params' containers should be used instead.";
-          status deprecated;
-          type string;
-        }
-        unique ssh-host-key;
-        uses credentials;
 
         choice transport {
           description "Provides connectivity details for one of the supported transport protocols";
+          mandatory true;
+
           case ssh {
             container ssh-client-params {
               leaf host-key {
@@ -123,6 +125,16 @@ module odl-netconf-callhome-server {
           }
           default DISCONNECTED;
         }
+
+        leaf ssh-host-key {
+          description "Obsolete, a 'host-key' from the 'ssh-client-params' containers should be used instead.";
+          status obsolete;
+          type string;
+        }
+        unique ssh-host-key;
+        uses credentials {
+          status obsolete;
+        }
       }
     }
   }