stackforge/rubick
Code Issues Proposed changes

Added ability to get raw configuration parameter values

Browse Source
This commit is contained in:
Maxim Kulkin 2013-10-14 12:45:53 +04:00
parent 4ceec12865
commit cc79d5896c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ostack_validator/config_model.py
View File

@ -77,7 +77,7 @@ class Configuration(object):
return '%s.%s' % (section, param) return '%s.%s' % (section, param)
def get(self, name, default=None, _state=[]): def get(self, name, default=None, raw=False, _state=[]):
section, name = self._normalize_name(name) section, name = self._normalize_name(name)
if section in self._normal and name in self._normal[section]: if section in self._normal and name in self._normal[section]:
@ -90,6 +90,9 @@ class Configuration(object):
if not isinstance(value, str): if not isinstance(value, str):
return value return value
if raw:
return value
tmpl = string.Template(value) tmpl = string.Template(value)
return tmpl.safe_substitute(ConfigurationWrapper(self, _state + [name])) return tmpl.safe_substitute(ConfigurationWrapper(self, _state + [name]))

8
ostack_validator/test_configuration.py
View File

@ -195,3 +195,11 @@ class ConfigurationTests(unittest.TestCase):
self.assertEqual('cba', c.get('c')) self.assertEqual('cba', c.get('c'))
def test_getting_raw_values(self):
c = Configuration()
c.set('a', '$b')
c.set('b', 'x')
self.assertEqual('$b', c.get('a', raw=True))