Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B9C9717EBC for ; Mon, 3 Nov 2014 15:17:47 +0000 (UTC) Received: (qmail 45890 invoked by uid 500); 3 Nov 2014 15:17:47 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 45865 invoked by uid 500); 3 Nov 2014 15:17:47 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 45856 invoked by uid 99); 3 Nov 2014 15:17:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Nov 2014 15:17:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5F82F99B8F5; Mon, 3 Nov 2014 15:17:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Mon, 03 Nov 2014 15:17:47 -0000 Message-Id: <23ddf7f611f547b6830f4e906634d2e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: add additional settings Repository: incubator-usergrid Updated Branches: refs/heads/key-row-sharding eec9a620e -> a5dc3a496 add additional settings Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3bfa4406 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3bfa4406 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3bfa4406 Branch: refs/heads/key-row-sharding Commit: 3bfa44066c0e6ae4d78f2c7c83c7e593b991c94e Parents: 4082891 Author: Shawn Feldman Authored: Mon Nov 3 08:17:00 2014 -0700 Committer: Shawn Feldman Committed: Mon Nov 3 08:17:00 2014 -0700 ---------------------------------------------------------------------- .../scenarios/OrganizationScenarios.scala | 4 ++-- .../org/apache/usergrid/settings/Settings.scala | 2 ++ .../PushNotificationTargetUserSimulation.scala | 21 +++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3bfa4406/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 8326d70..8761e18 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 @@ -37,7 +37,7 @@ object OrganizationScenarios { val createOrgAndAdmin = exec(http("Create Organization") .post(Settings.baseUrl+"/management/organizations") .headers(Headers.jsonAnonymous) - .body(StringBody("{\"organization\":\"" + Settings.org + "\",\"username\":\"" + Settings.org + "\",\"name\":\"${entityName}\",\"email\":\"${entityName}@apigee.com\",\"password\":\"test\"}")) + .body(StringBody("{\"organization\":\"" + Settings.org + "\",\"username\":\"" + Settings.admin + "\",\"name\":\"${entityName}\",\"email\":\"${entityName}@apigee.com\",\"password\":\""+Settings.password+"\"}")) .check(status.in(200 to 400)) ) @@ -45,7 +45,7 @@ object OrganizationScenarios { .post(Settings.baseUrl+"/management/token") .headers(Headers.jsonAnonymous) //pass in the the username and password, store the "access_token" json response element as the var "authToken" in the session - .body(StringBody("{\"username\":\"" + Settings.org + "\",\"password\":\"test\",\"grant_type\":\"password\"}")) + .body(StringBody("{\"username\":\"" + Settings.admin + "\",\"password\":\"test\",\"grant_type\":\"password\"}")) .check(jsonPath("$.access_token").find(0).saveAs("authToken")) ) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3bfa4406/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 1f3add5..df8d808 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 @@ -25,6 +25,8 @@ object Settings { // Target settings val org = System.getProperty("org") val app = System.getProperty("app") + val admin = System.getProperty("adminUser") + val password = System.getProperty("adminPassword") val baseUrl = System.getProperty("baseurl") val baseAppUrl = baseUrl + "/" + org + "/" + app val httpConf = http.baseURL(baseAppUrl) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3bfa4406/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala ---------------------------------------------------------------------- diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala index 6ba55be..16c5bc3 100644 --- a/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala +++ b/stack/loadtests/src/main/scala/org/apache/usergrid/simulations/PushNotificationTargetUserSimulation.scala @@ -55,8 +55,14 @@ class PushNotificationTargetUserSimulation extends Simulation { .feed(orgFeeder) .exec(createOrg) .exec(getManagementToken) + .exec(session => { + // print the Session for debugging, don't do that on real Simulations + println(session) + session + }) .exec(createApp) - .exec(createNotifier) + .exec(createNotifier).inject(atOnceUsers(1)) + .protocols(http.baseURL(Settings.baseUrl)) val scnToRun = scenario("Create Push Notification") .feed(userFeeder) @@ -67,11 +73,16 @@ class PushNotificationTargetUserSimulation extends Simulation { .exec(createDevice) .exec(connectUserToDevice) } + .exec(session => { + // print the Session for debugging, don't do that on real Simulations + println(session) + session + }) .exec(sendNotification) + .inject(nothingFor(15),constantUsersPerSec(numUsersPerSecond) during (duration)) + .throttle(reachRps(throttle) in (rampTime.seconds)) + .protocols(httpConf) - setUp( - scnCreateOrg.inject(atOnceUsers(1)).protocols(http.baseURL(Settings.baseUrl)), - scnToRun.inject(nothingFor(15), constantUsersPerSec(numUsersPerSecond) during (duration)) - .throttle(reachRps(throttle) in (rampTime.seconds)).protocols(httpConf)) + setUp(scnCreateOrg,scnToRun) }