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 19FF117808 for ; Thu, 6 Nov 2014 00:14:49 +0000 (UTC) Received: (qmail 92919 invoked by uid 500); 6 Nov 2014 00:14:49 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 92896 invoked by uid 500); 6 Nov 2014 00:14:49 -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 92887 invoked by uid 99); 6 Nov 2014 00:14:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 00:14:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 69595909BCD; Thu, 6 Nov 2014 00:14:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Thu, 06 Nov 2014 00:14:58 -0000 Message-Id: <3882e407902b4adf8c0ec85cc3316daa@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] git commit: adding create application adding create application Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4082891a Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4082891a Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4082891a Branch: refs/heads/two-dot-o Commit: 4082891a923a12f04e269b75d67bcaf1cf92da38 Parents: 035c818 Author: Shawn Feldman Authored: Fri Oct 31 17:21:40 2014 -0600 Committer: Shawn Feldman Committed: Fri Oct 31 17:21:40 2014 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/scenarios/ApplicationScenarios.scala | 4 ++-- .../scala/org/apache/usergrid/scenarios/NotifierScenarios.scala | 1 + .../simulations/PushNotificationTargetUserSimulation.scala | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4082891a/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 ffc7d96..d125f9d 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 @@ -36,10 +36,10 @@ import io.gatling.http.Predef._ object ApplicationScenarios { val createApplication = exec(http("Create Application") - .post("/management/organizations/${org}/applications") + .post(Settings.baseUrl + "/management/organizations/"+Settings.org+"/applications") .headers(Headers.jsonAuthorized) .body(StringBody("{\"name\":\"" + Settings.app + "\"}")) - .check(status.is(200)) + .check(status.in(200 to 204)) ) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4082891a/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 5c4f1f6..4349d92 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 @@ -56,6 +56,7 @@ object NotifierScenarios { .exec(http("Create Notifier") .post(Settings.baseAppUrl+"/notifiers") + .headers(Headers.jsonAuthorized) .body(StringBody("{\"name\":\"" + notifier + "\",\"provider\":\"" + provider + "\"}")) .check(status.in(200 to 400))) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4082891a/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 5a0e0d8..6ba55be 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 @@ -41,8 +41,9 @@ class PushNotificationTargetUserSimulation extends Simulation { val createUser = UserScenarios.postUser val createOrg = OrganizationScenarios.createOrgAndAdmin val connectUserToDevice = ConnectionScenarios.postUserToDeviceConnection + val createApp = ApplicationScenarios.createApplication - val getManagementToken = OrganizationScenarios.getManagementToken; + val getManagementToken = OrganizationScenarios.getManagementToken val getUserToken = UserScenarios.getUserToken @@ -54,6 +55,7 @@ class PushNotificationTargetUserSimulation extends Simulation { .feed(orgFeeder) .exec(createOrg) .exec(getManagementToken) + .exec(createApp) .exec(createNotifier) val scnToRun = scenario("Create Push Notification")