Address review comments

openconfig · Jun 13, 2024 · c6be8a0 · c6be8a0
1 parent 246ccad
commit c6be8a0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 34 deletions.
diff --git a/release/models/ospf/openconfig-ospf-types.yang b/release/models/ospf/openconfig-ospf-types.yang
@@ -104,45 +104,45 @@ module openconfig-ospf-types {
   }
 
   // identities
-  identity MESSAGE_DIGEST_ENCRYPTION {
+  identity MESSAGE_DIGEST_ALGO {
     description
-      "Base identity to define Message Digest encryption type.";
+      "Base identity to define Message Digest hash algorithm type.";
   }
 
-  identity ENCRYPTION_NONE {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_NONE {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "No encrytion type.";
+      "No algorithm defined.";
   }
 
-  identity ENCRYPTION_MD5 {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_MD5 {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "MD5 message digest encryption type.";
+      "MD5 hash algorithm to be used to generate message digest.";
   }
 
-  identity ENCRYPTION_SHA1 {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_SHA1 {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "SHA1 message digest encryption type.";
+      "SHA1 hash algorithm to be used to generate message digest.";
   }
 
-  identity ENCRYPTION_SHA256 {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_SHA256 {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "SHA256 message digest encryption type.";
+      "SHA256 hash algorithm to be used to generate message digest.";
   }
 
-  identity ENCRYPTION_SHA384 {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_SHA384 {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "SHA384 message digest encryption type.";
+      "SHA384 hash algorithm to be used to generate message digest.";
   }
 
-  identity ENCRYPTION_SHA512 {
-    base MESSAGE_DIGEST_ENCRYPTION;
+  identity MESSAGE_DIGEST_SHA512 {
+    base MESSAGE_DIGEST_ALGO;
     description
-      "SHA512 message digest encryption type.";
+      "SHA512 hash algorithm to be used to generate message digest.";
   }
 
   identity AUTH_MODE {
@@ -167,7 +167,7 @@ module openconfig-ospf-types {
     base AUTH_MODE;
     description
       "Authentication mode message digest.";
-    reference "RFC5709";
+    reference "RFC2328,RFC5709";
   }
 
   identity OSPF_LSA_TYPE {

diff --git a/release/models/ospf/openconfig-ospfv2-area-interface.yang b/release/models/ospf/openconfig-ospfv2-area-interface.yang
@@ -249,7 +249,8 @@ submodule openconfig-ospfv2-area-interface {
     leaf simple-password {
       type string;
       description
-        "Password for simple authentication mode to be specified for OSPF.";
+        "Password for simple authentication mode to be specified for OSPF
+        authentication.";
     }
   }
 
@@ -258,27 +259,29 @@ submodule openconfig-ospfv2-area-interface {
       "Configuration parameters relating to OSPF message-digest
       authentication";
 
-    leaf md-key-id {
+    leaf key-id {
       type uint8 {
         range "1..255";
       }
       description
-        "Message-digest keyid to be used for OSPF message digest auth.";
+        "Message-digest keyid to identify auth key and auth algo for
+        OSPF authentication.";
     }
 
-    leaf md-encryption {
+    leaf auth-algo {
       type identityref {
-        base oc-ospf-types:MESSAGE_DIGEST_ENCRYPTION;
+        base oc-ospf-types:MESSAGE_DIGEST_ALGO;
       }
       description
-        "Encryption type to be used for OSPF message digest auth.";
+        "Hash algorithm to be used generate/verify message digest
+        for OSPF authentication.";
     }
 
-    leaf md-password {
+    leaf auth-key {
       type string;
       description
-        "Password to be used for message digest authentication mode
-        for OSPF.";
+        "Password to be used to generate/verify message digest
+        for OSPF authentication.";
     }
   }
 
@@ -518,15 +521,14 @@ submodule openconfig-ospfv2-area-interface {
               can be configured on the interface";
 
             list message-digest {
-              key "md-key-id";
-              max-elements 2;
+              key "key-id";
 
               description
                 "A message-digest key to be used for OSPFv2 authentication";
 
-              leaf md-key-id {
+              leaf key-id {
                 type leafref {
-                  path "../config/md-key-id";
+                  path "../config/key-id";
                 }
                 description
                   "Message-digest authentication key identifier";