verify Trying to fix the command line

toolset/run-tests.py

@@ -52,29 +52,15 @@ def main(argv=None):
     databaUser = os.getenv('TFB_DATABASE_USER', clientUser)
     dbIdenFile = os.getenv('TFB_DATABASE_IDENTITY_FILE', clientIden)
 
-    if serverHost != None:
-        defaults["server-host"] = serverHost
-    if clientHost != None:
-        defaults["client-host"] = clientHost
-    if clientUser != None:
-        defaults["client-user"] = clientUser
-    if clientIden != None:
-        defaults["client-identity-file"] = clientIden
-    if databaHost != None:
-        defaults["--database-host"] = databaHost
-    if databaUser != None:
-        defaults["--database-user"] = databaUser
-    if dbIdenFile != None:
-        defaults["--database-identity-file"] = dbIdenFile
-
     ##########################################################
     # Set up argument parser
     ##########################################################
     parser = argparse.ArgumentParser(description='Run the Framework Benchmarking test suite.',
         parents=[conf_parser])
-    parser.add_argument('client-host', help='The client / load generation server.')
-    parser.add_argument('client-user', help='The username to use for SSH to the client instance.')
-    parser.add_argument('client-identity-file', help='The key to use for SSH to the client instance.')
+    parser.add_argument('server_host', help='The application server.')
+    parser.add_argument('client_host', help='The client / load generation server.')
+    parser.add_argument('client_user', help='The username to use for SSH to the client instance.')
+    parser.add_argument('client_identity_file', help='The key to use for SSH to the client instance.')
     parser.add_argument('--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.')
@@ -102,6 +88,21 @@ def main(argv=None):
     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
 
+    if serverHost != None:
+        parser.set_defaults(server_host = serverHost)
+    if clientHost != None:
+        parser.set_defaults(client_host = clientHost)
+    if clientUser != None:
+        parser.set_defaults(client_user = clientUser)
+    if clientIden != None:
+        parser.set_defaults(client_identity_file = clientIden)
+    if databaHost != None:
+        parser.set_defaults("--database-host" = databaHost)
+    if databaUser != None:
+        parser.set_defaults("--database-user" = databaUser)
+    if dbIdenFile != None:
+        parser.set_defaults("--database-identity-file" = dbIdenFile)
+
     args = parser.parse_args(remaining_argv)
 
     if args.verbose: