Skip to content
Snippets Groups Projects

Revert "Merge branch 'f-validate-config' into 'dev'"

Merged Florian Spreckelsen requested to merge revert-95d24f75 into dev
13 files
+ 4
233
Compare changes
  • Side-by-side
  • Inline
Files
13
@@ -21,11 +21,6 @@
@@ -21,11 +21,6 @@
#
#
# ** end header
# ** end header
#
#
import os
import yaml
from jsonschema import validate
try:
try:
# python2
# python2
from ConfigParser import ConfigParser
from ConfigParser import ConfigParser
@@ -52,9 +47,7 @@ def configure(inifile):
@@ -52,9 +47,7 @@ def configure(inifile):
_pycaosdbconf = None
_pycaosdbconf = None
if _pycaosdbconf is None:
if _pycaosdbconf is None:
_reset_config()
_reset_config()
read_config = _pycaosdbconf.read(inifile)
return _pycaosdbconf.read(inifile)
validate_yaml_schema(config_to_yaml(_pycaosdbconf))
return read_config
def get_config():
def get_config():
@@ -62,28 +55,6 @@ def get_config():
@@ -62,28 +55,6 @@ def get_config():
return _pycaosdbconf
return _pycaosdbconf
def config_to_yaml(config):
valobj = {}
for s in config.sections():
valobj[s] = {}
for key, value in config[s].items():
# TODO: Can the type be inferred from the config object?
if key in ["timeout", "debug"]:
valobj[s][key] = int(value)
elif key in ["ssl_insecure"]:
valobj[s][key] = bool(value)
else:
valobj[s][key] = value
return valobj
def validate_yaml_schema(valobj):
with open(os.path.join(os.path.dirname(__file__), "schema-pycaosdb-ini.yml")) as f:
schema = yaml.load(f, Loader=yaml.SafeLoader)
validate(instance=valobj, schema=schema["schema-pycaosdb-ini"])
def _read_config_files():
def _read_config_files():
"""Function to read config files from different paths. Checks for path in $PYCAOSDBINI or home directory (.pycaosdb.ini) and in the current working directory (pycaosdb.ini).
"""Function to read config files from different paths. Checks for path in $PYCAOSDBINI or home directory (.pycaosdb.ini) and in the current working directory (pycaosdb.ini).
Loading