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

Fix formatting for ifquery check (cosmetic. only fixes prints)

Browse Source 
Ticket: CM-3346
Reviewed By:
Testing Done: ifupdown2 sanity + ifquery check tests
(cherry picked from commit ba81bde56d04a8f90a6f5d548518605fd1e5ae5f)
This commit is contained in:
Roopa Prabhu
2014-12-01 23:19:48 -08:00
parent 3e6ea735cc
commit 5b4d304406
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/ifupdown2.conf
View File

@@ -23,7 +23,7 @@ multiple_vlan_aware_bridge_support=0
# cross marks against interface attributes. # cross marks against interface attributes.
# Use the below strings to modify the default behaviour. # Use the below strings to modify the default behaviour.
# #
ifquery_check_success_str=[ok] ifquery_check_success_str=[pass]
ifquery_check_error_str=[fail] ifquery_check_error_str=[fail]
ifquery_check_unknown_str= ifquery_check_unknown_str=
# #

34
ifupdown/iface.py
View File

@@ -458,28 +458,35 @@ class iface():
name = self.name name = self.name
if self.auto: if self.auto:
outbuf += 'auto %s\n' %name outbuf += 'auto %s\n' %name
ifaceline = ''
if self.type == ifaceType.BRIDGE_VLAN: if self.type == ifaceType.BRIDGE_VLAN:
outbuf += 'vlan %s' %name ifaceline += 'vlan %s' %name
else: else:
outbuf += 'iface %s' %name ifaceline += 'iface %s' %name
if self.addr_family: if self.addr_family:
outbuf += ' %s' %self.addr_family ifaceline += ' %s' %self.addr_family
if self.addr_method: if self.addr_method:
outbuf += ' %s' %self.addr_method ifaceline += ' %s' %self.addr_method
if with_status: if with_status:
status_str = None
if (self.status == ifaceStatus.ERROR or if (self.status == ifaceStatus.ERROR or
self.status == ifaceStatus.NOTFOUND): self.status == ifaceStatus.NOTFOUND):
if self.status_str: if self.status_str:
outbuf += ' [%s]' %self.status_str ifaceline += ' (%s)' %self.status_str
outbuf += ' %s' %errorstr status_str = errorstr
elif self.status == ifaceStatus.SUCCESS: elif self.status == ifaceStatus.SUCCESS:
outbuf += ' %s' %successstr status_str = successstr
if status_str:
outbuf += '{0:65} {1:>8}'.format(ifaceline, status_str) + '\n'
else:
outbuf += ifaceline + '\n'
if self.status == ifaceStatus.NOTFOUND: if self.status == ifaceStatus.NOTFOUND:
outbuf = (outbuf.encode('utf8') outbuf = (outbuf.encode('utf8')
if isinstance(outbuf, unicode) else outbuf) if isinstance(outbuf, unicode) else outbuf)
print outbuf + '\n' print outbuf + '\n'
return return
outbuf += '\n' else:
outbuf += ifaceline + '\n'
config = self.config config = self.config
if config: if config:
for cname, cvaluelist in config.items(): for cname, cvaluelist in config.items():
@@ -488,14 +495,13 @@ class iface():
if with_status: if with_status:
s = self.get_config_attr_status(cname, idx) s = self.get_config_attr_status(cname, idx)
if s == -1: if s == -1:
outbuf += (indent + '%s %s %s\n' status_str = unknownstr
%(cname, cv, unknownstr))
elif s == 1: elif s == 1:
outbuf += (indent + '%s %s %s\n' status_str = errorstr
%(cname, cv, errorstr))
elif s == 0: elif s == 0:
outbuf += (indent + '%s %s %s\n' status_str = successstr
%(cname, cv, successstr)) outbuf += (indent + '{0:55} {1:>10}'.format(
'%s %s' %(cname, cv), status_str)) + '\n'
else: else:
outbuf += indent + '%s %s\n' %(cname, cv) outbuf += indent + '%s %s\n' %(cname, cv)
idx += 1 idx += 1