From b46f4b05cffc40b1004a5b7f7f40cf4d4470258f Mon Sep 17 00:00:00 2001
From: Julien Fortin <julien@cumulusnetworks.com>
Date: Mon, 21 Nov 2016 15:23:22 +0100
Subject: [PATCH] ifupdown: iface: fix changes in default json output and
 ifquery -r output for inet6

Ticket: CM-12370
Reviewed By: Roopa, Nikhil G
Testing Done:

    incremental commit of:
    bef23f40a1e5 dhcp: add support for inet + inet6 dhcp on same interface

    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json
    [
        {
            "name": "swp1",
            "addr_method": "dhcp",
            "addr_family": "inet",
            "auto": true,
            "config": {
                "link-duplex": "full",
                "link-autoneg": "off",
                "link-speed": "10000"
            }
        },
        {
            "name": "swp1",
            "addr_method": "dhcp",
            "addr_family": "inet6",
            "auto": true,
            "config": {}
        }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json -c
    [
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": "inet",
        "auto": true,
        "config": {},
        "config_status": {},
        "status": "pass"
      },
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": "inet6",
        "auto": true,
        "config": {},
        "config_status": {},
        "status": "pass"
      }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus# ifquery swp1 -o json -r
    [
      {
        "name": "swp1",
        "addr_method": "dhcp",
        "addr_family": [
          "inet",
          "inet6"
        ],
        "auto": true,
        "config": {}
      }
    ]
    (jessie-30-dev-switch-amd64-sbuild)root@host1:/home/cumulus#

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---
 ifupdown/iface.py | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/ifupdown/iface.py b/ifupdown/iface.py
index 34a989e..4c2f6e0 100644
--- a/ifupdown/iface.py
+++ b/ifupdown/iface.py
@@ -230,9 +230,15 @@ class ifaceJsonEncoder(json.JSONEncoder):
                              for k,v in o.config.items())
         retifacedict['name'] = o.name
         if o.addr_method:
-            retifacedict['addr_method'] = o.addr_method
+            if 'inet' in o.addr_family and 'dhcp' in o.addr_method:
+                retifacedict['addr_method'] = 'dhcp'
+            else:
+                retifacedict['addr_method'] = o.addr_method
         if o.addr_family:
-            retifacedict['addr_family'] = o.addr_family
+            if len(o.addr_family) > 1:
+                retifacedict['addr_family'] = o.addr_family
+            else:
+                retifacedict['addr_family'] = ' '.join(o.addr_family)
         retifacedict['auto'] = o.auto
         retifacedict['config'] = retconfig
 
@@ -270,7 +276,10 @@ class ifaceJsonEncoderWithStatus(json.JSONEncoder):
         if o.addr_method:
             retifacedict['addr_method'] = o.addr_method
         if o.addr_family:
-            retifacedict['addr_family'] = o.addr_family
+            if len(o.addr_family) > 1:
+                retifacedict['addr_family'] = o.addr_family
+            else:
+                retifacedict['addr_family'] = ' '.join(o.addr_family)
         retifacedict['auto'] = o.auto
         retifacedict['config'] = retconfig
         retifacedict['config_status'] = retconfig_status
@@ -741,15 +750,30 @@ class iface():
                               with_status=with_status,
                               use_realname=use_realname)
         else:
+            # To allow both inet and inet6 on an interface we changed the
+            # addr_family attribute, it's now a list. Depending on how
+            # stanzas were squashed (and what command was used ie. ifquery -r)
+            # we want to dump the ifaceobj as usual but we will output an
+            # empty stanza for each additional addr_family. The config will
+            # only be displayed once, in the first stanza. Example:
+            # $ ifquery eth0 -r
+            # auto etho
+            # iface eth0 inet dhcp
+            #     config...
+            #
+            # auto eth0
+            # iface eth0 inet6 dhcp
+            # $
             first = True
             for family in self.addr_family:
-                addr_method = None
-                if self.addr_method:
-                    if family == 'inet' and 'dhcp' in self.addr_method:
-                        addr_method = 'dhcp'
-                    elif family == 'inet6' and 'dhcp' in self.addr_method:
-                        addr_method = 'dhcp6'
-                self._dump_pretty(family, first, addr_method=addr_method,
+                addr_method = self.addr_method
+                # We need to make sure we display 'dhcp' for inet family.
+                # In some cases it might take the value 'dhcp6' even if it has
+                # both inet and inet6 addr_family
+                if addr_method and family == 'inet' and 'dhcp' in addr_method:
+                    addr_method = 'dhcp'
+                self._dump_pretty(family, first,
+                                  addr_method=addr_method,
                                   with_status=with_status,
                                   use_realname=use_realname)
                 first = False