Add support for aliases and boolean type

- aliases are now generated as new types or arrays (if length > 0)
- bool is recognized as a boolean type and generated as Go bool
- comment with original JSON is now prepended for each object type
- interface Services is now generated at the top of the file to provide
  overview of what RPC services does the current module consists of
- dump services now correctly return slice of the particular details type

Change-Id: I788babc1c0f2de33e0febd87e5b200d54065b244
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

1 files changed, 277 insertions, 116 deletions

diff --git a/examples/bin_api/ip.api.json b/examples/bin_api/ip.api.json
index d9b4277..3983288 100644
--- a/examples/bin_api/ip.api.json
+++ b/examples/bin_api/ip.api.json
@@ -104,13 +104,17 @@
                 "count"
             ],
             [
+                "u32",
+                "stats_index"
+            ],
+            [
                 "vl_api_fib_path_t",
                 "path",
                 0,
                 "count"
             ],
             {
-                "crc": "0x99dfd73b"
+                "crc": "0xf6a2fab3"
             }
         ],
         [
@@ -164,13 +168,17 @@
                 "count"
             ],
             [
+                "u32",
+                "stats_index"
+            ],
+            [
                 "vl_api_fib_path_t",
                 "path",
                 0,
                 "count"
             ],
             {
-                "crc": "0xabd0060e"
+                "crc": "0xef11e94d"
             }
         ],
         [
@@ -214,6 +222,10 @@
                 "sw_if_index"
             ],
             [
+                "u32",
+                "stats_index"
+            ],
+            [
                 "u8",
                 "is_static"
             ],
@@ -232,7 +244,7 @@
                 16
             ],
             {
-                "crc": "0x85e32a72"
+                "crc": "0xc7001770"
             }
         ],
         [
@@ -297,8 +309,12 @@
                 "i32",
                 "retval"
             ],
+            [
+                "u32",
+                "stats_index"
+            ],
             {
-                "crc": "0xe8d4e804"
+                "crc": "0x1992deab"
             }
         ],
         [
@@ -347,8 +363,12 @@
                 "u8",
                 "reverse"
             ],
+            [
+                "u8",
+                "symmetric"
+            ],
             {
-                "crc": "0x32ebf737"
+                "crc": "0xa9084bfb"
             }
         ],
         [
@@ -599,10 +619,6 @@
             ],
             [
                 "u32",
-                "client_index"
-            ],
-            [
-                "u32",
                 "context"
             ],
             [
@@ -615,7 +631,7 @@
                 16
             ],
             {
-                "crc": "0xd73bf1ab"
+                "crc": "0x6a47c974"
             }
         ],
         [
@@ -741,51 +757,6 @@
             }
         ],
         [
-            "sw_interface_ip6_set_link_local_address",
-            [
-                "u16",
-                "_vl_msg_id"
-            ],
-            [
-                "u32",
-                "client_index"
-            ],
-            [
-                "u32",
-                "context"
-            ],
-            [
-                "u32",
-                "sw_if_index"
-            ],
-            [
-                "u8",
-                "address",
-                16
-            ],
-            {
-                "crc": "0xd73bf1ab"
-            }
-        ],
-        [
-            "sw_interface_ip6_set_link_local_address_reply",
-            [
-                "u16",
-                "_vl_msg_id"
-            ],
-            [
-                "u32",
-                "context"
-            ],
-            [
-                "i32",
-                "retval"
-            ],
-            {
-                "crc": "0xe8d4e804"
-            }
-        ],
-        [
             "ip_add_del_route",
             [
                 "u16",
@@ -929,8 +900,12 @@
                 "i32",
                 "retval"
             ],
+            [
+                "u32",
+                "stats_index"
+            ],
             {
-                "crc": "0xe8d4e804"
+                "crc": "0x1992deab"
             }
         ],
         [
@@ -1024,8 +999,12 @@
                 "i32",
                 "retval"
             ],
