ldap: Fix yang model according the nslcd naming and functionalities t…

…hat supported and tested. (more feature can be added in the future if required)
sonic-net · Oct 22, 2023 · e15f32a · e15f32a
1 parent 25d4cda
commit e15f32a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 62 deletions.
diff --git a/doc/aaa/ldap/hld_ldap.md b/doc/aaa/ldap/hld_ldap.md
@@ -114,14 +114,10 @@ LDAP_TABLE:{
 		"bind_dn": {{ (emtpy) }}
 		"bind_password": {{ empty with starts **** }}
 		"bind_timeout": {{ (5 (duration_sec)) }}
-		"group_base_dn": {{ ou=users,dc=example,dc=com}}
-		"group_member_attribute": {{member}}
-		" hostname_check ": {{False}}
-		" ldap_version": {{3}}
-		" user_base_dn": {{ou=users,dc=example,dc=com (string)}}
-		" ldap_port": {{389}}
-		" referrals": {{enabled}}
-		" timeout": {{5 (duration_sec)}}
+		"ldap_version": {{3}}
+		"base_dn": {{ou=users,dc=example,dc=com (string)}}
+		"port": {{389}}
+		"timeout": {{5 (duration_sec)}}
 		}
 	}
 }
@@ -211,6 +207,7 @@ module sonic-system-ldap {
                     }
                     description "Server priority";
                 }
+            }
         }
 
         container LDAP {
@@ -246,26 +243,6 @@ module sonic-system-ldap {
                     description "Ldap bind timeout";
                 }
 
-                leaf group_base_dn {
-                    type string {
-                        length "1..65";
-                    }
-                    description "Ldap group base dn";
-                }
-
-                leaf group_member_attribute {
-                    type string {
-                        length "1..65";
-                    }
-                    description "Ldap group member attribute";
-                }
-
-                leaf hostname_check {
-                    description "Ldap server hostname check";
-                    default false;
-                    type boolean;
-                }
-
                 leaf ldap_version {
                     default 3;
                     type uint16 {
@@ -276,7 +253,7 @@ module sonic-system-ldap {
                     description "Ldap version";
                 }
 
-                leaf user_base_dn {
+                leaf base_dn {
                     type string {
                         length "1..65";
                     }
@@ -289,12 +266,6 @@ module sonic-system-ldap {
                     description "TCP port to communite with LDAP server";
                 }
 
-                leaf referrals {
-                    description "Should Ldap referrals be enabled/disabled";
-                    default true;
-                    type boolean;
-                }
-
                 leaf timeout {
                     description "Ldap timeout duration in sec";
                     type uint16 {

diff --git a/doc/aaa/ldap/sonic-system-ldap.yang b/doc/aaa/ldap/sonic-system-ldap.yang
@@ -55,6 +55,7 @@ module sonic-system-ldap {
                     }
                     description "Server priority";
                 }
+            }
         }
 
         container LDAP {
@@ -90,26 +91,6 @@ module sonic-system-ldap {
                     description "Ldap bind timeout";
                 }
 
-                leaf group_base_dn {
-                    type string {
-                        length "1..65";
-                    }
-                    description "Ldap group base dn";
-                }
-
-                leaf group_member_attribute {
-                    type string {
-                        length "1..65";
-                    }
-                    description "Ldap group member attribute";
-                }
-
-                leaf hostname_check {
-                    description "Ldap server hostname check";
-                    default false;
-                    type boolean;
-                }
-
                 leaf ldap_version {
                     default 3;
                     type uint16 {
@@ -120,7 +101,7 @@ module sonic-system-ldap {
                     description "Ldap version";
                 }
 
-                leaf user_base_dn {
+                leaf base_dn {
                     type string {
                         length "1..65";
                     }
@@ -133,12 +114,6 @@ module sonic-system-ldap {
                     description "TCP port to communite with LDAP server";
                 }
 
-                leaf referrals {
-                    description "Should Ldap referrals be enabled/disabled";
-                    default true;
-                    type boolean;
-                }
-
                 leaf timeout {
                     description "Ldap timeout duration in sec";
                     type uint16 {