[CalendarServer-changes] [15050] CalendarServer/branches/users/sredmond/clientsim/contrib/ performance/loadtest
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 17 14:24:30 PDT 2015
Revision: 15050
http://trac.calendarserver.org//changeset/15050
Author: sredmond at apple.com
Date: 2015-08-17 14:24:30 -0700 (Mon, 17 Aug 2015)
Log Message:
-----------
Fixes imports of .stats module to .distributions module
Modified Paths:
--------------
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py
Removed Paths:
-------------
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json
CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/profiles.py
===================================================================
--- 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)
@@ -35,8 +35,10 @@
from twistedcaldav.ical import Property
-from contrib.performance.stats import NearFutureDistribution, NormalDistribution, UniformDiscreteDistribution, BernoulliDistribution
-from contrib.performance.stats import LogNormalDistribution, RecurrenceDistribution
+from contrib.performance.loadtest.distributions import (
+ NearFutureDistribution, NormalDistribution, UniformDiscreteDistribution, BernoulliDistribution,
+ LogNormalDistribution, RecurrenceDistribution
+)
from contrib.performance.loadtest.ical import IncorrectResponseCode
from contrib.performance.loadtest.resources import Calendar, Event
from contrib.performance.loadtest.templates import eventTemplate, alarmTemplate, taskTemplate
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/requester.py
===================================================================
--- 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)
@@ -24,7 +24,7 @@
class Requester(object):
"""
Utility to create requests on behalf of a client. Public methods are:
- method url body headers status method_label
+ method url body headers status method_label
------------------------------------------------------------------------
GET req ---
POST req req
Deleted: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.json
===================================================================
--- 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)
@@ -1,211 +0,0 @@
-
-
-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
- }
- ]
-}
-
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/clients.py
===================================================================
--- 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)
@@ -1,6 +1,6 @@
from contrib.performance.loadtest.clients import iOS_5, OS_X_10_6, OS_X_10_7, OS_X_10_11
from contrib.performance.loadtest.profiles import CalendarMaker, CalendarUpdater, CalendarSharer, CalendarDeleter
-from contrib.performance.stats import WorkDistribution, RecurrenceDistribution
+from contrib.performance.loadtest.distributions import WorkDistribution, RecurrenceDistribution
from contrib.performance.loadtest.population import ProfileType
Deleted: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/config.json
===================================================================
--- 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)
@@ -1,113 +0,0 @@
-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
- }
- }
- ]
-}
\ No newline at end of file
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/settings/demo-clients.plist
===================================================================
--- 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)
@@ -75,7 +75,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -123,7 +123,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/clients-old.plist
===================================================================
--- 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)
@@ -92,7 +92,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -130,7 +130,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -195,7 +195,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -233,7 +233,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -287,7 +287,7 @@
<key>sendInvitationDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.NormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.NormalDistribution</string>
<key>params</key>
<dict>
<!-- mu gives the mean of the normal distribution (in seconds). -->
@@ -314,7 +314,7 @@
<key>inviteeDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
<key>params</key>
<dict>
<!-- The minimum value (inclusive) of the uniform distribution. -->
@@ -341,7 +341,7 @@
<key>inviteeCountDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
@@ -366,7 +366,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -404,7 +404,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -464,7 +464,7 @@
<key>acceptDelayDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/event-updates-only.plist
===================================================================
--- 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)
@@ -87,7 +87,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -125,7 +125,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -190,7 +190,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -228,7 +228,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -282,7 +282,7 @@
<key>sendInvitationDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.NormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.NormalDistribution</string>
<key>params</key>
<dict>
<!-- mu gives the mean of the normal distribution (in seconds). -->
@@ -309,7 +309,7 @@
<key>inviteeDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
<key>params</key>
<dict>
<!-- The minimum value (inclusive) of the uniform distribution. -->
@@ -336,7 +336,7 @@
<key>inviteeCountDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
@@ -361,7 +361,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -399,7 +399,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -459,7 +459,7 @@
<key>acceptDelayDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
@@ -499,7 +499,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/events-only.plist
===================================================================
--- 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)
@@ -87,7 +87,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -125,7 +125,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -190,7 +190,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -228,7 +228,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-accepts.plist
===================================================================
--- 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)
@@ -87,7 +87,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -125,7 +125,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -190,7 +190,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -228,7 +228,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -282,7 +282,7 @@
<key>sendInvitationDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- interval (in seconds). -->
@@ -305,7 +305,7 @@
<key>inviteeDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
<key>params</key>
<dict>
<!-- The minimum value (inclusive) of the uniform distribution. -->
@@ -332,7 +332,7 @@
<key>inviteeCountDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- Number of attendees. -->
@@ -351,7 +351,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -389,7 +389,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -429,7 +429,7 @@
<key>acceptDelayDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformDiscreteDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformDiscreteDistribution</string>
<key>params</key>
<dict>
<!-- Set of values to use - will be chosen in random order. -->
@@ -474,7 +474,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only-recurring.plist
===================================================================
--- 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)
@@ -87,7 +87,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -125,7 +125,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -190,7 +190,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -228,7 +228,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -282,7 +282,7 @@
<key>sendInvitationDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- interval (in seconds). -->
@@ -305,7 +305,7 @@
<key>inviteeDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
<key>params</key>
<dict>
<!-- The minimum value (inclusive) of the uniform distribution. -->
@@ -332,7 +332,7 @@
<key>inviteeCountDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- Number of attendees. -->
@@ -351,7 +351,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -389,7 +389,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -429,7 +429,7 @@
<key>acceptDelayDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
@@ -469,7 +469,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/standard-configs/invites-only.plist
===================================================================
--- 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)
@@ -87,7 +87,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -125,7 +125,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -190,7 +190,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -228,7 +228,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -282,7 +282,7 @@
<key>sendInvitationDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- interval (in seconds). -->
@@ -305,7 +305,7 @@
<key>inviteeDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <string>contrib.performance.loadtest.distributions.UniformIntegerDistribution</string>
<key>params</key>
<dict>
<!-- The minimum value (inclusive) of the uniform distribution. -->
@@ -332,7 +332,7 @@
<key>inviteeCountDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.FixedDistribution</string>
+ <string>contrib.performance.loadtest.distributions.FixedDistribution</string>
<key>params</key>
<dict>
<!-- Number of attendees. -->
@@ -351,7 +351,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
@@ -389,7 +389,7 @@
RRULEs defined for this distribution and pick each based on a
weight. -->
<key>type</key>
- <string>contrib.performance.stats.RecurrenceDistribution</string>
+ <string>contrib.performance.loadtest.distributions.RecurrenceDistribution</string>
<key>params</key>
<dict>
@@ -449,7 +449,7 @@
<key>acceptDelayDistribution</key>
<dict>
<key>type</key>
- <string>contrib.performance.stats.LogNormalDistribution</string>
+ <string>contrib.performance.loadtest.distributions.LogNormalDistribution</string>
<key>params</key>
<dict>
<!-- mode - peak-->
@@ -489,7 +489,7 @@
in the near future, limited to certain days of the week and certain hours
of the day. -->
<key>type</key>
- <string>contrib.performance.stats.WorkDistribution</string>
+ <string>contrib.performance.loadtest.distributions.WorkDistribution</string>
<key>params</key>
<dict>
Modified: CalendarServer/branches/users/sredmond/clientsim/contrib/performance/loadtest/tests/test_sim.py
===================================================================
--- 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)
@@ -24,7 +24,7 @@
from twisted.internet.defer import Deferred, succeed
from twisted.trial.unittest import TestCase
-from contrib.performance.stats import NormalDistribution
+from contrib.performance.loadtest.distributions import NormalDistribution
from contrib.performance.loadtest.ical import OS_X_10_6
from contrib.performance.loadtest.profiles import Eventer, Inviter, Accepter
from contrib.performance.loadtest.population import (
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150817/a82f4479/attachment-0001.html>
More information about the calendarserver-changes
mailing list