From fac4138bfed84c848348fa3c79ecb099e2f16f40 Mon Sep 17 00:00:00 2001
From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Sat, 15 Nov 2014 23:34:02 -0800
Subject: [PATCH] Change defaults result strings in ifquery check output

Ticket: CM-3810
Reviewed By:
Testing Done: tested ifquery check

defaults from /etc/network/ifupdown2/ifupdown2.conf
ifquery_check_success_str=(OK)
ifquery_check_error_str=(FAIL)
ifquery_check_unknown_str=
---
 config/ifupdown2.conf    |  5 +++--
 ifupdown/iface.py        | 10 +++++-----
 ifupdown/ifupdownmain.py |  9 +++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config/ifupdown2.conf b/config/ifupdown2.conf
index cd210d8..79f11a5 100644
--- a/config/ifupdown2.conf
+++ b/config/ifupdown2.conf
@@ -23,8 +23,9 @@ multiple_vlan_aware_bridge_support=0
 # cross marks against interface attributes.
 # Use the below strings to modify the default behaviour.
 #
-# ifquery_check_success_str=
-# ifquery_check_error_str=(x)
+ifquery_check_success_str=(OK)
+ifquery_check_error_str=(FAIL)
+ifquery_check_unknown_str=
 #
 
 # This attribute controls iface/vlan range expansions
diff --git a/ifupdown/iface.py b/ifupdown/iface.py
index f0b6936..e596bde 100644
--- a/ifupdown/iface.py
+++ b/ifupdown/iface.py
@@ -449,7 +449,7 @@ class iface():
 
     def dump_pretty(self, with_status=False,
                     successstr='success', errorstr='error',
-                    use_realname=False):
+                    unknownstr='unknown', use_realname=False):
         indent = '\t'
         outbuf = ''
         if use_realname:
@@ -488,13 +488,13 @@ class iface():
                     if with_status:
                         s = self.get_config_attr_status(cname, idx)
                         if s == -1:
-                            outbuf += (indent + '%s %s\n'
-                                        %(cname, cv))
+                            outbuf += (indent + '%s %s        %s\n'
+                                        %(cname, cv, unknownstr))
                         elif s == 1:
-                            outbuf += (indent + '%s %s %s\n'
+                            outbuf += (indent + '%s %s        %s\n'
                                         %(cname, cv, errorstr))
                         elif s == 0:
-                            outbuf += (indent + '%s %s %s\n'
+                            outbuf += (indent + '%s %s        %s\n'
                                         %(cname, cv, successstr))
                     else:
                         outbuf += indent + '%s %s\n' %(cname, cv)
diff --git a/ifupdown/ifupdownmain.py b/ifupdown/ifupdownmain.py
index 970314e..cad95d7 100644
--- a/ifupdown/ifupdownmain.py
+++ b/ifupdown/ifupdownmain.py
@@ -1227,10 +1227,11 @@ class ifupdownMain(ifupdownBase):
                        separators=(',', ': '))
         else:
             map(lambda i: i.dump_pretty(with_status=True,
-                    successstr=self.config.get('ifquery_check_success_str',
-                                               _success_sym),
-                    errorstr=self.config.get('ifquery_check_error_str', _error_sym)),
-                                ifaceobjs)
+                   successstr=self.config.get('ifquery_check_success_str',
+                                              _success_sym),
+                   errorstr=self.config.get('ifquery_check_error_str', _error_sym),
+                   unknownstr=self.config.get('ifquery_check_unknown_str', '')),
+                   ifaceobjs)
         return ret
 
     def print_ifaceobjsrunning_pretty(self, ifacenames, format='native'):