xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-27 19:37:57 +00:00
Code Issues Projects Releases Wiki Activity

Improve 'ambiguous' notification in macmap.

Browse Source 
When two nodes are ambiguous, provide more
info (mac) and also a suggestion of
which of the two appears most
trunk-like if one of them looks
suspiciously like a trunk.
This commit is contained in:
Jarrod Johnson 2022-01-12 08:31:13 -05:00
parent 04b462712d
commit 2d95fb1d74
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,9 +170,17 @@ def _affluent_map_switch(args):
if mac in _nodesbymac and _nodesbymac[mac][0] != nodename:
# For example, listed on both a real edge port
# and by accident a trunk port
log.log({'error': '{0} and {1} described by ambiguous'
' switch topology values'.format(
nodename, _nodesbymac[mac][0])})
onummacs = _nodesbymac[mac][1]
onode = _nodesbymac[mac][0]
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)
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)
log.log({'error': errstr})
_nodesbymac[mac] = (None, None)
else:
_nodesbymac[mac] = (nodename, nummacs)
@ -306,9 +314,19 @@ def _map_switch_backend(args):
if mac in _nodesbymac and _nodesbymac[mac][0] != nodename:
# For example, listed on both a real edge port
# and by accident a trunk port
log.log({'error': '{0} and {1} described by ambiguous'
' switch topology values'.format(
nodename, _nodesbymac[mac][0])})
nummacs = maccounts[ifname]
onummacs = _nodesbymac[mac][1]
onode = _nodesbymac[mac][0]
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)
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)
log.log({'error': errstr})
_nodesbymac[mac] = (None, None)
else:
_nodesbymac[mac] = (nodename, maccounts[ifname])