[Freeipa-devel] [PATCH] Rename memberOf to group_members in xml-rpc interface
Karl MacMillan
kmacmillan at mentalrootkit.com
Wed Oct 31 20:37:10 UTC 2007
# HG changeset patch
# User "Karl MacMillan <kmacmillan at mentalrootkit.com>"
# Date 1193863016 14400
# Node ID 5c364bb6ca88b0f4d8c770f97c4d3a81befd7985
# Parent 5a615adb8952a20ffa0ca0fc02b578f464622153
Rename memberOf to group_members in xml-rpc interface.
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-admintools/ipa-findgroup
--- a/ipa-admintools/ipa-findgroup Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-admintools/ipa-findgroup Wed Oct 31 16:36:56 2007 -0400
@@ -58,7 +58,7 @@ def main():
for ent in groups:
try:
- members = client.memberOf(ent.dn, ['dn','cn'])
+ members = client.group_members(ent.dn, ['dn','cn'])
except ipa.ipaerror.IPAError, e:
print "Error getting members for " + ent.dn
print str(e)
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-python/ipaclient.py
--- a/ipa-python/ipaclient.py Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-python/ipaclient.py Wed Oct 31 16:36:56 2007 -0400
@@ -317,11 +317,11 @@ class IPAClient:
return self.transport.attrs_to_labels(attrs)
- def memberOf(self, groupdn, attr_list):
+ def group_members(self, groupdn, attr_list):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""
- results = self.transport.memberOf(groupdn, attr_list)
+ results = self.transport.group_members(groupdn, attr_list)
counter = results[0]
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-python/rpcclient.py
--- a/ipa-python/rpcclient.py Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-python/rpcclient.py Wed Oct 31 16:36:56 2007 -0400
@@ -575,7 +575,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
- def memberOf(self, groupdn, attr_list=None):
+ def group_members(self, groupdn, attr_list=None):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""
@@ -584,10 +584,10 @@ class RPCClient:
server = self.setup_server()
try:
- result = server.memberOf(groupdn, attr_list)
- except xmlrpclib.Fault, fault:
- raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
- except socket.error, (value, msg):
- raise xmlrpclib.Fault(value, msg)
-
- return ipautil.unwrap_binary_data(result)
+ result = server.group_members(groupdn, attr_list)
+ except xmlrpclib.Fault, fault:
+ raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
+ except socket.error, (value, msg):
+ raise xmlrpclib.Fault(value, msg)
+
+ return ipautil.unwrap_binary_data(result)
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-server/ipa-gui/ipagui/subcontrollers/group.py
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py Wed Oct 31 16:36:56 2007 -0400
@@ -184,7 +184,7 @@ class GroupController(IPAController):
# convert members to users, for easier manipulation on the page
#
- members = client.memberOf(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
+ members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members.sort(self.sort_group_member)
# Map users into an array of dicts, which can be serialized
@@ -349,7 +349,7 @@ class GroupController(IPAController):
# convert members to users, for display on the page
#
- members = client.memberOf(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
+ members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members = members[1:]
members.sort(self.sort_group_member)
member_dicts = map(lambda member: member.toDict(), members)
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-server/xmlrpc-server/funcs.py
--- a/ipa-server/xmlrpc-server/funcs.py Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-server/xmlrpc-server/funcs.py Wed Oct 31 16:36:56 2007 -0400
@@ -1061,7 +1061,7 @@ class IPAServer:
return label_list
- def memberOf(self, groupdn, attr_list, opts=None):
+ def group_members(self, groupdn, attr_list, opts=None):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""
diff -r 5a615adb8952 -r 5c364bb6ca88 ipa-server/xmlrpc-server/ipaxmlrpc.py
--- a/ipa-server/xmlrpc-server/ipaxmlrpc.py Wed Oct 31 15:59:28 2007 -0400
+++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py Wed Oct 31 16:36:56 2007 -0400
@@ -350,7 +350,7 @@ def handler(req, profiling=False):
h.register_function(f.update_group)
h.register_function(f.delete_group)
h.register_function(f.attrs_to_labels)
- h.register_function(f.memberOf)
+ h.register_function(f.group_members)
h.handle_request(req)
finally:
pass
More information about the Freeipa-devel
mailing list