--- a/bin/pvl.hosts-graph Mon Mar 31 17:27:36 2014 +0300
+++ b/bin/pvl.hosts-graph Mon Mar 31 17:30:42 2014 +0300
@@ -237,12 +237,18 @@
log.info("%s:%s: guessing lldp host %s -> %s (%s)", host, port, remote_lldp, remote_host, remote_label)
else :
- # by chassis id
- remote_node = remote_lldp
- remote_host = None
+ log.warning("%s:%s: unknown lldp remote %s (%s)", host, port, remote_lldp, remote_label)
+
+ if options.graph_lldp_unknown :
+ # by chassis id
+ remote_node = remote_lldp
+ remote_host = None
+ else :
+ remote_node = remote_host = None
+
+ if not remote_node :
+ continue
- log.warning("%s:%s: unknown lldp remote %s (%s)", host, port, remote_lldp, remote_label)
-
# ensure remote node
if remote_node not in nodes :
log.debug("%s:%s: lazy-add remote %s (%s)", host, port, remote_node, remote_label)
@@ -375,7 +381,7 @@
local_port = port
# mapping was completely missing
- log.warn("%s:%s link -> %s", local_node, local_port, remote_node)
+ log.info("%s:%s link -> %s", local_node, local_port, remote_node)
links[(local_node, local_port, None, remote_node)] = None
@@ -602,8 +608,9 @@
parser.add_option('--snmp-data', metavar='FILE', default=None,
help="Load snmp data from FILE")
- parser.add_option('--graph-dot', metavar='FILE',
- help="Output .dot graph data to file")
+
+ parser.add_option('--graph-lldp-unknown', action='store_true',
+ help="Graph unknown LLDP nodes")
parser.add_option('--graph-vlans', action='store_true', dest='graph_vlans',
@@ -612,10 +619,14 @@
parser.add_option('--no-vlans', action='store_false', dest='graph_vlans',
help="Do not color VLANs")
+
parser.add_option('--graph-bridge', action='store_true',
help="Graph bridge forwarding database links")
+ parser.add_option('--graph-dot', metavar='FILE',
+ help="Output .dot graph data to file")
+
# input
options, args = parser.parse_args(argv[1:])
pvl.args.apply(options)