<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13780] CalendarServer/trunk/contrib/performance/loadtest</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13780">13780</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-21 12:30:59 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle new cu-address format, guids etc.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestaccountscsv">CalendarServer/trunk/contrib/performance/loadtest/accounts.csv</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestprofilespy">CalendarServer/trunk/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtestsimpy">CalendarServer/trunk/contrib/performance/loadtest/sim.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestaccountscsv"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/accounts.csv (13779 => 13780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,99 +1,99 @@
</span><del>-user01,user01,User 01,user01@example.com
-user02,user02,User 02,user02@example.com
-user03,user03,User 03,user03@example.com
-user04,user04,User 04,user04@example.com
-user05,user05,User 05,user05@example.com
-user06,user06,User 06,user06@example.com
-user07,user07,User 07,user07@example.com
-user08,user08,User 08,user08@example.com
-user09,user09,User 09,user09@example.com
-user10,user10,User 10,user10@example.com
-user11,user11,User 11,user11@example.com
-user12,user12,User 12,user12@example.com
-user13,user13,User 13,user13@example.com
-user14,user14,User 14,user14@example.com
-user15,user15,User 15,user15@example.com
-user16,user16,User 16,user16@example.com
-user17,user17,User 17,user17@example.com
-user18,user18,User 18,user18@example.com
-user19,user19,User 19,user19@example.com
-user20,user20,User 20,user20@example.com
-user21,user21,User 21,user21@example.com
-user22,user22,User 22,user22@example.com
-user23,user23,User 23,user23@example.com
-user24,user24,User 24,user24@example.com
-user25,user25,User 25,user25@example.com
-user26,user26,User 26,user26@example.com
-user27,user27,User 27,user27@example.com
-user28,user28,User 28,user28@example.com
-user29,user29,User 29,user29@example.com
-user30,user30,User 30,user30@example.com
-user31,user31,User 31,user31@example.com
-user32,user32,User 32,user32@example.com
-user33,user33,User 33,user33@example.com
-user34,user34,User 34,user34@example.com
-user35,user35,User 35,user35@example.com
-user36,user36,User 36,user36@example.com
-user37,user37,User 37,user37@example.com
-user38,user38,User 38,user38@example.com
-user39,user39,User 39,user39@example.com
-user40,user40,User 40,user40@example.com
-user41,user41,User 41,user41@example.com
-user42,user42,User 42,user42@example.com
-user43,user43,User 43,user43@example.com
-user44,user44,User 44,user44@example.com
-user45,user45,User 45,user45@example.com
-user46,user46,User 46,user46@example.com
-user47,user47,User 47,user47@example.com
-user48,user48,User 48,user48@example.com
-user49,user49,User 49,user49@example.com
-user50,user50,User 50,user50@example.com
-user51,user51,User 51,user51@example.com
-user52,user52,User 52,user52@example.com
-user53,user53,User 53,user53@example.com
-user54,user54,User 54,user54@example.com
-user55,user55,User 55,user55@example.com
-user56,user56,User 56,user56@example.com
-user57,user57,User 57,user57@example.com
-user58,user58,User 58,user58@example.com
-user59,user59,User 59,user59@example.com
-user60,user60,User 60,user60@example.com
-user61,user61,User 61,user61@example.com
-user62,user62,User 62,user62@example.com
-user63,user63,User 63,user63@example.com
-user64,user64,User 64,user64@example.com
-user65,user65,User 65,user65@example.com
-user66,user66,User 66,user66@example.com
-user67,user67,User 67,user67@example.com
-user68,user68,User 68,user68@example.com
-user69,user69,User 69,user69@example.com
-user70,user70,User 70,user70@example.com
-user71,user71,User 71,user71@example.com
-user72,user72,User 72,user72@example.com
-user73,user73,User 73,user73@example.com
-user74,user74,User 74,user74@example.com
-user75,user75,User 75,user75@example.com
-user76,user76,User 76,user76@example.com
-user77,user77,User 77,user77@example.com
-user78,user78,User 78,user78@example.com
-user79,user79,User 79,user79@example.com
-user80,user80,User 80,user80@example.com
-user81,user81,User 81,user81@example.com
-user82,user82,User 82,user82@example.com
-user83,user83,User 83,user83@example.com
-user84,user84,User 84,user84@example.com
-user85,user85,User 85,user85@example.com
-user86,user86,User 86,user86@example.com
-user87,user87,User 87,user87@example.com
-user88,user88,User 88,user88@example.com
-user89,user89,User 89,user89@example.com
-user90,user90,User 90,user90@example.com
-user91,user91,User 91,user91@example.com
-user92,user92,User 92,user92@example.com
-user93,user93,User 93,user93@example.com
-user94,user94,User 94,user94@example.com
-user95,user95,User 95,user95@example.com
-user96,user96,User 96,user96@example.com
-user97,user97,User 97,user97@example.com
-user98,user98,User 98,user98@example.com
-user99,user99,User 99,user99@example.com
</del><ins>+user01,user01,User 01,user01@example.com,10000000-0000-0000-0000-000000000001
+user02,user02,User 02,user02@example.com,10000000-0000-0000-0000-000000000002
+user03,user03,User 03,user03@example.com,10000000-0000-0000-0000-000000000003
+user04,user04,User 04,user04@example.com,10000000-0000-0000-0000-000000000004
+user05,user05,User 05,user05@example.com,10000000-0000-0000-0000-000000000005
+user06,user06,User 06,user06@example.com,10000000-0000-0000-0000-000000000006
+user07,user07,User 07,user07@example.com,10000000-0000-0000-0000-000000000007
+user08,user08,User 08,user08@example.com,10000000-0000-0000-0000-000000000008
+user09,user09,User 09,user09@example.com,10000000-0000-0000-0000-000000000009
+user10,user10,User 10,user10@example.com,10000000-0000-0000-0000-000000000010
+user11,user11,User 11,user11@example.com,10000000-0000-0000-0000-000000000011
+user12,user12,User 12,user12@example.com,10000000-0000-0000-0000-000000000012
+user13,user13,User 13,user13@example.com,10000000-0000-0000-0000-000000000013
+user14,user14,User 14,user14@example.com,10000000-0000-0000-0000-000000000014
+user15,user15,User 15,user15@example.com,10000000-0000-0000-0000-000000000015
+user16,user16,User 16,user16@example.com,10000000-0000-0000-0000-000000000016
+user17,user17,User 17,user17@example.com,10000000-0000-0000-0000-000000000017
+user18,user18,User 18,user18@example.com,10000000-0000-0000-0000-000000000018
+user19,user19,User 19,user19@example.com,10000000-0000-0000-0000-000000000019
+user20,user20,User 20,user20@example.com,10000000-0000-0000-0000-000000000020
+user21,user21,User 21,user21@example.com,10000000-0000-0000-0000-000000000021
+user22,user22,User 22,user22@example.com,10000000-0000-0000-0000-000000000022
+user23,user23,User 23,user23@example.com,10000000-0000-0000-0000-000000000023
+user24,user24,User 24,user24@example.com,10000000-0000-0000-0000-000000000024
+user25,user25,User 25,user25@example.com,10000000-0000-0000-0000-000000000025
+user26,user26,User 26,user26@example.com,10000000-0000-0000-0000-000000000026
+user27,user27,User 27,user27@example.com,10000000-0000-0000-0000-000000000027
+user28,user28,User 28,user28@example.com,10000000-0000-0000-0000-000000000028
+user29,user29,User 29,user29@example.com,10000000-0000-0000-0000-000000000029
+user30,user30,User 30,user30@example.com,10000000-0000-0000-0000-000000000030
+user31,user31,User 31,user31@example.com,10000000-0000-0000-0000-000000000031
+user32,user32,User 32,user32@example.com,10000000-0000-0000-0000-000000000032
+user33,user33,User 33,user33@example.com,10000000-0000-0000-0000-000000000033
+user34,user34,User 34,user34@example.com,10000000-0000-0000-0000-000000000034
+user35,user35,User 35,user35@example.com,10000000-0000-0000-0000-000000000035
+user36,user36,User 36,user36@example.com,10000000-0000-0000-0000-000000000036
+user37,user37,User 37,user37@example.com,10000000-0000-0000-0000-000000000037
+user38,user38,User 38,user38@example.com,10000000-0000-0000-0000-000000000038
+user39,user39,User 39,user39@example.com,10000000-0000-0000-0000-000000000039
+user40,user40,User 40,user40@example.com,10000000-0000-0000-0000-000000000040
+user41,user41,User 41,user41@example.com,10000000-0000-0000-0000-000000000041
+user42,user42,User 42,user42@example.com,10000000-0000-0000-0000-000000000042
+user43,user43,User 43,user43@example.com,10000000-0000-0000-0000-000000000043
+user44,user44,User 44,user44@example.com,10000000-0000-0000-0000-000000000044
+user45,user45,User 45,user45@example.com,10000000-0000-0000-0000-000000000045
+user46,user46,User 46,user46@example.com,10000000-0000-0000-0000-000000000046
+user47,user47,User 47,user47@example.com,10000000-0000-0000-0000-000000000047
+user48,user48,User 48,user48@example.com,10000000-0000-0000-0000-000000000048
+user49,user49,User 49,user49@example.com,10000000-0000-0000-0000-000000000049
+user50,user50,User 50,user50@example.com,10000000-0000-0000-0000-000000000050
+user51,user51,User 51,user51@example.com,10000000-0000-0000-0000-000000000051
+user52,user52,User 52,user52@example.com,10000000-0000-0000-0000-000000000052
+user53,user53,User 53,user53@example.com,10000000-0000-0000-0000-000000000053
+user54,user54,User 54,user54@example.com,10000000-0000-0000-0000-000000000054
+user55,user55,User 55,user55@example.com,10000000-0000-0000-0000-000000000055
+user56,user56,User 56,user56@example.com,10000000-0000-0000-0000-000000000056
+user57,user57,User 57,user57@example.com,10000000-0000-0000-0000-000000000057
+user58,user58,User 58,user58@example.com,10000000-0000-0000-0000-000000000058
+user59,user59,User 59,user59@example.com,10000000-0000-0000-0000-000000000059
+user60,user60,User 60,user60@example.com,10000000-0000-0000-0000-000000000060
+user61,user61,User 61,user61@example.com,10000000-0000-0000-0000-000000000061
+user62,user62,User 62,user62@example.com,10000000-0000-0000-0000-000000000062
+user63,user63,User 63,user63@example.com,10000000-0000-0000-0000-000000000063
+user64,user64,User 64,user64@example.com,10000000-0000-0000-0000-000000000064
+user65,user65,User 65,user65@example.com,10000000-0000-0000-0000-000000000065
+user66,user66,User 66,user66@example.com,10000000-0000-0000-0000-000000000066
+user67,user67,User 67,user67@example.com,10000000-0000-0000-0000-000000000067
+user68,user68,User 68,user68@example.com,10000000-0000-0000-0000-000000000068
+user69,user69,User 69,user69@example.com,10000000-0000-0000-0000-000000000069
+user70,user70,User 70,user70@example.com,10000000-0000-0000-0000-000000000070
+user71,user71,User 71,user71@example.com,10000000-0000-0000-0000-000000000071
+user72,user72,User 72,user72@example.com,10000000-0000-0000-0000-000000000072
+user73,user73,User 73,user73@example.com,10000000-0000-0000-0000-000000000073
+user74,user74,User 74,user74@example.com,10000000-0000-0000-0000-000000000074
+user75,user75,User 75,user75@example.com,10000000-0000-0000-0000-000000000075
+user76,user76,User 76,user76@example.com,10000000-0000-0000-0000-000000000076
+user77,user77,User 77,user77@example.com,10000000-0000-0000-0000-000000000077
+user78,user78,User 78,user78@example.com,10000000-0000-0000-0000-000000000078
+user79,user79,User 79,user79@example.com,10000000-0000-0000-0000-000000000079
+user80,user80,User 80,user80@example.com,10000000-0000-0000-0000-000000000080
+user81,user81,User 81,user81@example.com,10000000-0000-0000-0000-000000000081
+user82,user82,User 82,user82@example.com,10000000-0000-0000-0000-000000000082
+user83,user83,User 83,user83@example.com,10000000-0000-0000-0000-000000000083
+user84,user84,User 84,user84@example.com,10000000-0000-0000-0000-000000000084
+user85,user85,User 85,user85@example.com,10000000-0000-0000-0000-000000000085
+user86,user86,User 86,user86@example.com,10000000-0000-0000-0000-000000000086
+user87,user87,User 87,user87@example.com,10000000-0000-0000-0000-000000000087
+user88,user88,User 88,user88@example.com,10000000-0000-0000-0000-000000000088
+user89,user89,User 89,user89@example.com,10000000-0000-0000-0000-000000000089
+user90,user90,User 90,user90@example.com,10000000-0000-0000-0000-000000000090
+user91,user91,User 91,user91@example.com,10000000-0000-0000-0000-000000000091
+user92,user92,User 92,user92@example.com,10000000-0000-0000-0000-000000000092
+user93,user93,User 93,user93@example.com,10000000-0000-0000-0000-000000000093
+user94,user94,User 94,user94@example.com,10000000-0000-0000-0000-000000000094
+user95,user95,User 95,user95@example.com,10000000-0000-0000-0000-000000000095
+user96,user96,User 96,user96@example.com,10000000-0000-0000-0000-000000000096
+user97,user97,User 97,user97@example.com,10000000-0000-0000-0000-000000000097
+user98,user98,User 98,user98@example.com,10000000-0000-0000-0000-000000000098
+user99,user99,User 99,user99@example.com,10000000-0000-0000-0000-000000000099
</ins></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (13779 => 13780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -729,8 +729,10 @@
</span><span class="cx"> for cuaddr in cuaddrs:
</span><span class="cx"> if cuaddr.toString().startswith(u"mailto:"):
</span><span class="cx"> self.email = cuaddr.toString()
</span><del>- elif cuaddr.toString().startswith(u"urn:"):
</del><ins>+ elif cuaddr.toString().startswith(u"urn:x-uid"):
</ins><span class="cx"> self.uuid = cuaddr.toString()
</span><ins>+ elif cuaddr.toString().startswith(u"urn:uuid") and self.uuid is None:
+ self.uuid = cuaddr.toString()
</ins><span class="cx"> if self.email is None:
</span><span class="cx"> raise ValueError("Cannot operate without a mail-style principal URL")
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py (13779 => 13780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -205,8 +205,9 @@
</span><span class="cx"> except IndexError:
</span><span class="cx"> continue
</span><span class="cx"> cuaddr = u'mailto:%s' % (record.email,)
</span><del>- uuid = u'urn:x-uid:%s' % (record.uid,)
- if cuaddr not in invitees and uuid not in invitees:
</del><ins>+ 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:
</ins><span class="cx"> break
</span><span class="cx"> else:
</span><span class="cx"> return fail(CannotAddAttendee("Can't find uninvited user to invite."))
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtestsimpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/sim.py (13779 => 13780)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,11 +54,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class _DirectoryRecord(object):
</span><del>- def __init__(self, uid, password, commonName, email):
</del><ins>+ def __init__(self, uid, password, commonName, email, guid):
</ins><span class="cx"> self.uid = uid
</span><span class="cx"> self.password = password
</span><span class="cx"> self.commonName = commonName
</span><span class="cx"> self.email = email
</span><ins>+ self.guid = guid
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -92,10 +93,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def recordsFromCount(count, uid=u"user%02d", password=u"user%02d",
</span><del>- commonName=u"User %02d", email=u"user%02d@example.com"):
</del><ins>+ commonName=u"User %02d", email=u"user%02d@example.com",
+ guid="10000000-0000-0000-0000-000000000%03d"):
</ins><span class="cx"> for i in range(1, count + 1):
</span><del>- yield _DirectoryRecord(uid % i, password % i,
- commonName % i, email % i)
</del><ins>+ yield _DirectoryRecord(
+ uid % i,
+ password % i,
+ commonName % i,
+ email % i,
+ guid % i,
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>