mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

addons: vrf: removing extra \n from log messages

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-04-29 19:09:24 +02:00
parent 01f27c6789
commit d0e5676882
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ifupdown2/addons/vrf.py
View File

@@ -263,13 +263,13 @@ class vrf(Addon, moduleBase):
if self.warn_on_vrf_map_write_err: if self.warn_on_vrf_map_write_err:
if not os.path.exists('/etc/iproute2/rt_tables.d/'): if not os.path.exists('/etc/iproute2/rt_tables.d/'):
self.logger.info('unable to save iproute2 vrf to table ' + self.logger.info('unable to save iproute2 vrf to table ' +
'map (%s)\n' %errstr) 'map (%s)' %errstr)
self.logger.info('cannot find /etc/iproute2/rt_tables.d.' + self.logger.info('cannot find /etc/iproute2/rt_tables.d.' +
' pls check if your iproute2 version' + ' pls check if your iproute2 version' +
' supports rt_tables.d') ' supports rt_tables.d')
else: else:
self.logger.warning('unable to open iproute2 vrf to table ' + self.logger.warning('unable to open iproute2 vrf to table ' +
'map (%s)\n' %errstr) 'map (%s)' %errstr)
self.warn_on_vrf_map_write_err = False self.warn_on_vrf_map_write_err = False
def _iproute2_vrf_map_sync_to_disk(self): def _iproute2_vrf_map_sync_to_disk(self):
@@ -433,7 +433,7 @@ class vrf(Addon, moduleBase):
if not vrf_table: if not vrf_table:
self.log_error('%s: unable to get an auto table id' self.log_error('%s: unable to get an auto table id'
%mobj.name, ifaceobj) %mobj.name, ifaceobj)
self.logger.info('%s: table id auto: selected table id %s\n' self.logger.info('%s: table id auto: selected table id %s'
%(mobj.name, vrf_table)) %(mobj.name, vrf_table))
try: try:
self._up_vrf_dev(mobj, vrf_table, False) self._up_vrf_dev(mobj, vrf_table, False)
@@ -733,7 +733,7 @@ class vrf(Addon, moduleBase):
vrf_table = self._get_avail_vrf_table_id() vrf_table = self._get_avail_vrf_table_id()
if not vrf_table: if not vrf_table:
self.log_error('unable to get an auto table id', ifaceobj) self.log_error('unable to get an auto table id', ifaceobj)
self.logger.info('%s: table id auto: selected table id %s\n' self.logger.info('%s: table id auto: selected table id %s'
%(ifaceobj.name, vrf_table)) %(ifaceobj.name, vrf_table))
else: else:
self._iproute2_is_vrf_tableid_inuse(ifaceobj, vrf_table) self._iproute2_is_vrf_tableid_inuse(ifaceobj, vrf_table)
@@ -757,7 +757,7 @@ class vrf(Addon, moduleBase):
try: try:
self.netlink.link_add_vrf(ifaceobj.name, vrf_table) self.netlink.link_add_vrf(ifaceobj.name, vrf_table)
except Exception as e: except Exception as e:
self.log_error('create failed (%s)\n' % str(e), ifaceobj) self.log_error('create failed (%s)' % str(e), ifaceobj)
if vrf_table != 'auto': if vrf_table != 'auto':
self._iproute2_vrf_table_entry_add(ifaceobj, vrf_table) self._iproute2_vrf_table_entry_add(ifaceobj, vrf_table)
else: else:
@@ -948,7 +948,7 @@ class vrf(Addon, moduleBase):
%(utils.ss_cmd, ifindex)) %(utils.ss_cmd, ifindex))
except Exception as e: except Exception as e:
self.logger.info('%s: closing socks using ss' self.logger.info('%s: closing socks using ss'
' failed (%s)\n' %(ifacename, str(e))) ' failed (%s)' %(ifacename, str(e)))
pass pass
def _down_vrf_dev(self, ifaceobj, vrf_table, ifaceobj_getfunc=None): def _down_vrf_dev(self, ifaceobj, vrf_table, ifaceobj_getfunc=None):