From 58bde04833afab747d5defbc094d080788705ae6 Mon Sep 17 00:00:00 2001 From: LeoVerto Date: Fri, 31 Aug 2018 15:31:36 +0200 Subject: [PATCH] Code cleanup --- docker-net-graph.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docker-net-graph.py b/docker-net-graph.py index 162fba6..7aa20ce 100755 --- a/docker-net-graph.py +++ b/docker-net-graph.py @@ -65,27 +65,31 @@ def generate_graph(verbose: bool, file: str): gateway = None try: - subnet = net['IPAM']['Config'][0]['Subnet'] + if net['Internal']: + internal = "| Internal" + else: + internal = "" + except IndexError: - subnet = None + internal = "" if verbose: - print("Network: %s %s gw:%s" % (net_name, subnet, gateway)) + print("Network: %s %s gw:%s" % (net_name, internal, gateway)) net_node_id = "net_%s" % (net_name,) - net_label_html = '
'.join([s for s in ['network', net_name, subnet, gateway] if s is not None]) + label = "{ %s | %s %s}" % (gateway, net_name, internal) g.node(net_node_id, shape='record', - label="{ %s| %s }" % (gateway, net_name), + label=label, fillcolor=color, - style='filled') + style='filled' + ) for container_id, container in sorted(net['Containers'].items()): if verbose: dump_json(container) - if verbose: print(" * ", container['Name'], container['IPv4Address'], container['IPv6Address']) container_node_id = 'container_%s' % container_id