[CalendarServer-changes] [13326] CalendarServer/branches/users/sagen/newcua/contrib/performance
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 18 12:03:51 PDT 2014
Revision: 13326
http://trac.calendarserver.org//changeset/13326
Author: sagen at apple.com
Date: 2014-04-18 12:03:51 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
More urn:x-uid: changes
Modified Paths:
--------------
CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py
CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -80,13 +80,13 @@
attendee = """\
ATTENDEE;CN=User %(SEQUENCE)02d;CUTYPE=INDIVIDUAL;EMAIL=user%(SEQUENCE)02d at example.com;PARTSTAT=NE
- EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:urn:uuid:user%(SEQUENCE)02d
+ EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:urn:x-uid:user%(SEQUENCE)02d
"""
organizer = """\
-ORGANIZER;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d at example.com:urn:uuid:user%(SEQUENCE)02d
+ORGANIZER;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d at example.com:urn:x-uid:user%(SEQUENCE)02d
ATTENDEE;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d at example.com;PARTSTAT=ACCEPTE
- D:urn:uuid:user%(SEQUENCE)02d
+ D:urn:x-uid:user%(SEQUENCE)02d
"""
def formatDate(d):
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -25,6 +25,7 @@
from contrib.performance._event_create import (
makeAttendees, makeVCalendar, formatDate, measure as _measure)
+
def makeEvent(i, organizerSequence, attendeeCount):
"""
Create a new half-hour long event that starts soon and recurs
@@ -38,7 +39,7 @@
attendees = makeAttendees(attendeeCount)
attendees.append(
'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
return makeVCalendar(
uuid4(), start, end, rrule, organizerSequence, attendees)
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -34,7 +34,7 @@
attendees = makeAttendees(attendeeCount)
attendees.append(
'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
return makeVCalendar(
uuid4(),
base + i * interval,
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -36,7 +36,7 @@
attendees = makeAttendees(attendeeCount)
attendees.append(
'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
return makeVCalendar(
uuid4(), start, end, "RRULE:FREQ=WEEKLY", organizerSequence, attendees)
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -73,7 +73,7 @@
X-CALENDARSERVER-MASK-UID:EC75A61B-08A3-44FD-BFBB-2457BBD0D490
DTSTAMP:20100729T174751Z
ORGANIZER:mailto:user01 at example.com
-SUMMARY:Availability for urn:uuid:user02
+SUMMARY:Availability for urn:x-uid:user02
END:VFREEBUSY
END:VCALENDAR
"""
@@ -124,6 +124,7 @@
@inlineCallbacks
def measure(host, port, dtrace, events, samples):
user = password = "user01"
+ uid = "10000000-0000-0000-0000-000000000001"
root = "/"
principal = "/"
calendar = "vfreebusy-benchmark"
@@ -150,12 +151,12 @@
headers = Headers({
"content-type": ["text/calendar"],
"originator": ["mailto:%s at example.com" % (user,)],
- "recipient": ["urn:uuid:%s, urn:uuid:user02" % (user,)]})
+ "recipient": ["urn:x-uid:%s, urn:x-uid:10000000-0000-0000-0000-000000000002" % (uid,)]})
vfb = VFREEBUSY % {
"attendees": "".join([
- "ATTENDEE:urn:uuid:%s\n" % (user,),
- "ATTENDEE:urn:uuid:user02\n"]),
+ "ATTENDEE:urn:x-uid:%s\n" % (uid,),
+ "ATTENDEE:urn:x-uid:10000000-0000-0000-0000-000000000002\n"]),
"start": formatDate(baseTime.replace(hour=0, minute=0)) + 'Z',
"end": formatDate(
baseTime.replace(hour=0, minute=0) + timedelta(days=1)) + 'Z'}
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -34,6 +34,7 @@
from contrib.performance.benchmarks.vfreebusy import VFREEBUSY, formatDate, makeEventNear
+
@inlineCallbacks
def measure(host, port, dtrace, attendees, samples):
userNumber = 1
@@ -51,7 +52,7 @@
for i in [userNumber] + targets:
targetUser = "user%02d" % (i,)
for path in ["calendars/users/%s/" % (targetUser,),
- "calendars/__uids__/%s/" % (targetUser,)]:
+ "calendars/__uids__/10000000-0000-0000-0000-000000000%03d/" % (i,)]:
authinfo.add_password(
realm="Test Realm",
uri="http://%s:%d/%s" % (host, port, path),
@@ -75,14 +76,14 @@
# And now issue the actual VFREEBUSY request
method = 'POST'
- uri = 'http://%s:%d/calendars/__uids__/%s/outbox/' % (host, port, user)
+ uri = 'http://%s:%d/calendars/__uids__/10000000-0000-0000-0000-000000000001/outbox/' % (host, port)
headers = Headers({
"content-type": ["text/calendar"],
"originator": ["mailto:%s at example.com" % (user,)],
- "recipient": [", ".join(["urn:uuid:user%02d" % (i,) for i in [userNumber] + targets])]})
+ "recipient": [", ".join(["urn:x-uid:10000000-0000-0000-0000-000000000%03d" % (i,) for i in [userNumber] + targets])]})
body = StringProducer(VFREEBUSY % {
"attendees": "".join([
- "ATTENDEE:urn:uuid:user%02d\n" % (i,)
+ "ATTENDEE:urn:x-uid:10000000-0000-0000-0000-000000000%03d\n" % (i,)
for i in [userNumber] + targets]),
"start": formatDate(baseTime.replace(hour=0, minute=0)) + 'Z',
"end": formatDate(
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -205,7 +205,7 @@
except IndexError:
continue
cuaddr = u'mailto:%s' % (record.email,)
- uuid = u'urn:uuid:%s' % (record.uid,)
+ uuid = u'urn:x-uid:%s' % (record.uid,)
if cuaddr not in invitees and uuid not in invitees:
break
else:
@@ -592,21 +592,21 @@
A Calendar user who creates new events.
"""
_eventTemplate = Component.fromString("""\
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.3//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-CREATED:20101018T155431Z
-UID:C98AD237-55AD-4F7D-9009-0D355D835822
-DTEND;TZID=America/New_York:20101021T130000
-TRANSP:OPAQUE
-SUMMARY:Simple event
-DTSTART;TZID=America/New_York:20101021T120000
-DTSTAMP:20101018T155438Z
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.3//EN
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+CREATED:20101018T155431Z
+UID:C98AD237-55AD-4F7D-9009-0D355D835822
+DTEND;TZID=America/New_York:20101021T130000
+TRANSP:OPAQUE
+SUMMARY:Simple event
+DTSTART;TZID=America/New_York:20101021T120000
+DTSTAMP:20101018T155438Z
+SEQUENCE:2
+END:VEVENT
+END:VCALENDAR
""".replace("\n", "\r\n"))
def setParameters(
Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py
===================================================================
--- CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py 2014-04-18 19:03:51 UTC (rev 13326)
@@ -51,11 +51,11 @@
calendarTail = """\
ATTENDEE;CN=User 02;CUTYPE=INDIVIDUAL;EMAIL=user02 at example.com;PARTSTAT=NE
- EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:use
+ EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:use
r02
CREATED:20100729T193912Z
DTSTAMP:20100729T195557Z
-ORGANIZER;CN=User 03;EMAIL=user03 at example.com:urn:uuid:user03
+ORGANIZER;CN=User 03;EMAIL=user03 at example.com:urn:x-uid:user03
SEQUENCE:1
SUMMARY:STUFF IS THINGS
TRANSP:OPAQUE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/3f90a6cf/attachment-0001.html>
More information about the calendarserver-changes
mailing list