RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 17:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume: configuration: introduce lazy validation in configuration

Browse Source 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2017-07-14 13:26:23 -04:00
parent d575bc1011
commit 352dc37924
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ceph-volume/ceph_volume/configuration.py
View File

@ -33,10 +33,7 @@ class _TrimIndentFile(object):
def load(abspath=None):
parser = Conf()
try:
if abspath and os.path.exists(abspath):
parser.read(abspath)
else:
raise exceptions.ConfigurationError(abspath=abspath)
parser.read_path(abspath)
return parser
except configparser.ParsingError as error:
terminal.error('Unable to read configuration file: %s' % abspath)
@ -50,12 +47,26 @@ class Conf(configparser.SafeConfigParser):
configuration.
"""
def read_path(self, path):
self.path = path
return self.read(path)
def is_valid(self):
if not os.path.exists(self.path):
raise exceptions.ConfigurationError(abspath=self.path)
try:
self.get('global', 'fsid')
except (configparser.NoSectionError, configparser.NoOptionError):
raise exceptions.ConfigurationKeyError('global', 'fsid')
def get_safe(self, section, key, default=None):
"""
Attempt to get a configuration value from a certain section
in a ``cfg`` object but returning None if not found. Avoids the need
to be doing try/except {ConfigParser Exceptions} every time.
"""
self.is_valid()
try:
return self.get(section, key)
except (configparser.NoSectionError, configparser.NoOptionError):
@ -71,6 +82,7 @@ class Conf(configparser.SafeConfigParser):
Optionally split on other characters besides ',' and return a fallback
value if no items are found.
"""
self.is_valid()
value = self.get_safe(section, key, [])
if value == []:
if default is not None: