[trac615] Unify config param to -c

src/bin/bind10/bind10.py.in

@@ -400,7 +400,7 @@ class BoB:
         if self.data_path is not None:
             opts.append("--data-path=" + self.data_path)
         if self.config_filename is not None:
-            opts.append("--database-filename=" + self.config_filename)
+            opts.append("--config-filename=" + self.config_filename)
         bind_cfgd = ProcessInfo("b10-cfgmgr", opts,
                                 c_channel_env, uid=self.uid,
                                 username=self.username)

src/bin/cfgmgr/b10-cfgmgr.py.in

@@ -42,7 +42,7 @@ def parse_options(args=sys.argv[1:], Parser=OptionParser):
     parser.add_option("-p", "--data-path", dest="data_path",
                       help="Directory to search for configuration files " +
                       "(default="+DATA_PATH+")", default=DATA_PATH)
-    parser.add_option("-f", "--database-filename", dest="file_name",
+    parser.add_option("-c", "--config-filename", dest="file_name",
                       help="Configuration database filename " +
                       "(default=b10-config.db)", default="b10-config.db")
     (options, args) = parser.parse_args(args)

src/bin/cfgmgr/b10-cfgmgr.xml

@@ -44,7 +44,7 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>b10-cfgmgr</command>
-      <arg><option>-f<replaceable>config-filename</replaceable></option></arg>
+      <arg><option>-c<replaceable>config-filename</replaceable></option></arg>
       <arg><option>-p<replaceable>data_path</replaceable></option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -98,8 +98,8 @@
     <variablelist>
       <varlistentry>
         <term>
-          <option>-f</option><replaceable>config-filename</replaceable>,
-          <option>--database-filename</option> <replaceable>config-filename</replaceable>
+          <option>-c</option><replaceable>config-filename</replaceable>,
+          <option>--config-filename</option> <replaceable>config-filename</replaceable>
         </term>
         <listitem>
           <para>The configuration database filename to use. Can be either

src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in

@@ -139,11 +139,11 @@ class TestParseArgs(unittest.TestCase):
         Test setting the configuration database file.
         """
         b = __import__("b10-cfgmgr")
-        parsed = b.parse_options(['--database-filename=filename'],
+        parsed = b.parse_options(['--config-filename=filename'],
                                  TestOptParser)
         self.assertEqual(b.DATA_PATH, parsed.data_path)
         self.assertEqual("filename", parsed.file_name)
-        parsed = b.parse_options(['-f', 'filename'], TestOptParser)
+        parsed = b.parse_options(['-c', 'filename'], TestOptParser)
         self.assertEqual(b.DATA_PATH, parsed.data_path)
         self.assertEqual("filename", parsed.file_name)