From: Tommi Virtanen Date: Tue, 26 Jul 2011 16:47:06 +0000 (-0700) Subject: Say ".yaml" not ".yml". This is not MS-DOS, and YML is a Yahoo XML dialect. X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e17c56a71437ff2817391719a553114def5e4e1b;p=s3-tests.git Say ".yaml" not ".yml". This is not MS-DOS, and YML is a Yahoo XML dialect. --- diff --git a/.gitignore b/.gitignore index af458172..bcbae805 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ /*.egg-info /virtualenv -config.yml +config.yaml diff --git a/config.yaml.SAMPLE b/config.yaml.SAMPLE new file mode 100644 index 00000000..2dece1e8 --- /dev/null +++ b/config.yaml.SAMPLE @@ -0,0 +1,82 @@ +fixtures: +## All the buckets created will start with this prefix; +## {random} will be filled with random characters to pad +## the prefix to 30 characters long, and avoid collisions + bucket prefix: YOURNAMEHERE-{random}- + +file_generation: + groups: +## File generation works by creating N groups of files. Each group of +## files is defined by three elements: number of files, avg(filesize), +## and stddev(filesize) -- in that order. + - [1, 2, 3] + - [4, 5, 6] + +## Config for the readwrite tool. +## The readwrite tool concurrently reads and writes to files in a +## single bucket for a set duration. +## Note: the readwrite tool does not need the s3.alt connection info. +## only s3.main is used. +rand_readwrite: +## The number of reader and writer worker threads. This sets how many +## files will be read and written concurrently. + readers: 2 + writers: 2 +## The duration to run in seconds. Doesn't count setup/warmup time + duration: 15 + + files: +## The number of files to use. This number of files is created during the +## "warmup" phase. After the warmup, readers will randomly pick a file to +## read, and writers will randomly pick a file to overwrite + num: 3 +## The file size to use, in KB + size: 1024 +## The stddev for the file size, in KB + stddev: 0 + +s3: +## This section contains all the connection information + + defaults: +## This section contains the defaults for all of the other connections +## below. You can also place these variables directly there. + +## Replace with e.g. "localhost" to run against local software + host: s3.amazonaws.com + +## Uncomment the port to use soemthing other than 80 +# port: 8080 + +## Say "no" to disable TLS. + is_secure: yes + +## The tests assume two accounts are defined, "main" and "alt". You +## may add other connections to be instantianted as well, however +## any additional ones will not be used unless your tests use them. + + main: + +## The User ID that the S3 provider gives you. For AWS, this is +## typically a 64-char hexstring. + user_id: AWS_USER_ID + +## Display name typically looks more like a unix login, "jdoe" etc + display_name: AWS_DISPLAY_NAME + +## The email for this account. + email: AWS_EMAIL + +## Replace these with your access keys. + access_key: AWS_ACCESS_KEY + secret_key: AWS_SECRET_KEY + + alt: +## Another user accout, used for ACL-related tests. + + user_id: AWS_USER_ID + display_name: AWS_DISPLAY_NAME + email: AWS_EMAIL + access_key: AWS_ACCESS_KEY + secret_key: AWS_SECRET_KEY + diff --git a/config.yml.SAMPLE b/config.yml.SAMPLE deleted file mode 100644 index 2dece1e8..00000000 --- a/config.yml.SAMPLE +++ /dev/null @@ -1,82 +0,0 @@ -fixtures: -## All the buckets created will start with this prefix; -## {random} will be filled with random characters to pad -## the prefix to 30 characters long, and avoid collisions - bucket prefix: YOURNAMEHERE-{random}- - -file_generation: - groups: -## File generation works by creating N groups of files. Each group of -## files is defined by three elements: number of files, avg(filesize), -## and stddev(filesize) -- in that order. - - [1, 2, 3] - - [4, 5, 6] - -## Config for the readwrite tool. -## The readwrite tool concurrently reads and writes to files in a -## single bucket for a set duration. -## Note: the readwrite tool does not need the s3.alt connection info. -## only s3.main is used. -rand_readwrite: -## The number of reader and writer worker threads. This sets how many -## files will be read and written concurrently. - readers: 2 - writers: 2 -## The duration to run in seconds. Doesn't count setup/warmup time - duration: 15 - - files: -## The number of files to use. This number of files is created during the -## "warmup" phase. After the warmup, readers will randomly pick a file to -## read, and writers will randomly pick a file to overwrite - num: 3 -## The file size to use, in KB - size: 1024 -## The stddev for the file size, in KB - stddev: 0 - -s3: -## This section contains all the connection information - - defaults: -## This section contains the defaults for all of the other connections -## below. You can also place these variables directly there. - -## Replace with e.g. "localhost" to run against local software - host: s3.amazonaws.com - -## Uncomment the port to use soemthing other than 80 -# port: 8080 - -## Say "no" to disable TLS. - is_secure: yes - -## The tests assume two accounts are defined, "main" and "alt". You -## may add other connections to be instantianted as well, however -## any additional ones will not be used unless your tests use them. - - main: - -## The User ID that the S3 provider gives you. For AWS, this is -## typically a 64-char hexstring. - user_id: AWS_USER_ID - -## Display name typically looks more like a unix login, "jdoe" etc - display_name: AWS_DISPLAY_NAME - -## The email for this account. - email: AWS_EMAIL - -## Replace these with your access keys. - access_key: AWS_ACCESS_KEY - secret_key: AWS_SECRET_KEY - - alt: -## Another user accout, used for ACL-related tests. - - user_id: AWS_USER_ID - display_name: AWS_DISPLAY_NAME - email: AWS_EMAIL - access_key: AWS_ACCESS_KEY - secret_key: AWS_SECRET_KEY - diff --git a/s3tests/generate_objects.py b/s3tests/generate_objects.py index 47b8d1a3..443db7a7 100644 --- a/s3tests/generate_objects.py +++ b/s3tests/generate_objects.py @@ -57,10 +57,10 @@ def upload_objects(bucket, files, seed): def _main(): '''To run the static content load test, make sure you've bootstrapped your - test environment and set up your config.yml file, then run the following: - S3TEST_CONF=config.yml virtualenv/bin/python generate_objects.py -O urls.txt --seed 1234 + test environment and set up your config.yaml file, then run the following: + S3TEST_CONF=config.yaml virtualenv/bin/python generate_objects.py -O urls.txt --seed 1234 - This creates a bucket with your S3 credentials (from config.yml) and + This creates a bucket with your S3 credentials (from config.yaml) and fills it with garbage objects as described in generate_objects.conf. It writes a list of URLS to those objects to ./urls.txt.