[CalendarServer-changes] [5542] CalendarServer/trunk/calendarserver/tools

[source_changes at macosforge.org]

Revision: 5542
          http://trac.macosforge.org/projects/calendarserver/changeset/5542
Author:   sagen at apple.com
Date:     2010-04-28 15:38:20 -0700 (Wed, 28 Apr 2010)
Log Message:
-----------
calendarserver_manage_principals now displays full name and record name when listing proxies

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/principals.py
    CalendarServer/trunk/calendarserver/tools/test/test_principals.py

Modified: CalendarServer/trunk/calendarserver/tools/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/principals.py	2010-04-28 18:52:45 UTC (rev 5541)
+++ CalendarServer/trunk/calendarserver/tools/principals.py	2010-04-28 22:38:20 UTC (rev 5542)
@@ -287,15 +287,9 @@
             usage("Too many arguments")
 
         try:
-            results = [(record.fullName, record.shortNames[0], record.guid)
-                for record in config.directory.listRecords(listPrincipals)]
-            if results:
-                results.sort()
-                format = "%-15s %-15s %s"
-                print format % ("Full name", "Record name", "UUID")
-                print format % ("---------", "-----------", "----")
-                for fullName, shortName, guid in results:
-                    print format % ("'%s'" % (fullName,), shortName, guid)
+            records = list(config.directory.listRecords(listPrincipals))
+            if records:
+                printRecordList(records)
             else:
                 print "No records of type %s" % (listPrincipals,)
         except UnknownRecordTypeError, e:
@@ -488,8 +482,14 @@
                 {"read": "Read-only", "write": "Read/write"}[proxyType],
                 principal,
             )
+            records = []
             for member in membersProperty.children:
-                print " *", member
+                proxyPrincipal = principalForPrincipalID(str(member),
+                    directory=config.directory)
+                records.append(proxyPrincipal.record)
+
+            printRecordList(records)
+            print
         else:
             print "No %s proxies for %s" % (proxyType, principal)
 
@@ -690,5 +690,15 @@
     raise ValueError("'%s' is not a recognized value" % (value,))
 
 
+def printRecordList(records):
+    results = [(record.fullName, record.shortNames[0], record.guid)
+        for record in records]
+    results.sort()
+    format = "%-22s %-17s %s"
+    print format % ("Full name", "Record name", "UUID")
+    print format % ("---------", "-----------", "----")
+    for fullName, shortName, guid in results:
+        print format % (fullName, shortName, guid)
+
 if __name__ == "__main__":
     main()

Modified: CalendarServer/trunk/calendarserver/tools/test/test_principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_principals.py	2010-04-28 18:52:45 UTC (rev 5541)
+++ CalendarServer/trunk/calendarserver/tools/test/test_principals.py	2010-04-28 22:38:20 UTC (rev 5542)
@@ -177,7 +177,7 @@
 
         results = yield self.runCommand("--list-write-proxies",
             "locations:location01")
-        self.assertTrue("Read/write proxies for (locations)location01:\n * /principals/__uids__/user01/" in results)
+        self.assertTrue("Test User 01" in results)
 
         results = yield self.runCommand("--remove-proxy=users:user01",
             "locations:location01")
@@ -194,7 +194,7 @@
 
         results = yield self.runCommand("--list-read-proxies",
             "locations:location01")
-        self.assertTrue("Read-only proxies for (locations)location01:\n * /principals/__uids__/user01/" in results)
+        self.assertTrue("Test User 01" in results)
 
         results = yield self.runCommand("--remove-proxy=users:user01",
             "locations:location01")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100428/f6d2a0e8/attachment.html>