From 0188158a766cb019f881debde84e73aa1363170a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 2 Feb 2011 14:16:27 -0500 Subject: Use correct LDAP attributes for city and state. Also add a unit test for address. Ticket 889 --- API.txt | 12 +++++----- ipalib/plugins/user.py | 14 +++++++---- tests/test_xmlrpc/test_user_plugin.py | 45 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/API.txt b/API.txt index 992ba990..22578e99 100644 --- a/API.txt +++ b/API.txt @@ -2491,8 +2491,8 @@ option: Password('userpassword', attribute=True, cli_name='password', exclude='w option: Int('uidnumber', attribute=True, autofill=True, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False) option: Int('gidnumber', attribute=True, cli_name='gidnumber', default_from=DefaultFrom(, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('street', attribute=True, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('location', attribute=True, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('state', attribute=True, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('locality', attribute=True, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('st', attribute=True, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, required=False) option: Int('postalcode', attribute=True, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('telephonenumber', attribute=True, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('mobile', attribute=True, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) @@ -2547,8 +2547,8 @@ option: Password('userpassword', attribute=True, autofill=False, cli_name='passw option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, query=True, required=False) option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', default_from=DefaultFrom(, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, query=True, required=False) -option: Str('location', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, query=True, required=False) -option: Str('state', attribute=True, autofill=False, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, query=True, required=False) +option: Str('locality', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, query=True, required=False) +option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Int('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False) option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False) @@ -2590,8 +2590,8 @@ option: Password('userpassword', attribute=True, autofill=False, cli_name='passw option: Int('uidnumber', attribute=True, autofill=False, cli_name='uid', default=999, label=Gettext('UID', domain='ipa', localedir=None), minvalue=1, multivalue=False, required=False) option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', default_from=DefaultFrom(, 'uid'), label=Gettext('GID', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('location', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('state', attribute=True, autofill=False, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('locality', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State', domain='ipa', localedir=None), multivalue=False, required=False) option: Int('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 749a9adc..12e17131 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -170,11 +170,12 @@ class user(LDAPObject): cli_name='street', label=_('Street address'), ), - Str('location?', + Str('locality?', cli_name='city', label=_('City'), ), - Str('state?', + Str('st?', + cli_name='state', label=_('State'), ), Int('postalcode?', @@ -182,11 +183,14 @@ class user(LDAPObject): ), Str('telephonenumber*', cli_name='phone', - label=_('Telephone Number') ), + label=_('Telephone Number') + ), Str('mobile*', - label=_('Mobile Telephone Number') ), + label=_('Mobile Telephone Number') + ), Str('pager*', - label=_('Pager Number') ), + label=_('Pager Number') + ), Str('facsimiletelephonenumber*', cli_name='fax', label=_('Fax Number'), diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index 73d170af..ad5d2142 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -506,4 +506,49 @@ class test_user(Declarative): ), + dict( + desc='Create %r with a full address' % user1, + command=( + 'user_add', [user1], dict(givenname=u'Test', sn=u'User1', + street='123 Maple Rd', locality='Anytown', st='MD', + telephonenumber='410-555-1212',) + ), + expected=dict( + value=user1, + summary=u'Added user "tuser1"', + result=dict( + gecos=[user1], + givenname=[u'Test'], + homedirectory=[u'/home/tuser1'], + krbprincipalname=[u'tuser1@' + api.env.realm], + loginshell=[u'/bin/sh'], + objectclass=objectclasses.user, + sn=[u'User1'], + uid=[user1], + uidnumber=[fuzzy_digits], + displayname=[u'Test User1'], + cn=[u'Test User1'], + initials=[u'TU'], + street=[u'123 Maple Rd'], + locality=[u'Anytown'], + st=[u'MD'], + telephonenumber=[u'410-555-1212'], + ipauniqueid=[fuzzy_uuid], + dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn, + ), + ), + ), + + + dict( + desc='Delete %r' % user1, + command=('user_del', [user1], {}), + expected=dict( + result=dict(failed=u''), + summary=u'Deleted user "tuser1"', + value=user1, + ), + ), + + ] -- cgit