Merge "cfg: make reset() clear defaults and overrides"

2 files changed, 62 insertions, 4 deletions

diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index 31d727b..c50aa6a 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -940,7 +940,7 @@ class ConfigOpts(collections.Mapping):
         :raises: SystemExit, ConfigFilesNotFoundError, ConfigFileParseError,
                  RequiredOptError
         """
-        self.reset()
+        self.clear()
 
         self._args = args
 
@@ -987,11 +987,16 @@ class ConfigOpts(collections.Mapping):
         """Return the number of options and option groups."""
         return len(self._opts) + len(self._groups)
 
-    @__clear_cache
     def reset(self):
-        """Reset the state of the object to before it was called."""
+        """Clear the object state and unset overrides and defaults."""
+        self._unset_defaults_and_overrides()
+        self.clear()
+
+    @__clear_cache
+    def clear(self):
+        """Clear the state of the object to before it was called."""
         self._args = None
-        self._cli_values = None
+        self._cli_values = {}
         self._cparser = None
 
     @__clear_cache
@@ -1098,6 +1103,17 @@ class ConfigOpts(collections.Mapping):
         opt_info = self._get_opt_info(name, group)
         opt_info['default'] = default
 
+    def _unset_defaults_and_overrides(self):
+        """Unset any default or override on all options."""
+        def unset(opts):
+            for info in opts.values():
+                info['default'] = None
+                info['override'] = None
+
+        unset(self._opts)
+        for group in self._groups.values():
+            unset(group._opts)
+
     def disable_interspersed_args(self):
         """Set parsing to stop on the first non-option.
 
diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py
index 1892c61..688f41a 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/unit/test_cfg.py
@@ -880,6 +880,48 @@ class OverridesTestCase(BaseTestCase):
         self.assertEquals(self.conf.blaa.foo, 'bar')
 
 
+class ResetAndClearTestCase(BaseTestCase):
+
+    def test_clear(self):
+        self.conf.register_cli_opt(StrOpt('foo'))
+        self.conf.register_cli_opt(StrOpt('bar'), group='blaa')
+
+        self.assertEquals(self.conf.foo, None)
+        self.assertEquals(self.conf.blaa.bar, None)
+
+        self.conf(['--foo', 'foo', '--blaa-bar', 'bar'])
+
+        self.assertEquals(self.conf.foo, 'foo')
+        self.assertEquals(self.conf.blaa.bar, 'bar')
+
+        self.conf.clear()
+
+        self.assertEquals(self.conf.foo, None)
+        self.assertEquals(self.conf.blaa.bar, None)
+
+    def test_reset_and_clear_with_defaults_and_overrides(self):
+        self.conf.register_cli_opt(StrOpt('foo'))
+        self.conf.register_cli_opt(StrOpt('bar'), group='blaa')
+
+        self.conf.set_default('foo', 'foo')
+        self.conf.set_override('bar', 'bar', group='blaa')
+
+        self.conf(['--foo', 'foofoo'])
+
+        self.assertEquals(self.conf.foo, 'foofoo')
+        self.assertEquals(self.conf.blaa.bar, 'bar')
+
+        self.conf.clear()
+
+        self.assertEquals(self.conf.foo, 'foo')
+        self.assertEquals(self.conf.blaa.bar, 'bar')
+
+        self.conf.reset()
+
+        self.assertEquals(self.conf.foo, None)
+        self.assertEquals(self.conf.blaa.bar, None)
+
+
 class RequiredOptsTestCase(BaseTestCase):
 
     def setUp(self):