From b7a786dc83e12a3f176d18f091a06f67d986a5a1 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 12 Jan 2022 09:31:44 -0500 Subject: [PATCH] Choose more accurate description of ambiguous switch situation Technically, it need not be an aggregation, but link between switches generically covers it. --- confluent_server/confluent/networking/macmap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/networking/macmap.py b/confluent_server/confluent/networking/macmap.py index 81c878d9..16edffca 100644 --- a/confluent_server/confluent/networking/macmap.py +++ b/confluent_server/confluent/networking/macmap.py @@ -320,11 +320,11 @@ def _map_switch_backend(args): if onode: errstr = 'Mac address {2} may match either {0} or {1} according to net.*switch* attributes.'.format(nodename, onode, mac) if onummacs > 2 or nummacs > 2: - errstr += ' ({0} may match a switch trunk)'.format(nodename if nummacs > onummacs else onode) + errstr += ' ({0} may match a link between switches)'.format(nodename if nummacs > onummacs else onode) else: errstr = 'Mac address {1} may match either {0} or a node previously reported as ambiguous according to net.*switch* attributes.'.format(nodename, mac) if nummacs > 2: - errstr += ' ({0} may match a switch trunk)'.format(nodename) + errstr += ' ({0} may match a link between switches)'.format(nodename) log.log({'error': errstr}) _nodesbymac[mac] = (None, None)