Adds a configruation file option that can be overridden by command-line args

Note that this borrows very heavily from http://stackoverflow.com/a/5826167
Only a small portion of this is my own code

benchmark.cfg.example

@@ -0,0 +1,31 @@
+[Defaults]
+# Available Keys: 
+# client_host='localhost'
+# client_identity_file=None
+# client_user=None
+# database_host=None
+# database_identity_file=None
+# database_os='linux'
+# database_user=None
+# duration=60
+# exclude=None
+# install='all'
+# install_error_action='continue'
+# install_software=False
+# list_test_metadata=False
+# list_tests=False
+# max_concurrency=256
+# max_queries=20
+# max_threads=8
+# mode='benchmark'
+# name='ec2'
+# os='linux'
+# parse=None
+# password_prompt=False
+# query_interval=5
+# server_host='localhost'
+# sleep=60
+# starting_concurrency=8
+# test=None
+# type='all'
+# verbose=True

toolset/run-tests.py

@@ -1,64 +1,96 @@
 #!/usr/bin/env python
 import argparse
+import ConfigParser
 import sys
+from pprint import pprint 
 from benchmark.benchmarker import Benchmarker
 from setup.linux.unbuffered import Unbuffered
 
 ###################################################################################################
 # Main
 ###################################################################################################
+def main(argv=None):
+    # Do argv default this way, as doing it in the functional declaration sets it at compile time
+    if argv is None:
+        argv = sys.argv
+	
+    # Enable unbuffered output so messages will appear in the proper order with subprocess output.
+    sys.stdout=Unbuffered(sys.stdout)
 
-# Enable unbuffered output so messages will appear in the proper order with subprocess output.
-sys.stdout=Unbuffered(sys.stdout)
+    # Ensure the current directory (which should be the benchmark home directory) is in the path so that the tests can be imported.
+    sys.path.append('.')
 
-# Ensure the current directory (which should be the benchmark home directory) is in the path so that the tests can be imported.
-sys.path.append('.')
+    # Ensure toolset/setup/linux is in the path so that the tests can "import setup_util".
+    sys.path.append('toolset/setup/linux')
 
-# Ensure toolset/setup/linux is in the path so that the tests can "import setup_util".
-sys.path.append('toolset/setup/linux')
+    conf_parser = argparse.ArgumentParser(
+        description=__doc__,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        add_help=False)
+    conf_parser.add_argument('--conf_file', default='benchmark.cfg', metavar='FILE', help='Optional configuration file to provide argument defaults. All config options can be overridden using the command line.')
+    args, remaining_argv = conf_parser.parse_known_args()
 
-##########################################################
-# Set up argument parser
-##########################################################
-parser = argparse.ArgumentParser(description='Run the Framework Benchmarking test suite.')
-parser.add_argument('-s', '--server-host', default='localhost', help='The application server.')
-parser.add_argument('-c', '--client-host', default='localhost', help='The client / load generation server.')
-parser.add_argument('-u', '--client-user', help='The username to use for SSH to the client instance.')
-parser.add_argument('-i', '--client-identity-file', dest='client_identity_file', help='The key to use for SSH to the client instance.')
-parser.add_argument('-d', '--database-host', help='The database server.  If not provided, defaults to the value of --client-host.')
-parser.add_argument('--database-user', help='The username to use for SSH to the database instance.  If not provided, defaults to the value of --client-user.')
-parser.add_argument('--database-identity-file', dest='database_identity_file', help='The key to use for SSH to the database instance.  If not provided, defaults to the value of --client-identity-file.')
-parser.add_argument('-p', dest='password_prompt', action='store_true')
-parser.add_argument('--install-software', action='store_true', help='runs the installation script before running the rest of the commands')
-parser.add_argument('--install', choices=['client', 'database', 'server', 'all'], default='all', help='Allows you to only install the server, client, or database software')
-parser.add_argument('--install-error-action', choices=['abort', 'continue'], default='continue', help='action to take in case of error during installation')
-parser.add_argument('--test', nargs='+', help='names of tests to run')
-parser.add_argument('--exclude', nargs='+', help='names of tests to exclude')
-parser.add_argument('--type', choices=['all', 'json', 'db', 'query', 'fortune', 'update', 'plaintext'], default='all', help='which type of test to run')
-parser.add_argument('-m', '--mode', choices=['benchmark', 'verify'], default='benchmark', help='verify mode will only start up the tests, curl the urls and shutdown')
-parser.add_argument('--list-tests', action='store_true', default=False, help='lists all the known tests that can run')
-parser.add_argument('--list-test-metadata', action='store_true', default=False, help='writes all the test metadata as a JSON file in the results directory')
-parser.add_argument('--max-concurrency', default=256, help='the maximum concurrency that the tests will run at. The query tests will run at this concurrency', type=int)
-parser.add_argument('--max-queries', default=20, help='The maximum number of queries to run during the query test', type=int)
-parser.add_argument('--query-interval', default=5, type=int)
-parser.add_argument('--max-threads', default=8, help='The max number of threads to run weight at, this should be set to the number of cores for your system.', type=int)
-parser.add_argument('--duration', default=60, help='Time in seconds that each test should run for.')
-parser.add_argument('--starting-concurrency', default=8, type=int)
-parser.add_argument('--sleep', type=int, default=60, help='the amount of time to sleep after starting each test to allow the server to start up.')
-parser.add_argument('--parse', help='Parses the results of the given timestamp and merges that with the latest results')
-parser.add_argument('--name', default="ec2", help='The name to give this test. Results will be placed in a folder using this name.')
-parser.add_argument('--os', choices=['linux', 'windows'], default='linux', help='The operating system of the application server.')
-parser.add_argument('--database-os', choices=['linux', 'windows'], default='linux', help='The operating system of the database server.')
-args = parser.parse_args()
+    try:
+        with open (args.conf_file):
+            config = ConfigParser.SafeConfigParser()
+            config.read([args.conf_file])
+            defaults = dict(config.items("Defaults"))
+    except IOError:
+        if args.conf_file != 'benchmark.cfg':
+            print 'Configuration file not found!'
+        defaults = { "client-host":"localhost"}
 