+            [
+                "u32",
+                "stats_index"
+            ],
             {
-                "crc": "0xe8d4e804"
+                "crc": "0x1992deab"
             }
         ],
         [
@@ -1087,13 +1066,17 @@
                 "count"
             ],
             [
+                "u32",
+                "stats_index"
+            ],
+            [
                 "vl_api_fib_path_t",
                 "path",
                 0,
                 "count"
             ],
             {
-                "crc": "0x5e530d5e"
+                "crc": "0x21329a12"
             }
         ],
         [
@@ -1164,10 +1147,6 @@
             ],
             [
                 "u32",
-                "client_index"
-            ],
-            [
-                "u32",
                 "context"
             ],
             [
@@ -1188,7 +1167,7 @@
                 "is_ipv6"
             ],
             {
-                "crc": "0xbc7442f2"
+                "crc": "0x9bc25966"
             }
         ],
         [
@@ -1225,10 +1204,6 @@
             ],
             [
                 "u32",
-                "client_index"
-            ],
-            [
-                "u32",
                 "context"
             ],
             [
@@ -1240,7 +1215,7 @@
                 "ip_sw_if_index"
             ],
             {
-                "crc": "0x05b717ca"
+                "crc": "0xae694cf4"
             }
         ],
         [
@@ -1273,18 +1248,18 @@
             ],
             [
                 "u32",
-                "sw_if_index"
+                "context"
             ],
             [
                 "u32",
-                "context"
+                "sw_if_index"
             ],
             [
                 "u8",
                 "is_ipv6"
             ],
             {
-                "crc": "0x452ffc5a"
+                "crc": "0x8bb37ec4"
             }
         ],
         [
@@ -1335,10 +1310,6 @@
             ],
             [
                 "u32",
-                "client_index"
-            ],
-            [
-                "u32",
                 "context"
             ],
             [
@@ -1373,7 +1344,7 @@
                 256
             ],
             {
-                "crc": "0x791bbeab"
+                "crc": "0x3f5f03f5"
             }
         ],
         [
@@ -1439,32 +1410,63 @@
                 "context"
             ],
             [
+                "vl_api_punt_redirect_t",
+                "punt"
+            ],
+            [
+                "u8",
+                "is_add"
+            ],
+            {
+                "crc": "0xa953495b"
+            }
+        ],
+        [
+            "ip_punt_redirect_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
                 "u32",
-                "rx_sw_if_index"
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "ip_punt_redirect_dump",
+            [
+                "u16",
+                "_vl_msg_id"
             ],
             [
                 "u32",
-                "tx_sw_if_index"
+                "client_index"
             ],
             [
-                "u8",
-                "is_add"
+                "u32",
+                "context"
             ],
             [
-                "u8",
-                "is_ip6"
+                "u32",
+                "sw_if_index"
             ],
             [
                 "u8",
-                "nh",
-                16
+                "is_ipv6"
             ],
             {
-                "crc": "0x996b6603"
+                "crc": "0x6b7bcd0a"
             }
         ],
         [
-            "ip_punt_redirect_reply",
+            "ip_punt_redirect_details",
             [
                 "u16",
                 "_vl_msg_id"
@@ -1474,11 +1476,11 @@
                 "context"
             ],
             [
-                "i32",
-                "retval"
+                "vl_api_punt_redirect_t",
+                "punt"
             ],
             {
-                "crc": "0xe8d4e804"
+                "crc": "0xa47f70da"
             }
         ],
         [
@@ -1539,6 +1541,46 @@
             }
         ],
         [
+            "ip_container_proxy_dump",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            {
+                "crc": "0x51077d14"
+            }
+        ],
+        [
+            "ip_container_proxy_details",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "vl_api_prefix_t",
+                "prefix"
+            ],
+            {
+                "crc": "0xd528df63"
+            }
+        ],
+        [
             "ip_source_and_port_range_check_add_del",
             [
                 "u16",
@@ -1670,6 +1712,54 @@
             }
         ],
         [
+            "ip_source_check_interface_add_del",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u8",
+                "is_add"
+            ],
+            [
+                "u8",
+                "loose"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            {
+                "crc": "0x0a60152a"
+            }
+        ],
+        [
+            "ip_source_check_interface_add_del_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
             "ip_scan_neighbor_enable_disable",
             [
                 "u16",
@@ -2477,10 +2567,6 @@
             ],
             [
                 "u32",
-                "client_index"
-            ],
-            [
-                "u32",
                 "context"
             ],
             [
@@ -2504,7 +2590,7 @@
                 "is_ip6"
             ],
             {
-                "crc": "0xd746fc57"
+                "crc": "0x1f90afd1"
             }
         ],
         [
@@ -2556,7 +2642,7 @@
             }
         ]
     ],
