Merge pull request #292 from AlexanderS/fix-options-default

Options: Set default values from config, right after adding a new option

3 files changed, 14 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Options/Parser.py b/src/lib/Bcfg2/Options/Parser.py
index d146e3aa2..b72a495f1 100644
--- a/src/lib/Bcfg2/Options/Parser.py
+++ b/src/lib/Bcfg2/Options/Parser.py
@@ -141,6 +141,9 @@ class Parser(argparse.ArgumentParser):
 
                 self.option_list.extend(option.list_options())
                 option.add_to_parser(self)
+                for opt in option.list_options():
+                    opt.default_from_config(self._cfp)
+                    self._defaults_set.append(opt)
 
     def add_component(self, component):
         """ Add a component (and all of its options) to the
diff --git a/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py b/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
index 61b87de2a..b1ed4cb2b 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/TestComponents.py
@@ -182,7 +182,8 @@ class TestImportComponentOptions(OptionTestCase):
     """test cases for component loading."""
 
     def setUp(self):
-        self.options = [Option("--cls", action=ImportComponentAction),
+        self.options = [Option("--cls", cf=("config", "cls"),
+                               action=ImportComponentAction),
                         Option("--module", action=ImportModuleAction)]
 
         self.result = argparse.Namespace()
@@ -227,3 +228,10 @@ class TestImportComponentOptions(OptionTestCase):
         self.assertRaises(SystemExit,
                           self.parser.parse,
                           ["-C", config_file, "--cls", "Bcfg2.No.Such.Thing"])
+
+    @make_config({"config": {"test": "foo", "cls": "Two"}})
+    def test_default_from_config_for_component_options(self, config_file):
+        """use default value from config file for options added by dynamic loaded component."""
+        self.parser.parse(["-C", config_file])
+        self.assertEqual(self.result.cls, Two.Two)
+        self.assertEqual(self.result.test, "foo")
diff --git a/testsuite/Testsrc/Testlib/TestOptions/Two.py b/testsuite/Testsrc/Testlib/TestOptions/Two.py
index 189e0817f..0120e8b77 100644
--- a/testsuite/Testsrc/Testlib/TestOptions/Two.py
+++ b/testsuite/Testsrc/Testlib/TestOptions/Two.py
@@ -1,6 +1,7 @@
 """Test module for component loading."""
+from Bcfg2.Options import Option
 
 
 class Two(object):
     """Test class for component loading."""
-    pass
+    options = [Option('--test', cf=("config", "test"), dest="test", default="bar")]