Add UID, GID and e-mail to the user default attributes.

ticket https://fedorahosted.org/freeipa/ticket/1265

7 files changed, 58 insertions, 2 deletions

diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py
index 5ca1f47b5..198251fcd 100644
--- a/tests/test_xmlrpc/test_attr.py
+++ b/tests/test_xmlrpc/test_attr.py
@@ -56,6 +56,7 @@ class test_attr(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -78,6 +79,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     mail=[u'test@example.com'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -100,6 +103,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -122,6 +127,9 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
+                    mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'410-555-1212', u'301-555-1212'],
                     nsaccountlock=[u'False'],
@@ -144,6 +152,9 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
+                    mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212'],
                     nsaccountlock=[u'False'],
@@ -166,6 +177,9 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
+                    mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
                     nsaccountlock=[u'False'],
@@ -206,6 +220,9 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
+                    mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
                     nsaccountlock=[u'False'],
@@ -228,6 +245,9 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
+                    mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
                     nsaccountlock=[u'False'],
diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py
index 8d61a5bdf..97349e895 100644
--- a/tests/test_xmlrpc/test_group_plugin.py
+++ b/tests/test_xmlrpc/test_group_plugin.py
@@ -585,6 +585,7 @@ class test_group(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -694,6 +695,7 @@ class test_group(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
diff --git a/tests/test_xmlrpc/test_krbtpolicy.py b/tests/test_xmlrpc/test_krbtpolicy.py
index 9005f346a..bbfadb3f6 100644
--- a/tests/test_xmlrpc/test_krbtpolicy.py
+++ b/tests/test_xmlrpc/test_krbtpolicy.py
@@ -101,6 +101,7 @@ class test_krbtpolicy(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
diff --git a/tests/test_xmlrpc/test_nesting.py b/tests/test_xmlrpc/test_nesting.py
index d28535015..a7e6cb8d1 100644
--- a/tests/test_xmlrpc/test_nesting.py
+++ b/tests/test_xmlrpc/test_nesting.py
@@ -39,7 +39,7 @@ fqdn1 = u'testhost1.%s' % api.env.domain
 host_dn1 = u'fqdn=%s,cn=computers,cn=accounts,%s' % (fqdn1, api.env.basedn)
 
 
-class test_group(Declarative):
+class test_nesting(Declarative):
     cleanup_commands = [
         ('group_del', [group1], {}),
         ('group_del', [group2], {}),
@@ -136,6 +136,7 @@ class test_group(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -164,6 +165,7 @@ class test_group(Declarative):
                     sn=[u'User2'],
                     uid=[user2],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User2'],
                     cn=[u'Test User2'],
                     initials=[u'TU'],
diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py
index 35cc17dff..47256e486 100644
--- a/tests/test_xmlrpc/test_netgroup_plugin.py
+++ b/tests/test_xmlrpc/test_netgroup_plugin.py
@@ -207,6 +207,7 @@ class test_netgroup(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -234,6 +235,7 @@ class test_netgroup(Declarative):
                     sn=[u'User2'],
                     uid=[user2],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User2'],
                     cn=[u'Test User2'],
                     initials=[u'TU'],
diff --git a/tests/test_xmlrpc/test_replace.py b/tests/test_xmlrpc/test_replace.py
index 9305f21cd..931e487fa 100644
--- a/tests/test_xmlrpc/test_replace.py
+++ b/tests/test_xmlrpc/test_replace.py
@@ -34,7 +34,7 @@ user_memberof = (u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn,)
 user1=u'tuser1'
 
 
-class test_attr(Declarative):
+class test_replace(Declarative):
 
     cleanup_commands = [
         ('user_del', [user1], {}),
@@ -61,6 +61,7 @@ class test_attr(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -84,6 +85,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     mail=[u'test1@example.com', u'test3@example.com'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -106,6 +109,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     mail=[u'test4@example.com'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -128,6 +133,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     mail=[u'test6@example.com', u'test7@example.com', u'test5@example.com'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -150,6 +157,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -171,6 +180,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     initials=[u'ABC'],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
@@ -193,6 +204,8 @@ class test_attr(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index 0be4148a8..9ebf844d5 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -93,6 +93,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -125,6 +126,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -295,6 +298,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -324,6 +329,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -344,6 +351,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[renameduser1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -370,6 +379,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User1'],
                     uid=[user1],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                 ),
@@ -426,6 +437,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],
@@ -454,6 +466,7 @@ class test_user(Declarative):
                     sn=[u'User2'],
                     uid=[user2],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User2'],
                     cn=[u'Test User2'],
                     initials=[u'TU'],
@@ -481,6 +494,8 @@ class test_user(Declarative):
                     loginshell=[u'/bin/sh'],
                     sn=[u'User2'],
                     uid=[user2],
+                    uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
                     nsaccountlock=[u'False'],
                     manager=[user1],
@@ -577,6 +592,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     uidnumber=[fuzzy_digits],
+                    gidnumber=[fuzzy_digits],
                     displayname=[u'Test User1'],
                     cn=[u'Test User1'],
                     initials=[u'TU'],