-    "vl_api_version": "0xff691c00",
+    "vl_api_version": "0x1eba4868",
     "unions": [
         [
             "address_union",
@@ -2574,6 +2660,10 @@
         ]
     ],
     "services": {
+        "ip_container_proxy_dump": {
+            "reply": "ip_container_proxy_details",
+            "stream": true
+        },
         "ip_address_dump": {
             "reply": "ip_address_details",
             "stream": true
@@ -2612,6 +2702,9 @@
         "ip6nd_send_router_solicitation": {
             "reply": "ip6nd_send_router_solicitation_reply"
         },
+        "ip_source_check_interface_add_del": {
+            "reply": "ip_source_check_interface_add_del_reply"
+        },
         "ip_table_add_del": {
             "reply": "ip_table_add_del_reply"
         },
@@ -2645,13 +2738,14 @@
         "ip_source_and_port_range_check_interface_add_del": {
             "reply": "ip_source_and_port_range_check_interface_add_del_reply"
         },
-        "sw_interface_ip6_set_link_local_address": {
-            "reply": "sw_interface_ip6_set_link_local_address_reply"
-        },
         "mfib_signal_dump": {
             "reply": "mfib_signal_details",
             "stream": true
         },
+        "ip_punt_redirect_dump": {
+            "reply": "ip_punt_redirect_details",
+            "stream": true
+        },
         "ip_container_proxy_add_del": {
             "reply": "ip_container_proxy_add_del_reply"
         },
@@ -2740,53 +2834,81 @@
     ],
     "types": [
         [
-            "ip4_address",
+            "address",
             [
-                "u8",
-                "address",
-                4
+                "vl_api_address_family_t",
+                "af"
+            ],
+            [
+                "vl_api_address_union_t",
+                "un"
             ],
             {
-                "crc": "0xfc4baa28"
+                "crc": "0x09f11671"
             }
         ],
         [
-            "ip6_address",
+            "prefix",
+            [
+                "vl_api_address_t",
+                "address"
+            ],
             [
                 "u8",
-                "address",
-                16
+                "address_length"
             ],
             {
-                "crc": "0xad99ccc2"
+                "crc": "0x0403aebc"
             }
         ],
         [
-            "address",
+            "mprefix",
             [
                 "vl_api_address_family_t",
                 "af"
             ],
             [
+                "u16",
+                "grp_address_length"
+            ],
+            [
                 "vl_api_address_union_t",
-                "un"
+                "grp_address"
+            ],
+            [
+                "vl_api_address_union_t",
+                "src_address"
             ],
             {
-                "crc": "0x09f11671"
+                "crc": "0x1c4cba05"
             }
         ],
         [
-            "prefix",
+            "ip6_prefix",
             [
-                "vl_api_address_t",
-                "address"
+                "vl_api_ip6_address_t",
+                "prefix"
             ],
             [
                 "u8",
-                "address_length"
+                "len"
             ],
             {
-                "crc": "0x0403aebc"
+                "crc": "0x779fd64f"
+            }
+        ],
+        [
+            "ip4_prefix",
+            [
+                "vl_api_ip4_address_t",
+                "prefix"
+            ],
+            [
+                "u8",
+                "len"
+            ],
+            {
+                "crc": "0xea8dc11d"
             }
         ],
         [
@@ -2900,6 +3022,35 @@
             }
         ],
         [
+            "mac_address",
+            [
+                "u8",
+                "bytes",
+                6
+            ],
+            {
+                "crc": "0xefdbdddc"
+            }
+        ],
+        [
+            "punt_redirect",
+            [
+                "u32",
+                "rx_sw_if_index"
+            ],
+            [
+                "u32",
+                "tx_sw_if_index"
+            ],
+            [
+                "vl_api_address_t",
+                "nh"
+            ],
+            {
+                "crc": "0x3e7a801f"
+            }
+        ],
+        [
             "ip6_ra_prefix_info",
             [
                 "u8",
@@ -2946,5 +3097,15 @@
                 "crc": "0x6d88106e"
             }
         ]
-    ]
+    ],
+    "aliases": {
+        "ip6_address": {
+            "length": 16,
+            "type": "u8"
+        },
+        "ip4_address": {
+            "length": 4,
+            "type": "u8"
+        }
+    }
 }