xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-08-27 21:40:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix confluentdbutil restore with typed attributes

Browse Source 
Typed attributes would fail the check.  Additionally, the error itself
was buggy, so fix that while we are at it.
This commit is contained in:
Jarrod Johnson
2018-02-27 14:51:37 -05:00
parent 9269c9feff
commit ca27385eaa
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
confluent_server/confluent/config/configmanager.py
View File

@@ -255,6 +255,11 @@ def attribute_is_invalid(attrname, attrval):
return True
if 'type' in allattributes.node[attrname]:
if not isinstance(attrval, allattributes.node[attrname]['type']):
# it is valid if it is {'value': actualvalue}
if (isinstance(attrval, dict) and 'value' in attrval and
isinstance(attrval['value'],
allattributes.node[attrname]['type'])):
return False
# provide type checking for attributes with a specific type
return True
return False
@@ -1047,7 +1052,7 @@ class ConfigManager(object):
if attr not in ('nodes', 'noderange'):
attrval = fixup_attribute(attr, attribmap[group][attr])
if attribute_is_invalid(attr, attrval):
errstr = "{0} attribute is invalid".format(attrname)
errstr = "{0} attribute is invalid".format(attr)
raise ValueError(errstr)
attribmap[group][attr] = attrval
if attr == 'nodes':