[CalendarServer-changes] [6572] CalendarServer/trunk/calendarserver/od

[source_changes at macosforge.org]

Revision: 6572
          http://trac.macosforge.org/projects/calendarserver/changeset/6572
Author:   sagen at apple.com
Date:     2010-11-04 16:05:26 -0700 (Thu, 04 Nov 2010)
Log Message:
-----------
Adding PrimaryGroupID to test accounts, and uppercase guids

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/od/setup_directory.py
    CalendarServer/trunk/calendarserver/od/test/test_opendirectory.py

Modified: CalendarServer/trunk/calendarserver/od/setup_directory.py
===================================================================
--- CalendarServer/trunk/calendarserver/od/setup_directory.py	2010-11-04 22:19:50 UTC (rev 6571)
+++ CalendarServer/trunk/calendarserver/od/setup_directory.py	2010-11-04 23:05:26 UTC (rev 6572)
@@ -34,8 +34,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Amanda Test"],
             dsattributes.kDSNAttrEMailAddress : ["amanda at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a70-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A70-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33300"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -45,8 +46,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Betty Test"],
             dsattributes.kDSNAttrEMailAddress : ["betty at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a71-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A71-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33301"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -56,8 +58,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Carlene Test"],
             dsattributes.kDSNAttrEMailAddress : ["carlene at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a72-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A72-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33302"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -67,8 +70,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Denise Test"],
             dsattributes.kDSNAttrEMailAddress : ["denise at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a73-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A73-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33303"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
 ]
@@ -77,9 +81,9 @@
     (
         "odtestgrouptop",
         {
-            dsattributes.kDS1AttrGeneratedUID : ["6c6cd280-e6e3-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["6C6CD280-E6E3-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrDistinguishedName : ["OD Test Group Top"],
-            dsattributes.kDSNAttrGroupMembers : ["9dc04a70-e6dd-11df-9492-0800200c9a66", "9dc04a71-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDSNAttrGroupMembers : ["9DC04A70-E6DD-11DF-9492-0800200C9A66", "9DC04A71-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrPrimaryGroupID : ["33400"],
         },
     ),
@@ -93,8 +97,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Albert Test"],
             dsattributes.kDSNAttrEMailAddress : ["albert at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a74-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A74-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33350"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -104,8 +109,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Bill Test"],
             dsattributes.kDSNAttrEMailAddress : ["bill at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a75-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A75-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33351"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -115,8 +121,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["Carl Test"],
             dsattributes.kDSNAttrEMailAddress : ["carl at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a76-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A76-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33352"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
     (
@@ -126,8 +133,9 @@
             dsattributes.kDS1AttrLastName  : ["Test"],
             dsattributes.kDS1AttrDistinguishedName : ["David Test"],
             dsattributes.kDSNAttrEMailAddress : ["david at example.com"],
-            dsattributes.kDS1AttrGeneratedUID : ["9dc04a77-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["9DC04A77-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrUniqueID : ["33353"],
+            dsattributes.kDS1AttrPrimaryGroupID : ["20"],
         },
     ),
 ]
@@ -136,9 +144,9 @@
     (
         "odtestsubgroupa",
         {
-            dsattributes.kDS1AttrGeneratedUID : ["6c6cd281-e6e3-11df-9492-0800200c9a66"],
+            dsattributes.kDS1AttrGeneratedUID : ["6C6CD281-E6E3-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrDistinguishedName : ["OD Test Subgroup A"],
-            dsattributes.kDSNAttrGroupMembers : ["9dc04a74-e6dd-11df-9492-0800200c9a66", "9dc04a75-e6dd-11df-9492-0800200c9a66"],
+            dsattributes.kDSNAttrGroupMembers : ["9DC04A74-E6DD-11DF-9492-0800200C9A66", "9DC04A75-E6DD-11DF-9492-0800200C9A66"],
             dsattributes.kDS1AttrPrimaryGroupID : ["33400"],
         },
     ),

Modified: CalendarServer/trunk/calendarserver/od/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/calendarserver/od/test/test_opendirectory.py	2010-11-04 22:19:50 UTC (rev 6571)
+++ CalendarServer/trunk/calendarserver/od/test/test_opendirectory.py	2010-11-04 23:05:26 UTC (rev 6572)
@@ -29,7 +29,7 @@
     results = list(opendirectory.queryRecordsWithAttribute_list(
         directory,
         dsattributes.kDS1AttrGeneratedUID,
-        "9dc04a74-e6dd-11df-9492-0800200c9a66",
+        "9DC04A74-E6DD-11DF-9492-0800200C9A66",
         dsattributes.eDSExact,
         False,
         dsattributes.kDSStdRecordTypeUsers,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101104/eaf770bc/attachment-0001.html>