From f7bc1f56d7824e73b324dbe9db5d209c12d97af1 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 10:28:35 +0200 Subject: changed weight-calculation for graphgen --- retiolum/hosts/.scripts/adv_graphgen/parse.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'retiolum/hosts/.scripts/adv_graphgen') diff --git a/retiolum/hosts/.scripts/adv_graphgen/parse.py b/retiolum/hosts/.scripts/adv_graphgen/parse.py index 27fe3a99..b0534d93 100755 --- a/retiolum/hosts/.scripts/adv_graphgen/parse.py +++ b/retiolum/hosts/.scripts/adv_graphgen/parse.py @@ -35,7 +35,10 @@ def merge_edges(nodes): def write_node(k,v): - """ writes a single node and its edges """ + """ writes a single node and its edges + edges are weightet with the informations inside the nodes provided by + tinc + """ node = " "+k+"[label=\"" node += k+"\\l" node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" @@ -47,11 +50,12 @@ def write_node(k,v): node += "]" print (node) for con in v.get('to',[]): - edge = " "+k+ " -> " +con['name'] + "[weight="+str(10/float(con['weight'])) + edge = " "+k+ " -> " +con['name'] + "[weight="+str(float(con['weight'])) if con.get('bidirectional',False): edge += ",dir=both" edge += "]" print edge + def parse_input(): nodes={} for line in sys.stdin: -- cgit v1.2.3 From aea8e374caa9ba8cbb1bc3cff39753fbfe0e3605 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 26 May 2011 13:59:47 +0200 Subject: fixed borken parse script wrong behaviour when we do not know the internal ip of a node for some reason. fixed autostart script to modprobe tun before continuning --- retiolum/hosts/.scripts/adv_graphgen/parse.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'retiolum/hosts/.scripts/adv_graphgen') diff --git a/retiolum/hosts/.scripts/adv_graphgen/parse.py b/retiolum/hosts/.scripts/adv_graphgen/parse.py index b0534d93..04b42c33 100755 --- a/retiolum/hosts/.scripts/adv_graphgen/parse.py +++ b/retiolum/hosts/.scripts/adv_graphgen/parse.py @@ -1,4 +1,5 @@ #!/usr/bin/python2 +# -*- coding: utf8 -*- import sys """ TODO: Refactoring needed to pull the edges out of the node structures again, @@ -44,7 +45,8 @@ def write_node(k,v): node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" if v.has_key('num_conns'): node += "Num Connects:"+str(v['num_conns'])+"\\l" - node += "internal:"+v['internal-ip']+"\\l\"" + + node += "internal:"+v.get('internal-ip','¯\\\\(°_o)/¯')+"\\l\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" node += "]" -- cgit v1.2.3