-benchmarker = Benchmarker(vars(args))
+    ##########################################################
+    # Set up argument parser
+    ##########################################################
+    parser = argparse.ArgumentParser(description='Run the Framework Benchmarking test suite.',
+        parents=[conf_parser])
+    parser.add_argument('-s', '--server-host', default='localhost', help='The application server.')
+    parser.add_argument('-c', '--client-host', default='localhost', help='The client / load generation server.')
+    parser.add_argument('-u', '--client-user', help='The username to use for SSH to the client instance.')
+    parser.add_argument('-i', '--client-identity-file', dest='client_identity_file', help='The key to use for SSH to the client instance.')
+    parser.add_argument('-d', '--database-host', help='The database server.  If not provided, defaults to the value of --client-host.')
+    parser.add_argument('--database-user', help='The username to use for SSH to the database instance.  If not provided, defaults to the value of --client-user.')
+    parser.add_argument('--database-identity-file', dest='database_identity_file', help='The key to use for SSH to the database instance.  If not provided, defaults to the value of --client-identity-file.')
+    parser.add_argument('-p', dest='password_prompt', action='store_true')
+    parser.add_argument('--install-software', action='store_true', help='runs the installation script before running the rest of the commands')
+    parser.add_argument('--install', choices=['client', 'database', 'server', 'all'], default='all', help='Allows you to only install the server, client, or database software')
+    parser.add_argument('--install-error-action', choices=['abort', 'continue'], default='continue', help='action to take in case of error during installation')
+    parser.add_argument('--test', nargs='+', help='names of tests to run')
+    parser.add_argument('--exclude', nargs='+', help='names of tests to exclude')
+    parser.add_argument('--type', choices=['all', 'json', 'db', 'query', 'fortune', 'update', 'plaintext'], default='all', help='which type of test to run')
+    parser.add_argument('-m', '--mode', choices=['benchmark', 'verify'], default='benchmark', help='verify mode will only start up the tests, curl the urls and shutdown')
+    parser.add_argument('--list-tests', action='store_true', default=False, help='lists all the known tests that can run')
+    parser.add_argument('--list-test-metadata', action='store_true', default=False, help='writes all the test metadata as a JSON file in the results directory')
+    parser.add_argument('--max-concurrency', default=256, help='the maximum concurrency that the tests will run at. The query tests will run at this concurrency', type=int)
+    parser.add_argument('--max-queries', default=20, help='The maximum number of queries to run during the query test', type=int)
+    parser.add_argument('--query-interval', default=5, type=int)
+    parser.add_argument('--max-threads', default=8, help='The max number of threads to run weight at, this should be set to the number of cores for your system.', type=int)
+    parser.add_argument('--duration', default=60, help='Time in seconds that each test should run for.')
+    parser.add_argument('--starting-concurrency', default=8, type=int)
+    parser.add_argument('--sleep', type=int, default=60, help='the amount of time to sleep after starting each test to allow the server to start up.')
+    parser.add_argument('--parse', help='Parses the results of the given timestamp and merges that with the latest results')
+    parser.add_argument('--name', default="ec2", help='The name to give this test. Results will be placed in a folder using this name.')
+    parser.add_argument('--os', choices=['linux', 'windows'], default='linux', help='The operating system of the application server.')
+    parser.add_argument('--database-os', choices=['linux', 'windows'], default='linux', help='The operating system of the database server.')
+    parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Causes the configuration to print before any other commands are executed.')
+    parser.set_defaults(**defaults) # Must do this after add, or each option's default will override the configuration file default
+    args = parser.parse_args(remaining_argv)
 
-# Run the benchmarker in the specified mode
-if benchmarker.list_tests:
-  benchmarker.run_list_tests()
-elif benchmarker.list_test_metadata:
-  benchmarker.run_list_test_metadata()
-elif benchmarker.parse != None:
-  benchmarker.parse_timestamp()
-else:
-  benchmarker.run()
+    if args.verbose:
+        print 'Configuration options: '
+        pprint(args)
+    benchmarker = Benchmarker(vars(args))
+
+    # Run the benchmarker in the specified mode
+    if benchmarker.list_tests:
+      benchmarker.run_list_tests()
+    elif benchmarker.list_test_metadata:
+      benchmarker.run_list_test_metadata()
+    elif benchmarker.parse != None:
+      benchmarker.parse_timestamp()
+    else:
+      benchmarker.run()
+
+if __name__ == "__main__":
+    sys.exit(main())