[CalendarServer-changes] [13780] CalendarServer/trunk/contrib/performance/loadtest
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 21 12:30:59 PDT 2014
Revision: 13780
http://trac.calendarserver.org//changeset/13780
Author: cdaboo at apple.com
Date: 2014-07-21 12:30:59 -0700 (Mon, 21 Jul 2014)
Log Message:
-----------
Handle new cu-address format, guids etc.
Modified Paths:
--------------
CalendarServer/trunk/contrib/performance/loadtest/accounts.csv
CalendarServer/trunk/contrib/performance/loadtest/ical.py
CalendarServer/trunk/contrib/performance/loadtest/profiles.py
CalendarServer/trunk/contrib/performance/loadtest/sim.py
Modified: CalendarServer/trunk/contrib/performance/loadtest/accounts.csv
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/accounts.csv 2014-07-21 19:28:13 UTC (rev 13779)
+++ CalendarServer/trunk/contrib/performance/loadtest/accounts.csv 2014-07-21 19:30:59 UTC (rev 13780)
@@ -1,99 +1,99 @@
-user01,user01,User 01,user01 at example.com
-user02,user02,User 02,user02 at example.com
-user03,user03,User 03,user03 at example.com
-user04,user04,User 04,user04 at example.com
-user05,user05,User 05,user05 at example.com
-user06,user06,User 06,user06 at example.com
-user07,user07,User 07,user07 at example.com
-user08,user08,User 08,user08 at example.com
-user09,user09,User 09,user09 at example.com
-user10,user10,User 10,user10 at example.com
-user11,user11,User 11,user11 at example.com
-user12,user12,User 12,user12 at example.com
-user13,user13,User 13,user13 at example.com
-user14,user14,User 14,user14 at example.com
-user15,user15,User 15,user15 at example.com
-user16,user16,User 16,user16 at example.com
-user17,user17,User 17,user17 at example.com
-user18,user18,User 18,user18 at example.com
-user19,user19,User 19,user19 at example.com
-user20,user20,User 20,user20 at example.com
-user21,user21,User 21,user21 at example.com
-user22,user22,User 22,user22 at example.com
-user23,user23,User 23,user23 at example.com
-user24,user24,User 24,user24 at example.com
-user25,user25,User 25,user25 at example.com
-user26,user26,User 26,user26 at example.com
-user27,user27,User 27,user27 at example.com
-user28,user28,User 28,user28 at example.com
-user29,user29,User 29,user29 at example.com
-user30,user30,User 30,user30 at example.com
-user31,user31,User 31,user31 at example.com
-user32,user32,User 32,user32 at example.com
-user33,user33,User 33,user33 at example.com
-user34,user34,User 34,user34 at example.com
-user35,user35,User 35,user35 at example.com
-user36,user36,User 36,user36 at example.com
-user37,user37,User 37,user37 at example.com
-user38,user38,User 38,user38 at example.com
-user39,user39,User 39,user39 at example.com
-user40,user40,User 40,user40 at example.com
-user41,user41,User 41,user41 at example.com
-user42,user42,User 42,user42 at example.com
-user43,user43,User 43,user43 at example.com
-user44,user44,User 44,user44 at example.com
-user45,user45,User 45,user45 at example.com
-user46,user46,User 46,user46 at example.com
-user47,user47,User 47,user47 at example.com
-user48,user48,User 48,user48 at example.com
-user49,user49,User 49,user49 at example.com
-user50,user50,User 50,user50 at example.com
-user51,user51,User 51,user51 at example.com
-user52,user52,User 52,user52 at example.com
-user53,user53,User 53,user53 at example.com
-user54,user54,User 54,user54 at example.com
-user55,user55,User 55,user55 at example.com
-user56,user56,User 56,user56 at example.com
-user57,user57,User 57,user57 at example.com
-user58,user58,User 58,user58 at example.com
-user59,user59,User 59,user59 at example.com
-user60,user60,User 60,user60 at example.com
-user61,user61,User 61,user61 at example.com
-user62,user62,User 62,user62 at example.com
-user63,user63,User 63,user63 at example.com
-user64,user64,User 64,user64 at example.com
-user65,user65,User 65,user65 at example.com
-user66,user66,User 66,user66 at example.com
-user67,user67,User 67,user67 at example.com
-user68,user68,User 68,user68 at example.com
-user69,user69,User 69,user69 at example.com
-user70,user70,User 70,user70 at example.com
-user71,user71,User 71,user71 at example.com
-user72,user72,User 72,user72 at example.com
-user73,user73,User 73,user73 at example.com
-user74,user74,User 74,user74 at example.com
-user75,user75,User 75,user75 at example.com
-user76,user76,User 76,user76 at example.com
-user77,user77,User 77,user77 at example.com
-user78,user78,User 78,user78 at example.com
-user79,user79,User 79,user79 at example.com
-user80,user80,User 80,user80 at example.com
-user81,user81,User 81,user81 at example.com
-user82,user82,User 82,user82 at example.com
-user83,user83,User 83,user83 at example.com
-user84,user84,User 84,user84 at example.com
-user85,user85,User 85,user85 at example.com
-user86,user86,User 86,user86 at example.com
-user87,user87,User 87,user87 at example.com
-user88,user88,User 88,user88 at example.com
-user89,user89,User 89,user89 at example.com
-user90,user90,User 90,user90 at example.com
-user91,user91,User 91,user91 at example.com
-user92,user92,User 92,user92 at example.com
-user93,user93,User 93,user93 at example.com
-user94,user94,User 94,user94 at example.com
-user95,user95,User 95,user95 at example.com
-user96,user96,User 96,user96 at example.com
-user97,user97,User 97,user97 at example.com
-user98,user98,User 98,user98 at example.com
-user99,user99,User 99,user99 at example.com
+user01,user01,User 01,user01 at example.com,10000000-0000-0000-0000-000000000001
+user02,user02,User 02,user02 at example.com,10000000-0000-0000-0000-000000000002
+user03,user03,User 03,user03 at example.com,10000000-0000-0000-0000-000000000003
+user04,user04,User 04,user04 at example.com,10000000-0000-0000-0000-000000000004
+user05,user05,User 05,user05 at example.com,10000000-0000-0000-0000-000000000005
+user06,user06,User 06,user06 at example.com,10000000-0000-0000-0000-000000000006
+user07,user07,User 07,user07 at example.com,10000000-0000-0000-0000-000000000007
+user08,user08,User 08,user08 at example.com,10000000-0000-0000-0000-000000000008
+user09,user09,User 09,user09 at example.com,10000000-0000-0000-0000-000000000009
+user10,user10,User 10,user10 at example.com,10000000-0000-0000-0000-000000000010
+user11,user11,User 11,user11 at example.com,10000000-0000-0000-0000-000000000011
+user12,user12,User 12,user12 at example.com,10000000-0000-0000-0000-000000000012
+user13,user13,User 13,user13 at example.com,10000000-0000-0000-0000-000000000013
+user14,user14,User 14,user14 at example.com,10000000-0000-0000-0000-000000000014
+user15,user15,User 15,user15 at example.com,10000000-0000-0000-0000-000000000015
+user16,user16,User 16,user16 at example.com,10000000-0000-0000-0000-000000000016
+user17,user17,User 17,user17 at example.com,10000000-0000-0000-0000-000000000017
+user18,user18,User 18,user18 at example.com,10000000-0000-0000-0000-000000000018
+user19,user19,User 19,user19 at example.com,10000000-0000-0000-0000-000000000019
+user20,user20,User 20,user20 at example.com,10000000-0000-0000-0000-000000000020
+user21,user21,User 21,user21 at example.com,10000000-0000-0000-0000-000000000021
+user22,user22,User 22,user22 at example.com,10000000-0000-0000-0000-000000000022
+user23,user23,User 23,user23 at example.com,10000000-0000-0000-0000-000000000023
+user24,user24,User 24,user24 at example.com,10000000-0000-0000-0000-000000000024
+user25,user25,User 25,user25 at example.com,10000000-0000-0000-0000-000000000025
+user26,user26,User 26,user26 at example.com,10000000-0000-0000-0000-000000000026
+user27,user27,User 27,user27 at example.com,10000000-0000-0000-0000-000000000027
+user28,user28,User 28,user28 at example.com,10000000-0000-0000-0000-000000000028
+user29,user29,User 29,user29 at example.com,10000000-0000-0000-0000-000000000029
+user30,user30,User 30,user30 at example.com,10000000-0000-0000-0000-000000000030
+user31,user31,User 31,user31 at example.com,10000000-0000-0000-0000-000000000031
+user32,user32,User 32,user32 at example.com,10000000-0000-0000-0000-000000000032
+user33,user33,User 33,user33 at example.com,10000000-0000-0000-0000-000000000033
+user34,user34,User 34,user34 at example.com,10000000-0000-0000-0000-000000000034
+user35,user35,User 35,user35 at example.com,10000000-0000-0000-0000-000000000035
+user36,user36,User 36,user36 at example.com,10000000-0000-0000-0000-000000000036
+user37,user37,User 37,user37 at example.com,10000000-0000-0000-0000-000000000037
+user38,user38,User 38,user38 at example.com,10000000-0000-0000-0000-000000000038
+user39,user39,User 39,user39 at example.com,10000000-0000-0000-0000-000000000039
+user40,user40,User 40,user40 at example.com,10000000-0000-0000-0000-000000000040
+user41,user41,User 41,user41 at example.com,10000000-0000-0000-0000-000000000041
+user42,user42,User 42,user42 at example.com,10000000-0000-0000-0000-000000000042
+user43,user43,User 43,user43 at example.com,10000000-0000-0000-0000-000000000043
+user44,user44,User 44,user44 at example.com,10000000-0000-0000-0000-000000000044
+user45,user45,User 45,user45 at example.com,10000000-0000-0000-0000-000000000045
+user46,user46,User 46,user46 at example.com,10000000-0000-0000-0000-000000000046
+user47,user47,User 47,user47 at example.com,10000000-0000-0000-0000-000000000047
+user48,user48,User 48,user48 at example.com,10000000-0000-0000-0000-000000000048
+user49,user49,User 49,user49 at example.com,10000000-0000-0000-0000-000000000049
+user50,user50,User 50,user50 at example.com,10000000-0000-0000-0000-000000000050
+user51,user51,User 51,user51 at example.com,10000000-0000-0000-0000-000000000051
+user52,user52,User 52,user52 at example.com,10000000-0000-0000-0000-000000000052
+user53,user53,User 53,user53 at example.com,10000000-0000-0000-0000-000000000053
+user54,user54,User 54,user54 at example.com,10000000-0000-0000-0000-000000000054
+user55,user55,User 55,user55 at example.com,10000000-0000-0000-0000-000000000055
+user56,user56,User 56,user56 at example.com,10000000-0000-0000-0000-000000000056
+user57,user57,User 57,user57 at example.com,10000000-0000-0000-0000-000000000057
+user58,user58,User 58,user58 at example.com,10000000-0000-0000-0000-000000000058
+user59,user59,User 59,user59 at example.com,10000000-0000-0000-0000-000000000059
+user60,user60,User 60,user60 at example.com,10000000-0000-0000-0000-000000000060
+user61,user61,User 61,user61 at example.com,10000000-0000-0000-0000-000000000061
+user62,user62,User 62,user62 at example.com,10000000-0000-0000-0000-000000000062
+user63,user63,User 63,user63 at example.com,10000000-0000-0000-0000-000000000063
+user64,user64,User 64,user64 at example.com,10000000-0000-0000-0000-000000000064
+user65,user65,User 65,user65 at example.com,10000000-0000-0000-0000-000000000065
+user66,user66,User 66,user66 at example.com,10000000-0000-0000-0000-000000000066
+user67,user67,User 67,user67 at example.com,10000000-0000-0000-0000-000000000067
+user68,user68,User 68,user68 at example.com,10000000-0000-0000-0000-000000000068
+user69,user69,User 69,user69 at example.com,10000000-0000-0000-0000-000000000069
+user70,user70,User 70,user70 at example.com,10000000-0000-0000-0000-000000000070
+user71,user71,User 71,user71 at example.com,10000000-0000-0000-0000-000000000071
+user72,user72,User 72,user72 at example.com,10000000-0000-0000-0000-000000000072
+user73,user73,User 73,user73 at example.com,10000000-0000-0000-0000-000000000073
+user74,user74,User 74,user74 at example.com,10000000-0000-0000-0000-000000000074
+user75,user75,User 75,user75 at example.com,10000000-0000-0000-0000-000000000075
+user76,user76,User 76,user76 at example.com,10000000-0000-0000-0000-000000000076
+user77,user77,User 77,user77 at example.com,10000000-0000-0000-0000-000000000077
+user78,user78,User 78,user78 at example.com,10000000-0000-0000-0000-000000000078
+user79,user79,User 79,user79 at example.com,10000000-0000-0000-0000-000000000079
+user80,user80,User 80,user80 at example.com,10000000-0000-0000-0000-000000000080
+user81,user81,User 81,user81 at example.com,10000000-0000-0000-0000-000000000081
+user82,user82,User 82,user82 at example.com,10000000-0000-0000-0000-000000000082
+user83,user83,User 83,user83 at example.com,10000000-0000-0000-0000-000000000083
+user84,user84,User 84,user84 at example.com,10000000-0000-0000-0000-000000000084
+user85,user85,User 85,user85 at example.com,10000000-0000-0000-0000-000000000085
+user86,user86,User 86,user86 at example.com,10000000-0000-0000-0000-000000000086
+user87,user87,User 87,user87 at example.com,10000000-0000-0000-0000-000000000087
+user88,user88,User 88,user88 at example.com,10000000-0000-0000-0000-000000000088
+user89,user89,User 89,user89 at example.com,10000000-0000-0000-0000-000000000089
+user90,user90,User 90,user90 at example.com,10000000-0000-0000-0000-000000000090
+user91,user91,User 91,user91 at example.com,10000000-0000-0000-0000-000000000091
+user92,user92,User 92,user92 at example.com,10000000-0000-0000-0000-000000000092
+user93,user93,User 93,user93 at example.com,10000000-0000-0000-0000-000000000093
+user94,user94,User 94,user94 at example.com,10000000-0000-0000-0000-000000000094
+user95,user95,User 95,user95 at example.com,10000000-0000-0000-0000-000000000095
+user96,user96,User 96,user96 at example.com,10000000-0000-0000-0000-000000000096
+user97,user97,User 97,user97 at example.com,10000000-0000-0000-0000-000000000097
+user98,user98,User 98,user98 at example.com,10000000-0000-0000-0000-000000000098
+user99,user99,User 99,user99 at example.com,10000000-0000-0000-0000-000000000099
Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2014-07-21 19:28:13 UTC (rev 13779)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2014-07-21 19:30:59 UTC (rev 13780)
@@ -729,8 +729,10 @@
for cuaddr in cuaddrs:
if cuaddr.toString().startswith(u"mailto:"):
self.email = cuaddr.toString()
- elif cuaddr.toString().startswith(u"urn:"):
+ elif cuaddr.toString().startswith(u"urn:x-uid"):
self.uuid = cuaddr.toString()
+ elif cuaddr.toString().startswith(u"urn:uuid") and self.uuid is None:
+ self.uuid = cuaddr.toString()
if self.email is None:
raise ValueError("Cannot operate without a mail-style principal URL")
Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2014-07-21 19:28:13 UTC (rev 13779)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2014-07-21 19:30:59 UTC (rev 13780)
@@ -205,8 +205,9 @@
except IndexError:
continue
cuaddr = u'mailto:%s' % (record.email,)
- uuid = u'urn:x-uid:%s' % (record.uid,)
- if cuaddr not in invitees and uuid not in invitees:
+ uuidx = u'urn:x-uid:%s' % (record.guid,)
+ uuid = u'urn:uuid:%s' % (record.guid,)
+ if cuaddr not in invitees and uuidx not in invitees and uuid not in invitees:
break
else:
return fail(CannotAddAttendee("Can't find uninvited user to invite."))
Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py
===================================================================
--- CalendarServer/trunk/contrib/performance/loadtest/sim.py 2014-07-21 19:28:13 UTC (rev 13779)
+++ CalendarServer/trunk/contrib/performance/loadtest/sim.py 2014-07-21 19:30:59 UTC (rev 13780)
@@ -54,11 +54,12 @@
class _DirectoryRecord(object):
- def __init__(self, uid, password, commonName, email):
+ def __init__(self, uid, password, commonName, email, guid):
self.uid = uid
self.password = password
self.commonName = commonName
self.email = email
+ self.guid = guid
@@ -92,10 +93,16 @@
def recordsFromCount(count, uid=u"user%02d", password=u"user%02d",
- commonName=u"User %02d", email=u"user%02d at example.com"):
+ commonName=u"User %02d", email=u"user%02d at example.com",
+ guid="10000000-0000-0000-0000-000000000%03d"):
for i in range(1, count + 1):
- yield _DirectoryRecord(uid % i, password % i,
- commonName % i, email % i)
+ yield _DirectoryRecord(
+ uid % i,
+ password % i,
+ commonName % i,
+ email % i,
+ guid % i,
+ )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140721/55d091f3/attachment-0001.html>
More information about the calendarserver-changes
mailing list