Repository: qpid-dispatch Updated Branches: refs/heads/master 96c5de777 -> 886d3cbca
DISPATCH-735 - Parsing JSON config files did not transform linkRoute, autoLink and address. Fixed this Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/886d3cbc Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/886d3cbc Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/886d3cbc Branch: refs/heads/master Commit: 886d3cbca95db8c3e46f91d8c3e3924f428d3e09 Parents: 96c5de7 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Fri Mar 31 10:13:12 2017 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Fri Mar 31 10:13:12 2017 -0400 ---------------------------------------------------------------------- python/qpid_dispatch_internal/management/config.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/886d3cbc/python/qpid_dispatch_internal/management/config.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/management/config.py b/python/qpid_dispatch_internal/management/config.py index 5cb8445..881394b 100644 --- a/python/qpid_dispatch_internal/management/config.py +++ b/python/qpid_dispatch_internal/management/config.py @@ -45,6 +45,15 @@ class Config(object): self.entities = [] @staticmethod + def transform_sections(sections): + for s in sections: + s[0] = camelcase(s[0]) + s[1] = dict((camelcase(k), v) for k, v in s[1].iteritems()) + if s[0] == "address": s[0] = "router.config.address" + if s[0] == "linkRoute": s[0] = "router.config.linkRoute" + if s[0] == "autoLink": s[0] = "router.config.autoLink" + + @staticmethod def _parse(lines): """Parse config file format into a section list""" begin = re.compile(r'([\w-]+)[ \t]*{') # WORD { @@ -64,12 +73,7 @@ class Config(object): js_text = re.sub(spare_comma, r'\1', js_text) # Convert dictionary keys to camelCase sections = json.loads(js_text) - for s in sections: - s[0] = camelcase(s[0]) - s[1] = dict((camelcase(k), v) for k, v in s[1].iteritems()) - if s[0] == "address": s[0] = "router.config.address" - if s[0] == "linkRoute": s[0] = "router.config.linkRoute" - if s[0] == "autoLink": s[0] = "router.config.autoLink" + Config.transform_sections(sections) return sections @staticmethod @@ -81,6 +85,7 @@ class Config(object): return line js_text = "%s"%("\n".join([sub(l) for l in lines])) sections = json.loads(js_text) + Config.transform_sections(sections) return sections def get_config_types(self): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
