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

Improve duplicate switch attribute errors

Browse Source
This commit is contained in:
Jarrod Johnson 2020-10-02 13:36:45 -04:00
parent 587197e934
commit 1113c2a849
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,12 +375,19 @@ def _full_updatemacmap(configmanager):
continue
if curswitch not in _switchportmap:
_switchportmap[curswitch] = {}
if portname in _switchportmap[curswitch]:
log.log({'error': 'Duplicate switch topology config '
'for {0} and {1}'.format(
node,
if (portname in _switchportmap[curswitch] and
_switchportmap[curswitch][portname] != node):
if _switchportmap[curswitch][portname] is None:
errstr = ('Duplicate switch attributes for {0} and '
'a previously logged duplicate'.format(
node))
else:
errstr = ('Duplicate switch topology config '
'for {0} and {1}'.format(
node,
_switchportmap[curswitch][
portname])})
portname]))
log.log({'error': errstr})
_switchportmap[curswitch][portname] = None
else:
_switchportmap[curswitch][portname] = node