Task #8887: Allow default dbcredentials set to be specified

LCS/PyCommon/dbcredentials.py

@@ -224,7 +224,7 @@ class DBCredentials:
     return "database:%s" % (database,)
 
 
-def options_group(parser):
+def options_group(parser, default_credentials=""):
   """
     Return an optparse.OptionGroup containing command-line parameters
     for database connections and authentication.
@@ -240,7 +240,7 @@ def options_group(parser):
                    help="User of the database server")
   group.add_option("-P", "--password", dest="dbPassword", type="string", default="",
                    help="Password of the database server")
-  group.add_option("-C", "--dbcredentials", dest="dbcredentials", type="string", default="",
+  group.add_option("-C", "--dbcredentials", dest="dbcredentials", type="string", default=default_credentials,
                    help="Name of database credential set to use [default=%default]")
 
   return group

SAS/ResourceAssignment/QPIDInfrastructure/bin/addtoQPIDDB.py

@@ -22,7 +22,7 @@ if __name__ == '__main__':
 	 parser.print_help()
 	 sys.exit(0)
 
-    dbcreds = dbcredentials.parse_options(options)
+    dbcreds = dbcredentials.parse_options(options, "qpidinfra")
     QPIDinfra = qpidinfra(dbcreds)
 
     if (options.broker==None):