ospfd: show ip ospf interface json output format

[chiragshah6]

Current json output does not differentiate start of
interface objects. Adding "interfaces" keyword at the
beginning of the interface list. This is useful
when displaying vrf level output along with interface list.

Testing Done:
show ip ospf vrf all interface json
show ip ospf vrf all interface json
show ip ospf interface json
show ip ospf interface json

Signed-off-by: Chirag Shah chirag@cumulusnetworks.com

"vrf1014":{
"vrfName":"vrf1014",
"vrfId":23,
"interfaces":[
{
"swp1.4":{
"ifUp":true,
"ifIndex":22,
"mtuBytes":1500,
"bandwidthMbit":1000,
"ifFlags":"<UP,BROADCAST,RUNNING,MULTICAST>",
"ospfEnabled":true,
"ipAddress":"200.254.4.9",
"ipAddressPrefixlen":30,
"area":"0.0.0.0",
"routerId":"9.9.14.7",
"networkType":"POINTOPOINT",
"cost":100,
"transmitDelayMsecs":1000,
"state":"Point-To-Point",
"priority":1,
"mcastMemberOspfAllRouters":true,
"timerMsecs":100,
"timerDeadMsecs":25,
"timerWaitMsecs":25,
"timerRetransmit":200,
"timerHelloInMsecs":1079,
"nbrCount":1,
"nbrAdjacentCount":1
}
},
{
"swp2.4":{
"ifUp":true,
"ifIndex":24,
"mtuBytes":1500,
"bandwidthMbit":1000,
"ifFlags":"<UP,BROADCAST,RUNNING,MULTICAST>",
"ospfEnabled":true,
"ipAddress":"200.254.4.13",
"ipAddressPrefixlen":30,
"area":"0.0.0.0",
"routerId":"9.9.14.7",
"networkType":"POINTOPOINT",
"cost":100,
"transmitDelayMsecs":1000,
"state":"Point-To-Point",
"priority":1,
"mcastMemberOspfAllRouters":true,
"timerMsecs":100,
"timerDeadMsecs":25,
"timerWaitMsecs":25,
"timerRetransmit":200,
"timerHelloInMsecs":1079,
"nbrCount":1,
"nbrAdjacentCount":1
}
},
{
"swp3.4":{
"ifUp":true,
"ifIndex":25,
"mtuBytes":1500,
"bandwidthMbit":1000,
"ifFlags":"<UP,BROADCAST,RUNNING,MULTICAST>",
"ospfEnabled":true,
"ipAddress":"200.254.4.17",
"ipAddressPrefixlen":30,
"area":"0.0.0.0",
"routerId":"9.9.14.7",
"networkType":"POINTOPOINT",
"cost":100,
"transmitDelayMsecs":1000,
"state":"Point-To-Point",
"priority":1,
"mcastMemberOspfAllRouters":true,
"timerMsecs":100,
"timerDeadMsecs":25,
"timerWaitMsecs":25,
"timerRetransmit":200,
"timerHelloInMsecs":1079,
"nbrCount":1,
"nbrAdjacentCount":1
}
},
{
"vrf1014":{
"ifUp":true,
"ifIndex":23,
"mtuBytes":65536,
"bandwidthMbit":0,
"ifFlags":"<UP,RUNNING,NOARP>",
"ospfEnabled":true,
"ifUnnumbered":true,
"area":"0.0.0.0",
"routerId":"9.9.14.7",
"networkType":"BROADCAST",
"cost":10,
"transmitDelayMsecs":1000,
"state":"DR",
"priority":1,
"mcastMemberOspfAllRouters":true,
"mcastMemberOspfDesignatedRouters":true,
"timerMsecs":100,
"timerDeadMsecs":25,
"timerWaitMsecs":25,
"timerRetransmit":200,
"timerHelloInMsecs":1079,
"nbrCount":0,
"nbrAdjacentCount":0
}
}
]
}

[NetDEF-CI]

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2342/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source and apply patch from patchwork: Successful

Building Stage: Failed

Ubuntu1604 amd64 build: Successful
Ubuntu1404 amd64 build: Successful
FreeBSD11 amd64 build: Successful
CentOS6 amd64 build: Successful
Debian8 amd64 build: Successful
NetBSD6 amd64 build: Successful
FreeBSD9 amd64 build: Successful
CentOS7 amd64 build: Successful
OmniOS amd64 build: Successful
Ubuntu1204 amd64 build: Successful
Debian9 amd64 build: Successful
OpenBSD60 amd64 build: Successful
FreeBSD10 amd64 build: Successful
NetBSD7 amd64 build: Successful

Fedora24 amd64 build: Failed

Make failed for Fedora24 amd64 build:
(see full make log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2342/artifact/CI015BUILD/ErrorLog/log_make.txt)

In file included from ./lib/zebra.h:138:0,
                 from pimd/pim_assert.c:20:
/usr/include/linux/in.h:28:3: error: redeclaration of enumerator IPPROTO_IP
   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
   ^
/usr/include/netinet/in.h:42:5: note: previous definition of IPPROTO_IP was here
     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
     ^~~~~~~~~~
/usr/include/linux/in.h:30:3: error: redeclaration of enumerator IPPROTO_ICMP

Fedora24 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2342/artifact/CI015BUILD/config.status/config.status

[NetDEF-CI]

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2341/

This is a comment from an EXPERIMENTAL automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

---

CLANG Static Analyzer Summary

• Github Pull Request 1647, comparing to Git base SHA 7c0c85a
• Base image data for Git 7c0c85a does not exist - compare skipped

21 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-2341/artifact/shared/static_analysis/index.html

[LabN-CI]

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table

_	_
Result	SUCCESS git merge/1647 7dab10c
Date	01/16/2018
Start	17:59:07
Finish	18:22:08
Run-Time	23:01
Total	1805
Pass	1805
Fail	0
Valgrind-Errors	0
Valgrind-Loss	0
Details	vncregress-2018-01-16-17:59:07.txt
Log	autoscript-2018-01-16-17:59:49.log.bz2

For details, please contact louberger