usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [2/5] usergrid git commit: USERGRID-871: Replace loadtests README
Date Fri, 28 Aug 2015 16:04:55 GMT
USERGRID-871: Replace loadtests README

Also move Headers.scala to helpers directory and remove unused rpsTarget and rpsRampTime configuration
parameters


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/14e088d5
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/14e088d5
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/14e088d5

Branch: refs/heads/two-dot-o-dev
Commit: 14e088d58ecefbbd74a495f04a17555367ff2daa
Parents: a3e7b7e
Author: Mike Dunker <mikedunker@calbears.net>
Authored: Wed Aug 26 07:57:37 2015 -0700
Committer: Mike Dunker <mikedunker@calbears.net>
Committed: Wed Aug 26 07:57:37 2015 -0700

----------------------------------------------------------------------
 stack/loadtests/.gitignore                      |   1 +
 stack/loadtests/README.md                       | 229 +++++++++++++++----
 stack/loadtests/runCollectionQueryTest.sh       |   2 +-
 stack/loadtests/runtests.sh                     | 120 ----------
 stack/loadtests/runtests_deprecated.sh          | 120 ++++++++++
 .../usergrid/enums/ConfigProperties.scala       |  12 +-
 .../org/apache/usergrid/helpers/Headers.scala   |  63 +++++
 .../scenarios/ApplicationScenarios.scala        |   3 +-
 .../usergrid/scenarios/AuditScenarios.scala     |   4 +-
 .../scenarios/ConnectionScenarios.scala         |   3 +-
 .../usergrid/scenarios/DeviceScenarios.scala    |   3 +-
 .../scenarios/EntityCollectionScenarios.scala   |   4 +-
 .../usergrid/scenarios/EntityScenarios.scala    |   2 +-
 .../usergrid/scenarios/GeoScenarios.scala       |   4 +-
 .../scenarios/NotificationScenarios.scala       |   3 +-
 .../usergrid/scenarios/NotifierScenarios.scala  |   3 +-
 .../scenarios/OrganizationScenarios.scala       |   3 +-
 .../usergrid/scenarios/TokenScenarios.scala     |   2 +-
 .../usergrid/scenarios/UserScenarios.scala      |   4 +-
 .../org/apache/usergrid/settings/Headers.scala  |  62 -----
 .../org/apache/usergrid/settings/Settings.scala |   2 -
 21 files changed, 398 insertions(+), 251 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/.gitignore
