summaryrefslogtreecommitdiffstats
path: root/modules/retiolum/scripts/adv_graphgen
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-29 12:08:13 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-05-29 12:08:13 +0200
commitfd7da3898006ab8119d4b13b383cfa16c9403b18 (patch)
treef1e8d0fbcc7a121ccb2104200fae58f7e2afc3a0 /modules/retiolum/scripts/adv_graphgen
parent5392511e88b7ca77b88b3d16f5991bde70823144 (diff)
docu for cloudinstall,update graphgen
doc/install_dotcloud : updated docu, now specified which file to patch doc/install_no.de : added docu for no.de cloud parse.py : nodes which are down will not be written auoupdate_cron.sh : contains what to do when the nodes should auto-update
Diffstat (limited to 'modules/retiolum/scripts/adv_graphgen')
-rwxr-xr-xmodules/retiolum/scripts/adv_graphgen/parse.py11
-rwxr-xr-xmodules/retiolum/scripts/adv_graphgen/sanitize.sh2
2 files changed, 10 insertions, 3 deletions
diff --git a/modules/retiolum/scripts/adv_graphgen/parse.py b/modules/retiolum/scripts/adv_graphgen/parse.py
index 04b42c33..16d3043b 100755
--- a/modules/retiolum/scripts/adv_graphgen/parse.py
+++ b/modules/retiolum/scripts/adv_graphgen/parse.py
@@ -12,6 +12,7 @@ def write_digraph(nodes):
print ('digraph retiolum {')
print (' node[shape=box,style=filled,fillcolor=grey]')
generate_stats(nodes)
+ nodes = delete_unused_nodes(nodes)
merge_edges(nodes)
for k,v in nodes.iteritems():
write_node(k,v)
@@ -21,7 +22,12 @@ def generate_stats(nodes):
"""
for k,v in nodes.iteritems():
v['num_conns'] = len(v.get('to',[]))
-
+def delete_unused_nodes(nodes):
+ new_nodes = {}
+ for k,v in nodes.iteritems():
+ if v.get('to',[]):
+ new_nodes[k] = v
+ return new_nodes
def merge_edges(nodes):
""" merge back and forth edges into one
DESTRUCTS the current structure by deleting "connections" in the nodes
@@ -50,7 +56,8 @@ def write_node(k,v):
if v['external-ip'] == "MYSELF":
node += ",fillcolor=steelblue1"
node += "]"
- print (node)
+ print node
+
for con in v.get('to',[]):
edge = " "+k+ " -> " +con['name'] + "[weight="+str(float(con['weight']))
if con.get('bidirectional',False):
diff --git a/modules/retiolum/scripts/adv_graphgen/sanitize.sh b/modules/retiolum/scripts/adv_graphgen/sanitize.sh
index 88591b67..0e12d207 100755
--- a/modules/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/modules/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -10,4 +10,4 @@ sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\
$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot
$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot
$OPENER retiolum_1.png &>/dev/null
-rm retiolum.dot
+#rm retiolum.dot