matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bgpcfgd]: Fix for BGP peer not coming up even after config BGP startup all (#4547)

Browse Source 
Issue was key not correct to look into self.peer. It need to be tuple of
(vrf,nbr). Updated for both add/del
This commit is contained in:
abdosi 2020-05-06 19:30:31 -07:00 committed by Abhishek Dosi
parent 139d37338a
commit 5e17126ffe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-fpm-frr/bgpcfgd
View File

@ -744,7 +744,8 @@ class BGPPeerMgrBase(Manager):
:param data: the data associated with the change :param data: the data associated with the change
""" """
vrf, nbr = self.split_key(key) vrf, nbr = self.split_key(key)
if key not in self.peers: peer_key = (vrf, nbr)
if peer_key not in self.peers:
return self.add_peer(vrf, nbr, data) return self.add_peer(vrf, nbr, data)
else: else:
return self.update_peer(vrf, nbr, data) return self.update_peer(vrf, nbr, data)
@ -871,7 +872,8 @@ class BGPPeerMgrBase(Manager):
:param key: key of the neighbor :param key: key of the neighbor
""" """
vrf, nbr = self.split_key(key) vrf, nbr = self.split_key(key)
if key not in self.peers: peer_key = (vrf, nbr)
if peer_key not in self.peers:
log_warn("Peer '(%s|%s)' has not been found" % (vrf, nbr)) log_warn("Peer '(%s|%s)' has not been found" % (vrf, nbr))
return return
cmd = self.templates["delete"].render(neighbor_addr=nbr) cmd = self.templates["delete"].render(neighbor_addr=nbr)