verify More cleanup

toolset/run-tests.py

@@ -44,8 +44,8 @@ def main(argv=None):
     ##########################################################
     # Set up default values
     ##########################################################        
-    serverHost = os.getenv('TFB_SERVER_HOST', 'localhost')
-    clientHost = os.getenv('TFB_CLIENT_HOST', 'localhost')
+    serverHost = os.environ.get('TFB_SERVER_HOST', 'localhost')
+    clientHost = os.environ.get('TFB_CLIENT_HOST', 'localhost')
     clientUser = os.environ.get('TFB_CLIENT_USER')
     clientIden = os.environ.get('TFB_CLIENT_IDENTITY_FILE')
     databaHost = os.getenv('TFB_DATABASE_HOST', clientHost)
@@ -57,10 +57,10 @@ def main(argv=None):
     ##########################################################
     parser = argparse.ArgumentParser(description='Run the Framework Benchmarking test suite.',
         parents=[conf_parser])
-    parser.add_argument('-s', '--server-host', default=serverHost, help='The application server.')
-    parser.add_argument('-c', '--client-host', default=clientHost, help='The client / load generation server.')
-    parser.add_argument('-u', '--client-user', default=clientUser, type=str, help='The username to use for SSH to the client instance.')
-    parser.add_argument('-i', '--client-identity-file', default=clientIden, type=str, dest='client_identity_file', help='The key to use for SSH to the client instance.')
+    parser.add_argument('-s', '--server-host', default=serverHost, required=true, help='The application server.')
+    parser.add_argument('-c', '--client-host', default=clientHost, required=true, help='The client / load generation server.')
+    parser.add_argument('-u', '--client-user', default=clientUser, required=true, help='The username to use for SSH to the client instance.')
+    parser.add_argument('-i', '--client-identity-file', default=clientIden, required=true, dest='client_identity_file', help='The key to use for SSH to the client instance.')
     parser.add_argument('-d', '--database-host', default=databaHost, help='The database server.  If not provided, defaults to the value of --client-host.')
     parser.add_argument('--database-user', default=databaUser, 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', default=dbIdenFile, 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.')