Merge "utils: switch format function to functional"
This commit is contained in:
commit
64869010bb
|
@ -117,15 +117,15 @@ def list2cols(cols, objs):
|
|||
for o in objs]
|
||||
|
||||
|
||||
def format_string_list(objs, field):
|
||||
objs[field] = ", ".join(objs[field])
|
||||
def format_string_list(l):
|
||||
return ", ".join(l)
|
||||
|
||||
|
||||
def format_dict_list(objs, field):
|
||||
objs[field] = "\n".join(
|
||||
def format_dict_list(l):
|
||||
return "\n".join(
|
||||
"- " + ", ".join("%s: %s" % (k, v)
|
||||
for k, v in elem.items())
|
||||
for elem in objs[field])
|
||||
for elem in l)
|
||||
|
||||
|
||||
def format_dict_dict(value):
|
||||
|
@ -150,8 +150,8 @@ def format_resource_type(rt):
|
|||
|
||||
|
||||
def format_archive_policy(ap):
|
||||
format_dict_list(ap, "definition")
|
||||
format_string_list(ap, "aggregation_methods")
|
||||
ap['definition'] = format_dict_list(ap['definition'])
|
||||
ap['aggregation_methods'] = format_string_list(ap['aggregation_methods'])
|
||||
|
||||
|
||||
def format_resource_for_metric(metric):
|
||||
|
|
Loading…
Reference in New Issue