xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 19:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Choose more accurate description of ambiguous switch situation

Browse Source 
Technically, it need not be an aggregation, but link between switches generically covers it.
This commit is contained in:
Jarrod Johnson 2022-01-12 09:31:44 -05:00
parent f46fc9f7de
commit b7a786dc83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/networking/macmap.py
View File

@ -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)