[CalendarServer-changes] [8372] CalDAVTester/trunk/odsetup.py

[source_changes at macosforge.org]

Revision: 8372
          http://trac.macosforge.org/projects/calendarserver/changeset/8372
Author:   cdaboo at apple.com
Date:     2011-12-02 13:36:00 -0800 (Fri, 02 Dec 2011)
Log Message:
-----------
Do proxy setup after all records have been created.

Modified Paths:
--------------
    CalDAVTester/trunk/odsetup.py

Modified: CalDAVTester/trunk/odsetup.py
===================================================================
--- CalDAVTester/trunk/odsetup.py	2011-12-02 20:13:50 UTC (rev 8371)
+++ CalDAVTester/trunk/odsetup.py	2011-12-02 21:36:00 UTC (rev 8372)
@@ -533,25 +533,6 @@
         createUserViaDS(config, path, user)
     elif protocol == "caldav":
         createUserViaGateway(config, path, user)
-        
-    # Do caldav_utility setup
-    if path in ("/Places", "/Resources",):
-        if path in ("/Places",):
-            if user[0] == "delegatedroom":
-                cmd("%s --add-write-proxy groups:group05 --add-read-proxy groups:group07 --set-auto-schedule=false locations:%s" % (
-                    utility,
-                    user[0],
-                ))
-            else:
-                cmd("%s --add-write-proxy users:user01 --set-auto-schedule=true locations:%s" % (
-                    utility,
-                    user[0],
-                ))
-        else:
-            cmd("%s --add-write-proxy users:user01 --add-read-proxy users:user03 --set-auto-schedule=true resources:%s" % (
-                utility,
-                user[0],
-            ))
 
 def createUserViaDS(config, path, user):
     # Do dscl command line operations to create a calendar user
@@ -649,6 +630,30 @@
     else:
         raise ValueError()
 
+def manageRecords(config, path, user):
+    """
+    Set proxies and auto-schedule for locations and resources
+    """
+    
+    # Do caldav_utility setup
+    if path in ("/Places", "/Resources",):
+        if path in ("/Places",):
+            if user[0] == "delegatedroom":
+                cmd("%s --add-write-proxy groups:group05 --add-read-proxy groups:group07 --set-auto-schedule=false locations:%s" % (
+                    utility,
+                    user[0],
+                ))
+            else:
+                cmd("%s --add-write-proxy users:user01 --set-auto-schedule=true locations:%s" % (
+                    utility,
+                    user[0],
+                ))
+        else:
+            cmd("%s --add-write-proxy users:user01 --add-read-proxy users:user03 --set-auto-schedule=true resources:%s" % (
+                utility,
+                user[0],
+            ))
+
 if __name__ == "__main__":
 
     config = None
@@ -719,6 +724,7 @@
 
             doToAccounts(config, protocol, createUser)
             doGroupMemberships()
+            doToAccounts(config, protocol, manageRecords)
             
             # Patch the caldavd.plist file with the testadmin user's guid-based principal-URL
             patchConfig(config, "/principals/__uids__/%s/" % (guids["testadmin"],))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111202/570a0f48/attachment.html>