[CalendarServer-changes] [5622] CalendarServer/trunk/twistedcaldav/directory
source_changes at macosforge.org
source_changes at macosforge.org
Wed May 19 11:07:35 PDT 2010
Revision: 5622
http://trac.macosforge.org/projects/calendarserver/changeset/5622
Author: sagen at apple.com
Date: 2010-05-19 11:07:32 -0700 (Wed, 19 May 2010)
Log Message:
-----------
appleopendirectory now no longer queries for Places and Resources, as those have moved to an internal directory service.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py
CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
CalendarServer/trunk/twistedcaldav/directory/test/util.py
Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-05-19 02:26:13 UTC (rev 5621)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-05-19 18:07:32 UTC (rev 5622)
@@ -67,8 +67,6 @@
'recordTypes' : (
self.recordType_users,
self.recordType_groups,
- self.recordType_locations,
- self.recordType_resources,
),
}
ignored = (
@@ -269,8 +267,6 @@
'appliesTo' : set([
dsattributes.kDSStdRecordTypeUsers,
dsattributes.kDSStdRecordTypeGroups,
- dsattributes.kDSStdRecordTypePlaces,
- dsattributes.kDSStdRecordTypeResources,
]),
},
'firstName' : {
@@ -297,8 +293,6 @@
'appliesTo' : set([
dsattributes.kDSStdRecordTypeUsers,
dsattributes.kDSStdRecordTypeGroups,
- dsattributes.kDSStdRecordTypePlaces,
- dsattributes.kDSStdRecordTypeResources,
]),
},
'guid' : {
@@ -306,8 +300,6 @@
'appliesTo' : set([
dsattributes.kDSStdRecordTypeUsers,
dsattributes.kDSStdRecordTypeGroups,
- dsattributes.kDSStdRecordTypePlaces,
- dsattributes.kDSStdRecordTypeResources,
]),
},
}
@@ -315,12 +307,8 @@
_toODRecordTypes = {
DirectoryService.recordType_users :
dsattributes.kDSStdRecordTypeUsers,
- DirectoryService.recordType_locations :
- dsattributes.kDSStdRecordTypePlaces,
DirectoryService.recordType_groups :
dsattributes.kDSStdRecordTypeGroups,
- DirectoryService.recordType_resources :
- dsattributes.kDSStdRecordTypeResources,
}
_fromODRecordTypes = dict([(b, a) for a, b in _toODRecordTypes.iteritems()])
@@ -529,18 +517,6 @@
attrs.append(dsattributes.kDSNAttrGroupMembers)
attrs.append(dsattributes.kDSNAttrNestedGroups)
- elif recordType == DirectoryService.recordType_locations:
- if queryattr != dsattributes.kDSNAttrEMailAddress:
- listRecordTypes.append(dsattributes.kDSStdRecordTypePlaces)
- # MOR: possibly can be removed
- attrs.append(dsattributes.kDSNAttrResourceInfo)
-
- elif recordType == DirectoryService.recordType_resources:
- if queryattr != dsattributes.kDSNAttrEMailAddress:
- listRecordTypes.append(dsattributes.kDSStdRecordTypeResources)
- # MOR: possibly can be removed
- attrs.append(dsattributes.kDSNAttrResourceInfo)
-
else:
raise UnknownRecordTypeError("Unknown OpenDirectory record type: %s" % (recordType))
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py 2010-05-19 02:26:13 UTC (rev 5621)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_buildquery.py 2010-05-19 18:07:32 UTC (rev 5622)
@@ -41,7 +41,6 @@
buildQueries(
[
dsattributes.kDSStdRecordTypeUsers,
- dsattributes.kDSStdRecordTypePlaces
],
(
("firstName", "morgen", True, "starts-with"),
@@ -54,14 +53,12 @@
('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with'),
('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains'),
): ['dsRecTypeStandard:Users'],
- (): ['dsRecTypeStandard:Places']
}
)
self.assertEquals(
buildQueries(
[
dsattributes.kDSStdRecordTypeGroups,
- dsattributes.kDSStdRecordTypePlaces
],
(
("firstName", "morgen", True, "starts-with"),
@@ -76,9 +73,6 @@
('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with'),
('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains'),
): ['dsRecTypeStandard:Groups'],
- (
- ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with'),
- ): ['dsRecTypeStandard:Places']
}
)
self.assertEquals(
@@ -86,8 +80,6 @@
[
dsattributes.kDSStdRecordTypeUsers,
dsattributes.kDSStdRecordTypeGroups,
- dsattributes.kDSStdRecordTypeResources,
- dsattributes.kDSStdRecordTypePlaces
],
(
("firstName", "morgen", True, "starts-with"),
@@ -103,9 +95,6 @@
('dsAttrTypeStandard:EMailAddress', 'morgen', True, 'contains')
): ['dsRecTypeStandard:Groups'],
(
- ('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with'),
- ): ['dsRecTypeStandard:Resources', 'dsRecTypeStandard:Places'],
- (
('dsAttrTypeStandard:FirstName', 'morgen', True, 'starts-with'),
('dsAttrTypeStandard:LastName', 'morgen', True, 'starts-with'),
('dsAttrTypeStandard:RealName', 'morgen', True, 'starts-with'),
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-05-19 02:26:13 UTC (rev 5621)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py 2010-05-19 18:07:32 UTC (rev 5622)
@@ -45,11 +45,9 @@
recordTypes = set((
DirectoryService.recordType_users,
DirectoryService.recordType_groups,
- DirectoryService.recordType_locations,
- DirectoryService.recordType_resources
))
- users = groups = locations = resources = {}
+ users = groups = {}
def setUp(self):
super(OpenDirectory, self).setUp()
@@ -161,7 +159,7 @@
results.append(("", entry))
return results
- recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups, DirectoryService.recordType_locations, DirectoryService.recordType_resources]
+ recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups]
self.service().queryDirectory(recordTypes, self.service().INDEX_TYPE_GUID, "1234567890", lookupMethod=lookupMethod)
self.assertTrue(self.service().recordWithGUID("1234567890"))
self.assertFalse(self.service().recordWithGUID("987654321"))
@@ -191,7 +189,7 @@
results.append(("", entry))
return results
- recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups, DirectoryService.recordType_locations, DirectoryService.recordType_resources]
+ recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups]
self.service().queryDirectory(recordTypes, self.service().INDEX_TYPE_GUID, "1234567890", lookupMethod=lookupMethod)
self.assertFalse(self.service().recordWithGUID("1234567890"))
@@ -221,7 +219,7 @@
results.append(("", entry))
return results
- recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups, DirectoryService.recordType_locations, DirectoryService.recordType_resources]
+ recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups]
self.service().queryDirectory(recordTypes, self.service().INDEX_TYPE_GUID, "1234567890", lookupMethod=lookupMethod)
self.service().queryDirectory(recordTypes, self.service().INDEX_TYPE_GUID, "987654321", lookupMethod=lookupMethod)
self.assertFalse(self.service().recordWithGUID("1234567890"))
@@ -238,7 +236,7 @@
return []
- recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups, DirectoryService.recordType_locations, DirectoryService.recordType_resources]
+ recordTypes = [DirectoryService.recordType_users, DirectoryService.recordType_groups]
self.service().queryDirectory(recordTypes, self.service().INDEX_TYPE_CUA, "mailto:user1 at example.com", lookupMethod=lookupMethod)
Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py 2010-05-19 02:26:13 UTC (rev 5621)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py 2010-05-19 18:07:32 UTC (rev 5622)
@@ -37,6 +37,9 @@
# Subclass should init this to a dict of groupname keys and dict values.
groups = {}
+ # Subclass should init this to a dict of locationnames keys and dict values.
+ locations = {}
+
# Subclass should init this to a dict of resourcenames keys and dict values.
resources = {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100519/b29f3a13/attachment-0001.html>
More information about the calendarserver-changes
mailing list