----------------------------------------------------------------------
diff --git a/stack/loadtests/.gitignore b/stack/loadtests/.gitignore
new file mode 100644
index 0000000..b012b3e
--- /dev/null
+++ b/stack/loadtests/.gitignore
@@ -0,0 +1 @@
+.java-version

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/README.md
----------------------------------------------------------------------
diff --git a/stack/loadtests/README.md b/stack/loadtests/README.md
index d497a10..0e70702 100644
--- a/stack/loadtests/README.md
+++ b/stack/loadtests/README.md
@@ -1,47 +1,192 @@
-#Running
-Gatling will run through mvn
+#Gatling Load Tests
+The Usergrid loadtests directory (/stack/loadtests) contains a framework for performance
testing [Apache Usergrid](http://usergrid.apache.org/). These tests currently use version
2.1.7 of [Gatling](http://gatling.io), an open-source load-testing tool.
+
+The test code is written in [Scala](http://www.scala-lang.org/), which is Gatling's test
language.
+
+##Usergrid Gatling test scripts
+The test scripts are found in the top level loadtests directory. Look inside the scripts
to see the details for running the tests.
+
+###testConfig.sh
+Contains defaults that are used for all the other test scripts.
+
+###runAuditGetAllAppCollectionEntities.sh
+For a specified organization, finds all apps, and for each app, finds all collections and
writes a CSV file line containing collection name, UUID, entity name, and modified timestamp
for each entity in each collection.
+
+###runAuditGetCollectionEntities.sh
+For a specified organization and application, finds all collections and writes a CSV file
line containing collection name, UUID, entity name, and modified timestamp for each entity
in each collection.
+
+###runAuditVerifyCollectionEntities.sh
+For a specified organization and given CSV file, verify that all entities are retrievable,
writing those that fail to another CSV file.
+
+###runCollectionQueryTest.sh
+For a given collection, retrieve all entities using a cursor and a query.
+
+###runCustomInjectRandomEntityByUuidTest.sh
+Gets random entity by UUIDs read from a CSV file. Includes custom injection steps.
+
+###runDeleteEntities.sh
+Deletes entities in order via name (prefix + entity number).
+
+###runGetEntitiesByNameSequential.sh
+Retrieves entities one by one via name (prefix + entity number).
+
+###runLoadEntities.sh
+Creates entities in order via name (prefix + entity number).
+
+###runLoadLargeMultiFieldEntities.sh
+Creates large multi-field entities in order via name (prefix + entity number).
+
+###runLoadNoNameEntities.sh
+Creates entities in order without names.
+
+###runLoadSortableEntities.sh
+Creates sortable entities in order via name (prefix + entity number).
+
+###runRandomEntityByNameQueryTest.sh
+Retrieves random entities via name (prefix + entity number) using queries.
+
+###runRandomEntityByNameTest.sh
+Retrieves random entities via name (prefix + entity number).
+
+###runRandomEntityByUuidTest.sh
+Retrieves random entities via UUID from a CSV file.
+
+###runUpdateEntities.sh
+Updates entities in order via name (prefix + entity number).
+
+##Gatling configuration items
+Understanding how configuration items work together can best be accomplished by reading the
Usergrid Gatling test scripts. Some configuration items are dependent on others, and some
are ignored by specific tests. Configuration items and their defaults can be found in the
ConfigProperties.scala enumeration in the enums directory. The spelling of each item below
is used in maven calls via -D{configName}={value} (for example, -Dorg=gatlingtest).
+
+Defaults listed are those that are specified by the Usergrid Gatling code, not necessarily
defaults in the test scripts. Defaults are **bold**.
+
+* org (no default) - organization name
+* app (no default) - application name
+* collection (**"customentities"**) - collection name
+* sandboxCollection (**false**) - set permissions to allow all users read/write of collection
(for anonymous access)
+* adminUser (no default) - username for administrative user (to get management tokens)
+* adminPassword (no default) - password for administrative user
+* appUser (no default) - username for application (non-management) user
+* appUserPassword (no default) - password for application user
+* baseUrl (no default) - base Usergrid URL (for example, https://api.usergrid.com); trailing
slash is optional
+* authType (**"anonymous"**, "token", "basic") - type of authorization for test (does not
affect setup operations)
+* tokenType ("none", **"user"**, "management") - type of token to use if authType = token
+* skipSetup (**false**) - skip entire setup section (can include creation of org and/or app,
loading entities, and/or setting a collection to have world read-write permissions)
+* createOrg (**false**) - create the organization specified by the org configuration item
(will continue if the org already exists)
+* createApp (**false**) - create the application specified by the app configuration item
(will continue if the app already exists)
+* loadEntities (**false**) - load entities as part of setup, instead of as part of the test
+* scenarioType (**"nameRandomInfinite"**, "uuidRandomInfinite", "getByNameSequential", "getAllByCursor",
"loadEntities", "updateEntities", "deleteEntities", "auditGetCollectionEntities", "auditVerifyCollectionEntities")
- type of scenario to run, more details in test scripts section below
+* rampUsers (**0**) - number of users to inject during the ramp up time
+* rampTime (**0**) - duration in seconds of the ramp up time
+* constantUsersPerSec (**0**) - number of users per second to inject during the constant
injection time (decimal ok)
+* constantUsersDuration (**10**) - duration in seconds of the constant injection time
+* numEntities (**5000**) - number of entities for the test
+* userSeed (**1**) - initial user seed; for example, if userSeed=5001 and numEntities=5000,
entities 5001-10000 will be created
+* entityPrefix (**"entity"**) - prefix for entity name (example of entity name including
prefix and entity number: "entity1")
+* entityType ("trivial", "trivialSortable", **"basic"**, "largeMultiField") - type of entity
to create (trivial = 1 field, trivialSortable = trivial + sortableField containing random
integer, basic = several fields with random values, largeMultiField = large entities with
*multiPropertyCount* fields, each containing a string *multiPropertySizeInK* * 1000 characters
long
+* multiPropertyPrefix (**"prop"**) - prefix for the largeMultiField entity's properties
+* multiPropertyCount (**1**) - number of properties for each entity
+* multiPropertySizeInK (**1**) - each property contains a string that is this number of kilobytes
long
+* entityNumberProperty (no default) - property name that should contain the entity number
(can be used for querying)
+* searchQuery (**""**) - query to be used for searching during test
+* searchLimit (**0**) - limit to be returned on searches
+* endConditionType (**"minutesElapsed"**, requestCount, unlimited) - end condition for the
test (minutes elapsed, number of requests made, or never end)
+* endMinutes (**10**) - number of minutes to run test (if endConditionType = minutesElapsed)
+* endRequestCount (**1000**) - number of requests before test is ended (if conditionType
= requestCount)
+* orgCreationUsername (no default) - username of admin account for org created during setup
+* orgCreationName (no default) - name of admin for org created during setup
+* orgCreationEmail (no default) - email address of admin for org created during setup
+* orgCreationPassword (**"test"**) - password for admin account for org created during setup
+* updateProperty (**"updateProp"**) - property name to be updated for update test
+* updateValue (**{current date}**) - value property should be given for update test
+* entityWorkerCount (**0**) - number of Gatling instances to be run at a time
+* entityWorkerNum (**0**) - worker number for this Gatling instance
+* uuidFilename (no default) - UUID filename for non-audit tests
+* auditUuidFilename (no default) - UUID filename for audit tests
+* failedUuidFilename (no default) - UUID filename for failed entries while auditing
+* retryCount (**5**) - number of retries of operation before giving up
+* purgeUsers (**100**) - number of entities to create at a time during loadEntities (send
this many requests, then wait for the responses)
+* laterThanTimestamp (**0**) - if specified for an audit, will only match entities modified
>= this timestamp; can be used for incremental audits
+* entityProgressCount (**10000**) - print to console every time this many requests has been
sent (if entityProgressCount = 10000, will print on the 1000th, 2000th, 3000th... request)
+* injectionList (**"rampUsers(10,60)"**) - custom injection pattern for CustomInjectionSimulation
(discussed below)
+* printFailedRequests (**true**) - prints the request and response on the console for failed
requests (those that fail more than *retryCount* times)
+* getViaQuery (**false**) - retrieve entities via query instead of via name or uuid
+
+The following settings are currently not used (were used by deprecated tests, but may be
valid in the future):
+
+* numDevices (**4000**) - number of devices for a push notification test
+* pushNotifier (**"loadNotifier"**) - push notifier
+* pushProvider (**"noop"**) - push provider
+* throttle (**50**) - maximum number of users at a time
+* holdDuration (**300**) - duration for test in seconds
+
+##User injection for tests
+The models for injection are based upon the simulation type chosen.
+
+###ConfigurableSimulation
+The configurable simulation currently has a single ramp up period (*rampUsers* are injected
evenly over *rampTime* seconds) followed by a constant injection period (*constantUsersPerSec*
are injected per second over *constantUsersDuration* number of seconds). This is a fairly
simple injection pattern -- use CustomInjectionSimulation for more control.
+
+###CustomInjectionSimulation
+*injectionList* allows a custom injection pattern for user creation by passing in a single
string containing [injection steps](http://gatling.io/docs/2.1.7/general/simulation_setup.html#injection)
separated by semicolons.
+
+* atOnceUsers(nbUsers) - injects a given number of users at once (Gatling injection example:
atOnceusers(10) )
+* constantUsersPerSec(rate,duration) - injects users at a constant rate, defined as users
per second, during a given duration (Gatling injection example: constantUsersPerSec(20) during(15
seconds) )
+* constantUsersPerSecRandomized(rate,duration) - injects users at a constant rated, defined
in users per second, during a given duration; users will be injected at randomized intervals
(Gatling injection example: constantUsersPerSec(20) during(15 seconds) randomized)
+* heavisideUsers(nbUsers,duration) - injects a given number of users following a smooth approximation
of the heaviside step function stretched to a given duration (Gatling injection example: heavisideUsers(1000)
over(20 seconds) )
+* nothingFor(duration) - pause for a given duration (Gatling injection example: nothingFor(4
seconds) )
+* rampUsers(nbUsers,duration) - injects a given number of users with a linear ramp over a
given duration in seconds (Gatling injection example: rampUsers(10) over 5 seconds)
+* rampUsersPerSec(rate1,rate2,duration) - injects users from starting rate to target rate,
defined in users per second, during a given duration; users will be injected at regular intervals
(Gatling injection example: rampUsersPerSec(rate1) to (rate2) during(duration) )
+* rampUsersPerSecRandomized(rate1,rate2,duration) - injects users from starting rate to target
rate, defined in users per second, during a given duration; users will be injected at randomized
intervals (Gatling injection example: rampUsersPerSec(rate1) to (rate2) during(duration) randomized)
+
+Example injectionList string: "rampUsers(100,300);nothingFor(60);constantUsersPerSecRandomized(10,120)"
+
+###AuditSimulation
+Audit simulation has only a single ramp up period (specified by *rampUsers* and *rampTime*).
+
+##loadtest structure
+Feel free to skip this section -- it contains information to help you understand the code
+
+* /stack/loadtests - Top level directory
+	* pom.xml - Gatling's Maven POM file
+	* testConfig.sh - contains defaults for configuration items (listed above)
+	* run*.sh - scripts that simplify running Usergrid Gatling test scripts (listed above)
+
+* /stack/loadtests/src - Code for Usergrid tests
+
+* /stack/loadtests/target - Contains code and resources when tests are compiled and run
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators - Contains code to generate
[Gatling feeders](http://gatling.io/docs/2.1.7/session/feeder.html) and build entities to
be stored in Usergrid collections during tests
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/enums - Contains enumerations for test
configuration items
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/helpers - Contains helper functionality
+	* Extractors.scala - extracts information from payloads and injects information into the
[Gatling session](http://gatling.io/docs/2.1.7/session/session_api.html)
+	* Headers.scala - common headers to be added into generated requests
+	* Setup.scala - contains functions to set up a test (for example, creation of an organization
or application) and get OAuth tokens
+	* Utils.scala - utilities to create random elements and URLs
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/scenarios - Contains [Gatling scenarios](http://gatling.io/docs/2.1.7/general/scenario.html)
used in the Gatling simulations; most of the current tests use the scenarios in EntityCollectionScenarios.scala
and AuditScenarios.scala
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/settings - Contains code to handle
test settings and generate CSV files for use in testing
+
+* /stack/loadtests/src/main/scala/org/apache/usergrid/simulations - Contains [Gatling simulations](http://gatling.io/docs/2.1.7/general/simulation_structure.html)
for running the tests
+	* AuditSimulation.scala - Tests for a) finding all entities in an organization and writing
the names and UUIDs to a CSV file, and b) validating the existence of the entities in the
CSV file; audit tests can be used to test that a copy/migration of an organization is complete
+	* ConfigurableSimulation.scala - contains many different types of tests that can be configured
via Gatling test shell script or maven Gatling call
+	* CustomInjectionSimulation.scala - tests that allow full configuration of [Gatling user
injection] via Gatling test shell script or maven Gatling call
+
+##Running tests using Maven
+Gatling uses [Apache Maven](https://maven.apache.org/) to handle dependencies and run the
tests. The test scripts run gatling via maven, and have good examples of the maven calls.
+
+###Example Maven (run from loadtests directory)
+
+    > mvn gatling:execute \
+       -Dorg=myorg
+       -Dapp=myapp
+       -DbaseUrl=http://api.usergrid.com
+       ...
+       -DscenarioType=loadEntities
+       -Dgatling.simulationClass=org.apache.usergrid.simulations.ConfigurableSimulation
 
-1. navigate to loadtests under stack
 
-1. execute mvn gatling:execute with these options
 
-    *Required
-    > -Dthrottle={maxReqsSec} -Dduration={durationInSecs} -Dorg={org}  -Dapp={appName}
-Dbaseurl={uriNoProceedingSlash} -DnumEntities={numberOfEntitiesYouWantToCreateInteger} -DmaxPossibleUsers={totalUsersInteger}
-DrampTime={rampTimeIntegerSeconds} -DadminUser={username} -DadminPassword={pwd} -Dgatling.simulationClass={simulationFQDN}
-
-    *Addional optional settings 
-        
-    >-DpushNotifier={notifierName} -DpushProvider={noop_apns_or_gcm} -DskipSetup={boolean}
-
-    skipSetup will skip the setup steps
-
-    So running will look something like this
-    >mvn gatling:execute -Dthrottle=100 -Dduration=300 -Dorg=usergrid  -Dapp=load -Dbaseurl=http://load.usergrid.com
-DnumEntities=300 -DmaxPossibleUsers=600 -DrampTime=30 -DadminUser=usergrid -DadminPassword=test
-Dgatling.simulationClass=org.apache.usergrid.simulations.deprecated.AppSimulation
-    
-    Setting the users and duration => Injects a given number of users with a linear ramp
over a given duration. users must be greater than duration
-    
-    Setting the throttle and ramptime => will attempt to hit a set reqs/sec over a given
time period.  If users and duration are not great enough then you will never hit your throttle
-    
-    Values for simulation are 'all','connections'
-    
-    Also see http://gatling.io/docs/2.0.2/general/simulation_setup.html
-    
-    Additional docs can be found here http://gatling.io/docs/2.0.2/
-
-##Running a Push Notification Simulation
-
-1. Set up all users in the system with 2 devices each.
-
-    >mvn compile gatling:execute -Dgatling.simulationClass=org.apache.usergrid.simulations.deprecated.SetupSimulation
-DadminUser=usergrid -DadminPassword=test -Dorg=usergrid  -Dapp=load -Dthrottle=100 -Dbaseurl=http://loadtest.usergrid.com
-DmaxPossibleUsers=1000
-
-
-    Note the following.
-
-
-    **throttle:**  The max number of users + devices per second to create
-
-    **maxPossibleUsers:**  The maximum number of users the simulation will create before
exiting
-
-
-1. No
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/runCollectionQueryTest.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/runCollectionQueryTest.sh b/stack/loadtests/runCollectionQueryTest.sh
index 7e5ad88..714b817 100755
--- a/stack/loadtests/runCollectionQueryTest.sh
+++ b/stack/loadtests/runCollectionQueryTest.sh
@@ -57,7 +57,7 @@ SCENARIO_TYPE=getAllByCursor
 mvn compile
 
 #Execute the test
-mvn gatling:execute -Dorg=usergrid \
+mvn gatling:execute \
 -DbaseUrl=${URL} \
 -DadminUser=${ADMIN_USER}  \
 -DadminPassword=${ADMIN_PASSWORD}  \

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/runtests.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/runtests.sh b/stack/loadtests/runtests.sh
deleted file mode 100755
index ea9658c..0000000
--- a/stack/loadtests/runtests.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#               http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-die() { echo "$@" 1>&2 ; exit 1; }
-
-####
-#This is a script to simplify running gatling tests.  It will default several parameters,
invoke the maven plugins
-#Then aggregate the results
-####
-[ "$#" -eq 4 ] || die "4 arguments required, $# provided.  Example is $0 URL MAX_CONCURRENT_USERS
RAMP_TIME(seconds) DURATION_TIME(seconds)"
-
-URL="$1"
-MAX_CONCURRENT_USERS="$2"
-RAMP_TIME="$3"
-DURATION_TIME="$4"
-
-shift 4
-
-#Compile everything
-mvn compile
-
-#Set the app id to be a date epoch for uniqueness
-APP1=$(date +%s)
-
-
-
-#Execute the post step
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--DrampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.PostUsersSimulation \
--Dapp=${APP1}
-
-
-#Execute the get users by username
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--DrampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.GetUsersSimulation \
--Dapp=${APP1}
-
-
-#Execute the get users by page
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--DrampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.GetUserPagesSimulation \
--Dapp=${APP1}
-
-
-APP2=$(date +%s)
-
-#Execute put users to create them
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--DrampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.PutUsersSimulation \
--Dapp=${APP2}
-
-#Execute the put users to update them
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--rampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.PutUsersSimulation \
--Dapp=${APP2}
-
-
-#Execute the delete to remove them
-mvn gatling:execute -Dorg=usergrid \
--Dbaseurl=${URL} \
--DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
--DrampTime=${RAMP_TIME}  \
--DadminUser=usergrid  \
--DadminPassword=test  \
--Dduration=${DURATION_TIME}    \
--Dgatling.simulationClass=org.apache.usergrid.simulations.DeleteUsersSimulation \
--Dapp=${APP2}
-
-
-#Now move all the reports
-#AGGREGATE_DIR="target/aggregate-$(date +%s)"
-
-#mkdir -p ${AGGREGATE_DIR}
-
-
-#copy to the format of target/aggregate(date)/(simnulationame)-simulation.log
-#find target -name "simulation.log" -exec cp {} ${AGGREGATE_DIR}/$(basename $(dirname {}
))-simulation.log  \;
-

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/runtests_deprecated.sh
----------------------------------------------------------------------
diff --git a/stack/loadtests/runtests_deprecated.sh b/stack/loadtests/runtests_deprecated.sh
new file mode 100755
index 0000000..ea9658c
--- /dev/null
+++ b/stack/loadtests/runtests_deprecated.sh
@@ -0,0 +1,120 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#               http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+die() { echo "$@" 1>&2 ; exit 1; }
+
+####
+#This is a script to simplify running gatling tests.  It will default several parameters,
invoke the maven plugins
+#Then aggregate the results
+####
+[ "$#" -eq 4 ] || die "4 arguments required, $# provided.  Example is $0 URL MAX_CONCURRENT_USERS
RAMP_TIME(seconds) DURATION_TIME(seconds)"
+
+URL="$1"
+MAX_CONCURRENT_USERS="$2"
+RAMP_TIME="$3"
+DURATION_TIME="$4"
+
+shift 4
+
+#Compile everything
+mvn compile
+
+#Set the app id to be a date epoch for uniqueness
+APP1=$(date +%s)
+
+
+
+#Execute the post step
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-DrampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.PostUsersSimulation \
+-Dapp=${APP1}
+
+
+#Execute the get users by username
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-DrampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.GetUsersSimulation \
+-Dapp=${APP1}
+
+
+#Execute the get users by page
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-DrampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.GetUserPagesSimulation \
+-Dapp=${APP1}
+
+
+APP2=$(date +%s)
+
+#Execute put users to create them
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-DrampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.PutUsersSimulation \
+-Dapp=${APP2}
+
+#Execute the put users to update them
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-rampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.PutUsersSimulation \
+-Dapp=${APP2}
+
+
+#Execute the delete to remove them
+mvn gatling:execute -Dorg=usergrid \
+-Dbaseurl=${URL} \
+-DmaxPossibleUsers=${MAX_CONCURRENT_USERS}  \
+-DrampTime=${RAMP_TIME}  \
+-DadminUser=usergrid  \
+-DadminPassword=test  \
+-Dduration=${DURATION_TIME}    \
+-Dgatling.simulationClass=org.apache.usergrid.simulations.DeleteUsersSimulation \
+-Dapp=${APP2}
+
+
+#Now move all the reports
+#AGGREGATE_DIR="target/aggregate-$(date +%s)"
+
+#mkdir -p ${AGGREGATE_DIR}
+
+
+#copy to the format of target/aggregate(date)/(simnulationame)-simulation.log
+#find target -name "simulation.log" -exec cp {} ${AGGREGATE_DIR}/$(basename $(dirname {}
))-simulation.log  \;
+

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
index 8a4fd53..0a5f5af 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
@@ -45,8 +45,6 @@ object ConfigProperties {
   val Collection = "collection"
   val RampTime = "rampTime"
   val Throttle = "throttle"
-  val RpsTarget = "rpsTarget"
-  val RpsRampTime = "rpsRampTime"
   val HoldDuration = "holdDuration"
   val PushNotifier = "pushNotifier"
   val PushProvider = "pushProvider"
@@ -84,7 +82,7 @@ object ConfigProperties {
 
   val Values = Seq(Org,App,AdminUser,AdminPassword,BaseUrl,AuthType,TokenType,SkipSetup,CreateOrg,CreateApp,LoadEntities,
     ScenarioType,RampUsers,ConstantUsersPerSec,ConstantUsersDuration,UserSeed,AppUser,AppUserPassword,NumEntities,
-    NumDevices,Collection,RampTime,Throttle,RpsTarget,RpsRampTime,HoldDuration,PushNotifier,PushProvider,EntityPrefix,
+    NumDevices,Collection,RampTime,Throttle,HoldDuration,PushNotifier,PushProvider,EntityPrefix,
     EntityType,EntitySeed,SearchLimit,SearchQuery,EndConditionType,EndMinutes,EndRequestCount,OrgCreationUsername,
     OrgCreationName,OrgCreationEmail,OrgCreationPassword,UpdateProperty,UpdateValue,EntityWorkerCount,EntityWorkerNum,
     UuidFilename,AuditUuidFilename,FailedUuidFilename,SandboxCollection,PurgeUsers,RetryCount,LaterThanTimestamp,
@@ -122,8 +120,6 @@ object ConfigProperties {
         case Collection => "customentities"
         case RampTime => 0
         case Throttle => 50
-        case RpsTarget => 50
-        case RpsRampTime => 10
         case HoldDuration => 300
         case PushNotifier => "loadNotifier"
         case PushProvider => "noop"
@@ -143,9 +139,9 @@ object ConfigProperties {
         case UpdateValue => new Date().toString
         case EntityWorkerCount => 0
         case EntityWorkerNum => 0
-        case UuidFilename => "dummyUuid.csv"
-        case AuditUuidFilename => "dummyAuditUuid.csv"
-        case FailedUuidFilename => "/tmp/dummy.csv"
+        case UuidFilename => "/tmp/dummyUuid.csv"
+        case AuditUuidFilename => "/tmp/dummyAuditUuid.csv"
+        case FailedUuidFilename => "/tmp/dummyFailedUuid.csv"
         case SandboxCollection => false
         case PurgeUsers => 100
         case RetryCount => 5

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/helpers/Headers.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/helpers/Headers.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/helpers/Headers.scala
new file mode 100755
index 0000000..9feb197
--- /dev/null
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/helpers/Headers.scala
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.usergrid.helpers
+
+import org.apache.usergrid.enums.AuthType
+import org.apache.usergrid.settings.Settings
+
+/**
+ *
+ */
+object Headers {
+
+  /**
+   * Headers for anonymous posts
+   */
+  val authAnonymous = Map(
+    "Cache-Control" -> """no-cache""",
+    "Content-Type" -> """application/json; charset=UTF-8"""
+  )
+
+  /**
+   * Headers for authorized users with token and json content type
+   */
+  val authToken = Map(
+    "Cache-Control" -> """no-cache""",
+    "Content-Type" -> """application/json; charset=UTF-8""",
+    "Authorization" -> "Bearer ${authToken}"
+  )
+
+  /**
+  * Headers for basic auth
+  */
+  val authBasic = Map(
+    "Cache-Control" -> """no-cache""",
+    "Content-Type" -> """application/json; charset=UTF-8""",
+    "Authorization" -> ("Basic " + Settings.appUserBase64)
+  )
+
+  /**
+  * Header selector
+  */
+  def auth(authType:String): Map[String, String] = {
+    if (authType == AuthType.Basic) authBasic
+    else if (authType == AuthType.Token) authToken
+    else authAnonymous
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
index 085af88..d47b7e8 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
@@ -18,7 +18,8 @@
 
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
-import org.apache.usergrid.settings.{Settings, Headers}
+ import org.apache.usergrid.helpers.Headers
+ import org.apache.usergrid.settings.Settings
 
  /**
  * Performs organization registration

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
index 3860c7c..3a7121b 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
@@ -22,8 +22,8 @@ import io.gatling.http.Predef._
 import org.apache.usergrid.datagenerators.FeederGenerator
 import org.apache.usergrid.enums.{AuthType, EndConditionType}
 import org.apache.usergrid.helpers.Extractors._
-import org.apache.usergrid.helpers.Utils
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.helpers.{Headers, Utils}
+import org.apache.usergrid.settings.Settings
 
 /**
  * Provides CRUD methods for audits

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
index 56a40bb..9f613da 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ConnectionScenarios.scala
@@ -19,7 +19,8 @@ package org.apache.usergrid.scenarios
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
 import org.apache.usergrid.datagenerators.FeederGenerator
-import org.apache.usergrid.settings.{Settings, Headers}
+import org.apache.usergrid.helpers.Headers
+import org.apache.usergrid.settings.Settings
 
 object ConnectionScenarios {
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
index 57df0b9..28aa935 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/DeviceScenarios.scala
@@ -19,7 +19,8 @@ package org.apache.usergrid.scenarios
 import io.gatling.core.Predef._
 import io.gatling.http.Predef.StringBody
 import io.gatling.http.Predef._
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.helpers.Headers
+import org.apache.usergrid.settings.Settings
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
index eb7fce2..354420b 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityCollectionScenarios.scala
@@ -22,8 +22,8 @@ import io.gatling.http.Predef._
 import org.apache.usergrid.datagenerators.FeederGenerator
 import org.apache.usergrid.enums.{EndConditionType, AuthType}
 import org.apache.usergrid.helpers.Extractors._
-import org.apache.usergrid.helpers.Utils
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.helpers.{Headers, Utils}
+import org.apache.usergrid.settings.Settings
 
 /**
  * Provides CRUD methods for custom entities

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityScenarios.scala
index df1657b..1171296 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/EntityScenarios.scala
@@ -18,7 +18,7 @@ package org.apache.usergrid.scenarios
 
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
-import org.apache.usergrid.settings.Headers
+import org.apache.usergrid.helpers.Headers
 
 
 /**

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
index d7b108e..5487cd4 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/GeoScenarios.scala
@@ -18,8 +18,8 @@
 
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
-import org.apache.usergrid.helpers.Utils
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.helpers.{Headers, Utils}
+import org.apache.usergrid.settings.Settings
 
 object GeoScenarios {
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
index 738c43a..1bd2a27 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotificationScenarios.scala
@@ -18,8 +18,9 @@ package org.apache.usergrid.scenarios
 
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
+import org.apache.usergrid.helpers.Headers
 
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.settings.Settings
 
 
 /**

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
index 11f57bd..a16b800 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
@@ -18,7 +18,8 @@ package org.apache.usergrid.scenarios
 
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.helpers.Headers
+import org.apache.usergrid.settings.Settings
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
index 3e6593d..d835cf1 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
@@ -19,7 +19,8 @@ package org.apache.usergrid.scenarios
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
 import org.apache.usergrid.datagenerators.FeederGenerator
-import org.apache.usergrid.settings.{Settings, Headers}
+import org.apache.usergrid.helpers.Headers
+import org.apache.usergrid.settings.Settings
 
 /**
  * Performs organization registration

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
index c7ff4db..bfe3064 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
@@ -19,7 +19,7 @@ package org.apache.usergrid.scenarios
 import io.gatling.core.Predef._
 import io.gatling.http.Predef._
 import io.gatling.http.request.StringBody
-import org.apache.usergrid.settings.Headers
+import org.apache.usergrid.helpers.Headers
 import org.apache.usergrid.settings.Settings
 
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
index 7269af7..39540c6 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/UserScenarios.scala
@@ -21,9 +21,9 @@ import io.gatling.core.Predef._
 import io.gatling.http.Predef._
 import io.gatling.http.request.StringBody
 import org.apache.usergrid.datagenerators.FeederGenerator
-import org.apache.usergrid.settings.{Headers, Settings}
+import org.apache.usergrid.settings.Settings
 import org.apache.usergrid.helpers.Extractors._
-import org.apache.usergrid.helpers.Utils
+import org.apache.usergrid.helpers.{Headers, Utils}
 
 
 object UserScenarios {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Headers.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Headers.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Headers.scala
deleted file mode 100755
index d158f0c..0000000
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Headers.scala
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.settings
-
-import org.apache.usergrid.enums.AuthType
-
- /**
- *
- */
-object Headers {
-
-  /**
-   * Headers for anonymous posts
-   */
-  val authAnonymous = Map(
-    "Cache-Control" -> """no-cache""",
-    "Content-Type" -> """application/json; charset=UTF-8"""
-  )
-
-  /**
-   * Headers for authorized users with token and json content type
-   */
-  val authToken = Map(
-    "Cache-Control" -> """no-cache""",
-    "Content-Type" -> """application/json; charset=UTF-8""",
-    "Authorization" -> "Bearer ${authToken}"
-  )
-
-  /**
-  * Headers for basic auth
-  */
-  val authBasic = Map(
-    "Cache-Control" -> """no-cache""",
-    "Content-Type" -> """application/json; charset=UTF-8""",
-    "Authorization" -> ("Basic " + Settings.appUserBase64)
-  )
-
-  /**
-  * Header selector
-  */
-  def auth(authType:String): Map[String, String] = {
-    if (authType == AuthType.Basic) authBasic
-    else if (authType == AuthType.Token) authToken
-    else authAnonymous
-  }
-
-
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/14e088d5/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 7ce8d0a..c78a347 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -138,8 +138,6 @@ object Settings {
 
   val rampTime:Int = initIntSetting(ConfigProperties.RampTime) // in seconds
   val throttle:Int = initIntSetting(ConfigProperties.Throttle) // in seconds
-  val rpsTarget:Int = initIntSetting(ConfigProperties.RpsTarget) // requests per second target
-  val rpsRampTime:Int = initIntSetting(ConfigProperties.RpsRampTime) // in seconds
   val holdDuration:Int = initIntSetting(ConfigProperties.HoldDuration) // in seconds
 
   // Geolocation settings


Mime
View raw message