Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml	(revision 38452)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/doc/en/admintools.xml	(working copy)
@@ -5730,6 +5730,10 @@
                             <verbose_name>TAC_X</verbose_name>
                             <help_text>Uses the TACACAS server for external authentication.</help_text>
                         </choice>
+                        <choice value="ldap">
+                            <verbose_name>LDAP</verbose_name>
+                            <help_text>Uses the LDAP server for external authentication.</help_text>
+                        </choice>
                         <choice value="ldaps">
                             <verbose_name>LDAPS</verbose_name>
                             <help_text>Uses the LDAPS server for external authentication.</help_text>
@@ -5761,6 +5765,10 @@
                             <verbose_name>es02 (TACACS)</verbose_name>
                             <help_text/>
                         </choice>
+                        <choice value="es03">
+                            <verbose_name>es03 (LDAP)</verbose_name>
+                            <help_text/>
+                        </choice>
                         <choice value="es04">
                             <verbose_name>es04 (LDAPS)</verbose_name>
                             <help_text/>
@@ -5781,14 +5789,13 @@
                 </field>
                 <field name="distinguished_name" type="string">
                     <verbose_name>Distinguished Name</verbose_name>
-                    <help_text>Example: OU=Development,DC=ARRAY,DC=NET</help_text>
+                    <help_text>Example: OU=Development,DC=EXAMPLE,DC=COM</help_text>
                 </field>
                 <field name="member_of" type="string">
                     <verbose_name>Member Of</verbose_name>
-                    <help_text>Example: CN=Engineering,OU=Development,DC=ARRAY,DC=NET</help_text>
+                    <help_text>Example: CN=Engineering,OU=Development,DC=EXAMPLE,DC=COM</help_text>
                 </field>
             </fieldgrp>
         </model>
     </package>
 </package>
-
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/user/__init__.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/user/__init__.py	(revision 38452)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/admintools/user/__init__.py	(working copy)
@@ -562,6 +562,7 @@
     method = EnumField(verbose_name = _('Method'),default='radius',optional=True,values=(
                     ('radius','RADIUS'),
                     ('tac_x','TAC_X'),
+                    ('ldap','LDAP'),
                     ('ldaps','LDAPS'),
                     ))
     admin_aaa_server = AssoField2(verbose_name='Admin AAA Server', tgt='admintools.user.AdminAAAServer.asso', mul='1', pos='left', optional=True)
@@ -646,7 +647,7 @@
             result = self.cli.cmd('show admin aaa all',
                                    RegexParser('admin aaa (?P<enable_aaa>on|off)', MATCHONE, reflags=re.S),
                                    RegexParser('admin aaa on (?P<priority>0|1)', MATCHONE, reflags=re.S),
-                                   RegexParser('admin aaa method (?P<method>RADIUS|TAC_X|LDAPS)', MATCHONE, reflags=re.S),
+                                   RegexParser('admin aaa method (?P<method>RADIUS|TAC_X|LDAPS|LDAP)', MATCHONE, reflags=re.S),
                                    RegexParser('admin aaa authorize (?P<enable_aaa_authorize>on|off)', MATCHONE, reflags=re.S),
                                    RegexParser('admin aaa server es04 verifycert (?P<enable_certificate_verification>0|1)', MATCHONE, reflags=re.S))
             rtn_dict = {
@@ -750,13 +751,14 @@
     server_id = EnumField(verbose_name = _('Server ID'), default='es01', values=(
                     ('es01','es01'),
                     ('es02','es02'),
+                    ('es03','es03'),
                     ('es04', 'es04'),
                     ), primary_key=True)
     host_name = CharField(verbose_name=_('Host Name'))
     aaa_port = PortField(verbose_name=_('Port'))
     secret = CharField(verbose_name=_('Secret'), default='', condition=ValueCondition('server_id', ['es01', 'es02']))
-    distinguished_name = CharField(verbose_name=_('Domain'), default='', condition=ValueCondition('server_id', ['es04']))
-    member_of = CharField(verbose_name=_('MemberOf'), default='', condition=ValueCondition('server_id', ['es04']))
+    distinguished_name = CharField(verbose_name=_('Domain'), default='', condition=ValueCondition('server_id', ['es03', 'es04']))
+    member_of = CharField(verbose_name=_('MemberOf'), default='', condition=ValueCondition('server_id', ['es03', 'es04']))
 
     class Meta:
         verbose_name = _('Admin AAA Server')
@@ -767,6 +769,7 @@
             self.cli.set_enable()
             regex_parser = [
                 RegexParser('admin aaa server (?P<server_id>es01|es02) "(?P<host_name>.*?)" (?P<aaa_port>[0-9]+) "(?P<secret>.*?)"', MATCHALL, reflags=re.S),
+                RegexParser('admin aaa server (?P<server_id>es03) "(?P<host_name>.*?)" (?P<aaa_port>[0-9]+) "(?P<distinguished_name>.*?)" "(?P<member_of>.*?)"',MATCHALL, reflags=re.S),
                 RegexParser('admin aaa server (?P<server_id>es04) settings "(?P<host_name>.*?)" (?P<aaa_port>[0-9]+) "(?P<distinguished_name>.*?)" "(?P<member_of>.*?)"',MATCHALL, reflags=re.S)
             ]
             result = self.cli.cmd('show admin aaa all', regex_parser)
@@ -795,6 +798,8 @@
             cli_cmd = ''
             if 'server_id' in data and (data['server_id'] == 'es01' or data['server_id'] == 'es02'):
                 cli_cmd = 'admin aaa server %(server_id)s "%(host_name)s" %(aaa_port)u "%(secret)s"' % data
+            if 'server_id' in data and data['server_id'] == 'es03':
+                cli_cmd = 'admin aaa server %(server_id)s "%(host_name)s" %(aaa_port)u "%(distinguished_name)s" "%(member_of)s"' % data
             if 'server_id' in data and data['server_id'] == 'es04':
                 cli_cmd = 'admin aaa server %(server_id)s settings "%(host_name)s" %(aaa_port)u "%(distinguished_name)s" "%(member_of)s"' % data
             result = self.cli.cmd(cli_cmd, BlankParser(nonblank_exception=CLICmdError, supplement=True))