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

Clarify error message for bgpcfgd update loopback address (#5076)

Browse Source
This commit is contained in:
pavel-shirshov 2020-07-31 07:46:47 -07:00 committed by GitHub
parent 459c29cfaa
commit e03ce8ba14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ class BGPConfigManager(object):
ip_addr_w_mask = key.replace("Loopback0|", "") ip_addr_w_mask = key.replace("Loopback0|", "")
slash_pos = ip_addr_w_mask.rfind("/") slash_pos = ip_addr_w_mask.rfind("/")
if slash_pos == -1: if slash_pos == -1:
syslog.syslog(syslog.LOG_ERR, "Wrong Loopback0 ip address'%s'" % ip_addr_w_mask) syslog.syslog(syslog.LOG_ERR, "Wrong Loopback0 ip prefix '%s'" % ip_addr_w_mask)
return return
ip_addr = ip_addr_w_mask[:slash_pos] ip_addr = ip_addr_w_mask[:slash_pos]
try: try:
@ -155,14 +155,14 @@ class BGPConfigManager(object):
self.lo_ipv4 = ip_addr self.lo_ipv4 = ip_addr
txt = self.zebra_set_src_template.render(rm_name="RM_SET_SRC", lo_ip=ip_addr, ip_proto="") txt = self.zebra_set_src_template.render(rm_name="RM_SET_SRC", lo_ip=ip_addr, ip_proto="")
else: else:
syslog.syslog(syslog.LOG_INFO, "Update command is not supported for set src templates. lo_ip='%s'" % ip_addr) syslog.syslog(syslog.LOG_INFO, "Update command is not supported for set src templates. current ip='%s'. new ip='%s'" % (self.lo_ipv4, ip_addr))
return return
elif TemplateFabric.is_ipv6(ip_addr): elif TemplateFabric.is_ipv6(ip_addr):
if self.lo_ipv6 is None: if self.lo_ipv6 is None:
self.lo_ipv6 = ip_addr self.lo_ipv6 = ip_addr
txt = self.zebra_set_src_template.render(rm_name="RM_SET_SRC6", lo_ip=ip_addr, ip_proto="v6") txt = self.zebra_set_src_template.render(rm_name="RM_SET_SRC6", lo_ip=ip_addr, ip_proto="v6")
else: else:
syslog.syslog(syslog.LOG_INFO, "Update command is not supported for set src templates. lo_ip='%s'" % ip_addr) syslog.syslog(syslog.LOG_INFO, "Update command is not supported for set src templates. current ip='%s'. new ip='%s'" % (self.lo_ipv6, ip_addr))
return return
else: else:
syslog.syslog(syslog.LOG_ERR, "Got ambiguous ip address '%s'" % ip_addr) syslog.syslog(syslog.LOG_ERR, "Got ambiguous ip address '%s'" % ip_addr)