<!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>[15050] CalendarServer/branches/users/sredmond/clientsim/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/15050">15050</a></dd>
<dt>Author</dt> <dd>sredmond@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 14:24:30 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes imports of .stats module to .distributions module</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestprofilespy">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestrequesterpy">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsclientspy">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsdemoclientsplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsclientsoldplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigseventupdatesonlyplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigseventsonlyplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesacceptsplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesonlyrecurringplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesonlyplist">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestteststest_simpy">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsclientsjson">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json</a></li>
<li><a href="#CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsconfigjson">CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -35,8 +35,10 @@
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.ical import Property
</span><span class="cx">
</span><del>-from contrib.performance.stats import NearFutureDistribution, NormalDistribution, UniformDiscreteDistribution, BernoulliDistribution
-from contrib.performance.stats import LogNormalDistribution, RecurrenceDistribution
</del><ins>+from contrib.performance.loadtest.distributions import (
+ NearFutureDistribution, NormalDistribution, UniformDiscreteDistribution, BernoulliDistribution,
+ LogNormalDistribution, RecurrenceDistribution
+)
</ins><span class="cx"> from contrib.performance.loadtest.ical import IncorrectResponseCode
</span><span class="cx"> from contrib.performance.loadtest.resources import Calendar, Event
</span><span class="cx"> from contrib.performance.loadtest.templates import eventTemplate, alarmTemplate, taskTemplate
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestrequesterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> class Requester(object):
</span><span class="cx"> """
</span><span class="cx"> Utility to create requests on behalf of a client. Public methods are:
</span><del>- method url body headers status method_label
</del><ins>+ method url body headers status method_label
</ins><span class="cx"> ------------------------------------------------------------------------
</span><span class="cx"> GET req ---
</span><span class="cx"> POST req req
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsclientsjson"></a>
<div class="delfile"><h4>Deleted: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -1,211 +0,0 @@
</span><del>-
-
-calendars-only = {
- "clients": [
- {
- "software": "contrib.performance.loadtest.clients.OS_X_10_11",
- "params": {
- "title": "10.11",
- "calendarHomePollInterval": 5,
- "supportPush": false,
- "supportAmpPush": true
- },
- "profiles": [
- {
- "class": "contrib.performance.loadtest.profiles.CalendarMaker",
- "params": {
- "enabled": false,
- "interval": 15
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.CalendarUpdater",
- "params": {
- "enabled": true,
- "interval": 5
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.CalendarSharer",
- "params": {
- "enabled": true,
- "interval": 30
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.CalendarDeleter",
- "params": {
- "enabled": false,
- "interval": 30
- }
- }
- ],
- "weight": 1
- }
- ]
-}
-
-event-updates-only = {
- "clients": [
- {
- "software": "contrib.performance.loadtest.clients.OS_X_10_11",
- "params": {
- "title": "10.7",
- "calendarHomePollInterval": 300000,
- "supportPush": false,
- "supportAmpPush": false
- },
- "profiles": [
- {
- "class": "contrib.performance.loadtest.profiles.Eventer",
- "params": {
- "enabled": false,
- "interval": 20,
- "eventStartDistribution": {
- "type": "contrib.performance.stats.WorkDistribution",
- "params": {
- "daysOfWeek": ["mon", "tue", "wed", "thu", "fri"],
- "beginHour": 8,
- "endHour": 8,
- "tzname": "America/Los_Angeles"
- }
- },
- "recurrenceDistibution": {
- "type": "contrib.performance.stats.RecurrenceDistribution",
- "params": {
- "allowRecurrence": false,
- "weights": {
- "none": 50,
- "daily": 10,
- "weekly": 20,
- "monthly": 2,
- "yearly": 1,
- "dailylimit": 2,
- "weeklylimit": 5,
- "workdays": 10
- }
- }
- }
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.EventUpdater",
- "params": {
- "enabled": true,
- "interval": 5,
- "eventStartDistribution": {
- "type": "contrib.performance.stats.WorkDistribution",
- "params": {
- "daysOfWeek": ["mon", "tue", "wed", "thu", "fri"],
- "beginHour": 8,
- "endHour": 8,
- "tzname": "America/Los_Angeles"
- }
- },
- "recurrenceDistibution": {
- "type": "contrib.performance.stats.RecurrenceDistribution",
- "params": {
- "allowRecurrence": true,
- "weights": {
- "none": 50,
- "daily": 25,
- "weekly": 25,
- "monthly": 0,
- "yearly": 0,
- "dailylimit": 0,
- "weeklylimit": 0,
- "workdays": 0
- }
- }
- }
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.RealisticInviter",
- "params": {
- "enabled": false,
- "sendInvitationDistribution": {
- "type": "contrib.performance.stats.NormalDistribution",
- "params": {
- "mu": 10,
- "sigma": 5
- }
- },
- "inviteeDistribution": {
- "type": "contrib.performance.stats.UniformIntegerDistribution",
- "params": {
- "min": 0,
- "max": 99
- }
- },
- "inviteeClumping": true,
- "inviteeCountDistribution": {
- "type": "contrib.performance.stats.LogNormalDistribution",
- "params": {
- "mode": 1,
- "median": 6,
- "maximum": 100
- }
- },
- "eventStartDistribution": {
- "type": "contrib.performance.stats.WorkDistribution",
- "params": {
- "daysOfWeek": ["mon", "tue", "wed", "thu", "fri"],
- "beginHour": 8,
- "endHour": 8,
- "tzname": "America/Los_Angeles"
- }
- },
- "recurrenceDistibution": {
- "type": "contrib.performance.stats.RecurrenceDistribution",
- "params": {
- "allowRecurrence": false,
- "weights": {
- "none": 50,
- "daily": 10,
- "weekly": 20,
- "monthly": 2,
- "yearly": 1,
- "dailylimit": 2,
- "weeklylimit": 5,
- "workdays": 10
- }
- }
- }
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.Accepter",
- "params": {
- "enabled": false,
- "acceptDelayDistribution": {
- "type": "contrib.performance.stats.LogNormalDistribution",
- "params": {
- "mode": 300,
- "median": 1800
- }
- }
- }
- },
- {
- "class": "contrib.performance.loadtest.profiles.Tasker",
- "params": {
- "enabled": false,
- "interval": 300,
- "taskDueDistribution": {
- "type": "contrib.performance.stats.WorkDistribution",
- "params": {
- "daysOfWeek": ["mon", "tue", "wed", "thu", "fri"],
- "beginHour": 8,
- "endHour": 8,
- "tzname": "America/Los_Angeles"
- }
- }
- }
- }
- ],
- "weight": 1
- }
- ]
-}
-
</del></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsclientspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> from contrib.performance.loadtest.clients import iOS_5, OS_X_10_6, OS_X_10_7, OS_X_10_11
</span><span class="cx"> from contrib.performance.loadtest.profiles import CalendarMaker, CalendarUpdater, CalendarSharer, CalendarDeleter
</span><del>-from contrib.performance.stats import WorkDistribution, RecurrenceDistribution
</del><ins>+from contrib.performance.loadtest.distributions import WorkDistribution, RecurrenceDistribution
</ins><span class="cx">
</span><span class="cx"> from contrib.performance.loadtest.population import ProfileType
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsconfigjson"></a>
<div class="delfile"><h4>Deleted: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -1,113 +0,0 @@
</span><del>-config = {
- "server": "https://127.0.0.1:8443",
- "webadmin": {
- "enabled": true,
- "HTTPPort": 8080
- },
- "serverStats": {
- "enabled": true,
- "Port": 8100
- },
- "clientDataSerialization": {
- "UseOldData": true,
- "Path": "/tmp/sim"
- },
- "accounts": {
- "loader": "contrib.performance.loadtest.sim.recordsFromCSVFile",
- "params": {
- "path": "contrib/performance/loadtest/accounts.csv"
- }
- },
- "arrival": {
- "factory": "contrib.performance.loadtest.population.SmoothRampUp",
- "params": {
- "groups": 2,
- "groupSize": 1,
- "interval": 3,
- "clientsPerUser": 1
- }
- },
- "observers": [
- {
- "type": "contrib.performance.loadtest.logger.ReportStatistics",
- "params": {
- "thresholdsPath": "contrib/performance/loadtest/thresholds.json",
- "benchmarksPath": "contrib/performance/loadtest/benchmarks.json",
- "failCutoff": 1.0
- }
- },
- {
- "type": "contrib.performance.loadtest.logger.RequestLogger",
- "params": {}
- },
- {
- "type": "contrib.performance.loadtest.logger.OperationLogger",
- "params": {
- "thresholdsPath": "contrib/performance/loadtest/thresholds.json",
- "lagCutoff": 1.0,
- "failCutoff": 1.0
- }
- }
- ]
-}
-
-config-dist = {
- "workers": [
- "./bin/python contrib/performance/loadtest/ampsim.py",
- "./bin/python contrib/performance/loadtest/ampsim.py",
- "./bin/python contrib/performance/loadtest/ampsim.py",
- "./bin/python contrib/performance/loadtest/ampsim.py",
- "./bin/python contrib/performance/loadtest/ampsim.py",
- "./bin/python contrib/performance/loadtest/ampsim.py"
- ],
- "server": "https://127.0.0.1:8443",
- "webadmin": {
- "enabled": true,
- "HTTPPort": 8080
- },
- "serverStats": {
- "enabled": true,
- "Port": 8100
- },
- "clientDataSerialization": {
- "UseOldData": true,
- "Path": "/tmp/sim"
- },
- "accounts": {
- "loader": "contrib.performance.loadtest.sim.recordsFromCSVFile",
- "params": {
- "path": "contrib/performance/loadtest/accounts.csv"
- }
- },
- "arrival": {
- "factory": "contrib.performance.loadtest.population.SmoothRampUp",
- "params": {
- "groups": 99,
- "groupSize": 1,
- "interval": 3,
- "clientsPerUser": 1
- }
- },
- "observers": [
- {
- "type": "contrib.performance.loadtest.logger.ReportStatistics",
- "params": {
- "thresholdsPath": "contrib/performance/loadtest/thresholds.json",
- "benchmarksPath": "contrib/performance/loadtest/benchmarks.json",
- "failCutoff": 1.0
- }
- },
- {
- "type": "contrib.performance.loadtest.logger.RequestLogger",
- "params": {}
- },
- {
- "type": "contrib.performance.loadtest.logger.OperationLogger",
- "params": {
- "thresholdsPath": "contrib/performance/loadtest/thresholds.json",
- "lagCutoff": 1.0,
- "failCutoff": 1.0
- }
- }
- ]
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestsettingsdemoclientsplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsclientsoldplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> <key>sendInvitationDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.NormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.NormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mu gives the mean of the normal distribution (in seconds). -->
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> <key>inviteeDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformIntegerDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- The minimum value (inclusive) of the uniform distribution. -->
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> <key>inviteeCountDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> <key>acceptDelayDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigseventupdatesonlyplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> <key>sendInvitationDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.NormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.NormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mu gives the mean of the normal distribution (in seconds). -->
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> <key>inviteeDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformIntegerDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- The minimum value (inclusive) of the uniform distribution. -->
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> <key>inviteeCountDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> <key>acceptDelayDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigseventsonlyplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesacceptsplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> <key>sendInvitationDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- interval (in seconds). -->
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> <key>inviteeDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformIntegerDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- The minimum value (inclusive) of the uniform distribution. -->
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> <key>inviteeCountDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- Number of attendees. -->
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> <key>acceptDelayDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformDiscreteDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformDiscreteDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- Set of values to use - will be chosen in random order. -->
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesonlyrecurringplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> <key>sendInvitationDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- interval (in seconds). -->
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> <key>inviteeDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformIntegerDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- The minimum value (inclusive) of the uniform distribution. -->
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> <key>inviteeCountDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- Number of attendees. -->
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> <key>acceptDelayDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadteststandardconfigsinvitesonlyplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> <key>sendInvitationDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- interval (in seconds). -->
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> <key>inviteeDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.UniformIntegerDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- The minimum value (inclusive) of the uniform distribution. -->
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> <key>inviteeCountDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.FixedDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- Number of attendees. -->
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> RRULEs defined for this distribution and pick each based on a
</span><span class="cx"> weight. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.RecurrenceDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> <key>acceptDelayDistribution</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.LogNormalDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
</ins><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span><span class="cx"> <!-- mode - peak-->
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> in the near future, limited to certain days of the week and certain hours
</span><span class="cx"> of the day. -->
</span><span class="cx"> <key>type</key>
</span><del>- <string>contrib.performance.stats.WorkDistribution</string>
</del><ins>+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
</ins><span class="cx">
</span><span class="cx"> <key>params</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssredmondclientsimcontribperformanceloadtestteststest_simpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py (15049 => 15050)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py 2015-08-17 21:15:14 UTC (rev 15049)
+++ CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py 2015-08-17 21:24:30 UTC (rev 15050)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> from twisted.internet.defer import Deferred, succeed
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx">
</span><del>-from contrib.performance.stats import NormalDistribution
</del><ins>+from contrib.performance.loadtest.distributions import NormalDistribution
</ins><span class="cx"> from contrib.performance.loadtest.ical import OS_X_10_6
</span><span class="cx"> from contrib.performance.loadtest.profiles import Eventer, Inviter, Accepter
</span><span class="cx"> from contrib.performance.loadtest.population import (
</span></span></pre>
</div>
</div>
</body>
</html>