x/solar
Code Issues Proposed changes

Simplify information stored for history

Browse Source 
We are not making use of connections/tags in system log,
therefore they should be removed and added only when necessary
This commit is contained in:
Dmitry Shulyak 2015-07-15 10:48:50 +03:00
parent c36bdf5f5b
commit 7e7b46614c
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
solar/solar/system_log/change.py
View File

@ -42,22 +42,7 @@ def connections(res, graph):
return result return result
def to_dict(resource, graph):
res = resource.to_dict()
res['connections'] = connections(resource, graph)
return res
def create_diff(staged, commited): def create_diff(staged, commited):
if 'connections' in commited:
commited['connections'].sort()
staged['connections'].sort()
if 'tags' in commited:
commited['tags'].sort()
staged['tags'].sort()
if 'tags' in commited.get('metadata', {}):
commited['metadata']['tags'].sort()
staged['metadata']['tags'].sort()
return list(diff(commited, staged)) return list(diff(commited, staged))
@ -91,7 +76,7 @@ def stage_changes():
log = data.SL() log = data.SL()
log.clean() log.clean()
conn_graph = signals.detailed_connection_graph() conn_graph = signals.detailed_connection_graph()
staged = {r.name: to_dict(r, conn_graph) staged = {r.name: r.args_show()
for r in resource.load_all().values()} for r in resource.load_all().values()}
commited = data.CD() commited = data.CD()
return _stage_changes(staged, conn_graph, commited, log) return _stage_changes(staged, conn_graph, commited, log)
@ -100,7 +85,7 @@ def stage_changes():
def send_to_orchestration(execute=False): def send_to_orchestration(execute=False):
conn_graph = signals.detailed_connection_graph() conn_graph = signals.detailed_connection_graph()
dg = nx.DiGraph() dg = nx.DiGraph()
staged = {r.name: to_dict(r, conn_graph) staged = {r.name: r.args_show()
for r in resource.load_all().values()} for r in resource.load_all().values()}
commited = data.CD() commited = data.CD()