x/timmy
Code Issues Proposed changes

Improve recursive converter, fix rq.yaml

Browse Source
This commit is contained in:
f3flight 2016-05-07 05:56:26 +00:00
parent 30084fcec9
commit 4e833e6821
2 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rq.yaml
View File

@ -11,26 +11,26 @@ files:
ubuntu: [etc-apt]
cmds:
by_release:
4.1.1:
'4.1.1':
by_role:
fuel: [fuel-postgres-dump]
5.0.1:
'5.0.1':
by_role:
fuel: [fuel-docker-ps, fuel-dockerctl-check, fuel-docker-db-archive]
6.0:
'6.0':
by_role:
compute: [ipset-save, ipset-list]
controller: [ipset-save, ipset-list]
6.1:
'6.1':
by_role:
fuel: [fuel-notifications]
7.0:
'7.0':
by_role:
fuel: [fuel-notifications]
5.1.1:
'5.1.1':
by_role:
fuel: [fuel-dockerctl-list, fuel-docker-ps, fuel-dockerctl-check, fuel-docker-db-archive]
8.0:
'8.0':
by_role:
fuel: [fuel-notifications]
by_role:
@ -53,8 +53,5 @@ cmds:
by_os_platform:
ubuntu: [dmesg-t-ubuntu, packages-ubuntu]
centos: [dmesg-centos, packages-centos]
default:
__default:
[ip-ne, iptables, ipnetns, ss, ipa, iptables-nat, df-m, services-status, cpuinfo, df-i, ipro]
# by-os:
# centos: []
# ubuntu: []

72
rqtest.py
View File

@ -2,59 +2,53 @@
from timmy import tools
from yaml import dump
from copy import deepcopy as dc
class Conf():
default_key = '__default'
class Node():
conf_section_prefix = 'by_'
conf_match_prefix = 'by_'
def import_rq():
def is_sub(m, d, p):
def sub_is_match(el, d, p):
checks = []
for i in m:
for i in el:
checks.append(i.startswith(p) or i == d)
return all(checks)
def r_sub(a, m, mk, mmk, d, p, ds):
if not mk in ds:
ds[mk] = {}
if d in mmk:
if mk.startswith(p):
ds[mk][d] = {a: mmk[d]}
mmk[d] = {a: mmk[d]}
def r_sub(attr, el, k, d, p, dst):
match_sect = False
if type(k) is str and k.startswith(p):
match_sect = True
if not k in dst and k != attr:
dst[k] = {}
if d in el[k]:
if k == attr:
dst[k] = el[k][d]
elif k.startswith(p):
dst[k][d] = {attr: el[k][d]}
else:
ds[mk][a] = mmk[d]
if mk.startswith(p):
ks = [k for k in mmk if k != d]
for k in ks:
if mmk[k] is not None:
if not k in ds[mk]:
ds[mk][k] = {}
r_sub(a, mmk, k, mmk[k], d, p, ds[mk])
elif type(mmk) is dict and is_sub(mmk, d, p):
ks = [k for k in mmk if k.startswith(p)]
for k in ks:
if mmk[k] is not None:
if not k in ds[mk]:
ds[mk][k] = {}
r_sub(a, mmk, k, mmk[k], d, p, ds[mk])
dst[k][attr] = el[k][d]
if k == attr:
subks = [subk for subk in el[k] if subk != d]
for subk in subks:
r_sub(attr, el[k], subk, d, p, dst)
elif match_sect or type(el[k]) is dict and sub_is_match(el[k], d, p):
subks = [subk for subk in el[k] if subk != d]
for subk in subks:
if el[k][subk] is not None:
if not subk in dst[k]:
dst[k][subk] = {}
r_sub(attr, el[k], subk, d, p, dst[k])
else:
ds[mk][a] = m[mk]
m[mk] = {a: m[mk]}
dst[k][attr] = el[k]
rq = tools.load_yaml_file('rqtest.yaml')
rq2 = {}
p = Node.conf_section_prefix
src = tools.load_yaml_file('rq.yaml')
dst = {}
p = Node.conf_match_prefix
d = Conf.default_key
for attr in rq:
m = rq[attr]
if d in m:
rq2[attr] = m[d]
mks = [mk for mk in m if mk.startswith(p)]
for mk in mks:
r_sub(attr, m, mk, m[mk], d, p, rq2)
return rq2
for attr in src:
r_sub(attr, src, attr, d, p, dst)
return dst
print(dump(import_rq(), default_flow_style=False))