USERGRID-1044: for org/app/collection create, default to testConfig settings
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fc23b79e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fc23b79e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fc23b79e Branch: refs/heads/USERGRID-909 Commit: fc23b79e9a8a08bc57d25e3e60a9718304f8f1c0 Parents: 0389744 Author: Mike Dunker <mdun...@apigee.com> Authored: Tue Oct 27 16:39:33 2015 -0700 Committer: Mike Dunker <mdun...@apigee.com> Committed: Tue Oct 27 16:39:33 2015 -0700 ---------------------------------------------------------------------- stack/loadtests/runOrgAppSetup.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/fc23b79e/stack/loadtests/runOrgAppSetup.sh ---------------------------------------------------------------------- diff --git a/stack/loadtests/runOrgAppSetup.sh b/stack/loadtests/runOrgAppSetup.sh index 19936b7..b26eb37 100755 --- a/stack/loadtests/runOrgAppSetup.sh +++ b/stack/loadtests/runOrgAppSetup.sh @@ -29,6 +29,9 @@ if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi #ENTITY_TYPE= #ENTITY_PREFIX= #ENTITY_SEED= #may be overridden on command line +#ORG= #may be overridden on command line +#APP= #may be overridden on command line +#COLLECTION= #may be overridden on command line #RETRY_COUNT= #ENTITY_PROGRESS_COUNT= #CONSTANT_USERS_PER_SEC= @@ -36,14 +39,14 @@ if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi die() { echo "$@" 1>&2 ; exit 1; } -[ "$#" -ge 2 ] || die "At least 2 arguments required, $# provided. Example is $0 ORG APP [COLLECTION [SANDBOX_COLLECTION (true/false)]]" +[ "$#" -ge 1 ] || die "At least 1 argument required, $# provided. Example is $0 SANDBOX_COLLECTION(true/false) [ORG [APP [COLLECTION]]]" -ORG="$1" -APP="$2" -COLLECTION="gatlingitems" -[ "$#" -ge 3 ] && COLLECTION="$3" -SANDBOX_COLLECTION=true -[ "$#" -ge 4 ] && SANDBOX_COLLECTION="$4" + +SANDBOX_COLLECTION="$1" +# org, app, and collection can come from testConfig.sh +[ "$#" -ge 2 ] && ORG="$2" +[ "$#" -ge 3 ] && APP="$3" +[ "$#" -ge 4 ] && COLLECTION="$4" shift $#