You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/21 19:40:52 UTC
[52/58] [abbrv] git commit: updated vars in simulations
updated vars in simulations
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3b238802
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3b238802
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3b238802
Branch: refs/heads/loadtest
Commit: 3b238802f4d0f8f819b14bd472cd9c1eeaea05a9
Parents: 2231425
Author: amuramoto <am...@apigee.com>
Authored: Mon Sep 29 10:26:46 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Mon Sep 29 10:26:46 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/usergrid/scenarios/NotifierScenarios.scala | 4 ++--
.../test/scala/org/apache/usergrid/settings/Settings.scala | 2 +-
.../org/apache/usergrid/simulations/GetEntitySimulation.scala | 4 ++--
.../apache/usergrid/simulations/PushNotificationSimulation.scala | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b238802/stack/loadtests/simulations/test/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/simulations/test/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala b/stack/loadtests/simulations/test/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
index 8ec79fc..ea103fb 100755
--- a/stack/loadtests/simulations/test/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
+++ b/stack/loadtests/simulations/test/scala/org/apache/usergrid/scenarios/NotifierScenarios.scala
@@ -22,8 +22,8 @@ import scala.concurrent.duration._
*/
object NotifierScenarios {
- val notifier = Settings.notifier
- val notifier = Settings.provider
+ val notifier = Settings.pushNotifier
+ val provider = Settings.pushProvider
/**
* Create a notifier
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b238802/stack/loadtests/simulations/test/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/simulations/test/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/simulations/test/scala/org/apache/usergrid/settings/Settings.scala
index 05e3523..bcd15c9 100755
--- a/stack/loadtests/simulations/test/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/simulations/test/scala/org/apache/usergrid/settings/Settings.scala
@@ -19,7 +19,7 @@ object Settings {
val rampTime:Int = Integer.getInteger("rampTime", 0).toInt // in seconds
val duration:Int = Integer.getInteger("duration", 300).toInt // in seconds
- val rps:Int = Integer.getInteger("throttle", 50).toInt // in seconds
+ val throttle:Int = Integer.getInteger("throttle", 50).toInt // in seconds
// Geolocation settings
val centerLatitude:Double = 37.442348 // latitude of center point
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b238802/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala b/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
index c6a5ab3..3ca83be 100644
--- a/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
+++ b/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/GetEntitySimulation.scala
@@ -13,13 +13,13 @@ class GetEntitySimulation extends Simulation {
val numUsers:Int = Settings.numUsers
val numEntities:Int = Settings.numEntities
val rampTime:Int = Settings.rampTime
- val rps:Int = Settintgs.rps
+ val throttle:Int = Settings.throttle
val feeder = FeederGenerator.generateEntityNameFeeder("user", numEntities).circular
val scnToRun = scenario("GET entity")
.exec(UserScenarios.getRandomUser)
- setUp(scnToRun.inject(atOnceUsers(numUsers)).throttle(reachRps(rps) in (rampTime.seconds)).protocols(httpConf)).maxDuration(Settings.duration)
+ setUp(scnToRun.inject(atOnceUsers(numUsers)).throttle(reachRps(throttle) in (rampTime.seconds)).protocols(httpConf)).maxDuration(Settings.duration)
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3b238802/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/PushNotificationSimulation.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/PushNotificationSimulation.scala b/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/PushNotificationSimulation.scala
index 05f1d91..d157b0a 100755
--- a/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/PushNotificationSimulation.scala
+++ b/stack/loadtests/simulations/test/scala/org/apache/usergrid/simulations/PushNotificationSimulation.scala
@@ -15,7 +15,7 @@ class PushNotificationSimulation extends Simulation {
val numEntities:Int = Settings.numEntities
val rampTime:Int = Settings.rampTime
val throttle:Int = Settings.throttle
-
+ val duration:Int = Settings.duration
val httpConf = Settings.httpConf
.acceptHeader("application/json")
@@ -26,7 +26,7 @@ class PushNotificationSimulation extends Simulation {
val deviceNameFeeder = FeederGenerator.generateEntityNameFeeder("device", numEntities).circular
val scnToRun = scenario("Create Push Notification")
- .during(duration) {
+ .during(duration.seconds) {
feed(deviceNameFeeder)
.exec(sendNotification)
}