Update examples, tests and testdata after binapi-generator update.

Change-Id: I738d501cbbb6673010a32847df3f1c87050b8d36
Signed-off-by: Milan Lenco <milan.lenco@pantheon.tech>

1 files changed, 924 insertions, 62 deletions

diff --git a/cmd/binapi-generator/testdata/acl.api.json b/cmd/binapi-generator/testdata/acl.api.json
index 91d3d2f..4c6653c 100644
--- a/cmd/binapi-generator/testdata/acl.api.json
+++ b/cmd/binapi-generator/testdata/acl.api.json
@@ -1,67 +1,929 @@
 {
-    "types" : [
-        ["acl_rule",
-            ["u8", "is_permit"],
-            ["u8", "is_ipv6"],
-            ["u8", "src_ip_addr", 16],
-            ["u8", "src_ip_prefix_len"],
-            ["u8", "dst_ip_addr", 16],
-            ["u8", "dst_ip_prefix_len"],
-            ["u8", "proto"],
-            ["u16", "srcport_or_icmptype_first"],
-            ["u16", "srcport_or_icmptype_last"],
-            ["u16", "dstport_or_icmpcode_first"],
-            ["u16", "dstport_or_icmpcode_last"],
-            ["u8", "tcp_flags_mask"],
-            ["u8", "tcp_flags_value"],
-            {"crc" : "0x2715e1c0"}
-        ],
-        ["macip_acl_rule",
-            ["u8", "is_permit"],
-            ["u8", "is_ipv6"],
-            ["u8", "src_mac", 6],
-            ["u8", "src_mac_mask", 6],
-            ["u8", "src_ip_addr", 16],
-            ["u8", "src_ip_prefix_len"],
-            {"crc" : "0x6723f13e"}
-        ]
+    "services": [
+        {
+            "acl_interface_add_del": {
+                "reply": "acl_interface_add_del_reply"
+            }
+        },
+        {
+            "acl_del": {
+                "reply": "acl_del_reply"
+            }
+        },
+        {
+            "macip_acl_del": {
+                "reply": "macip_acl_del_reply"
+            }
+        },
+        {
+            "acl_plugin_get_version": {
+                "reply": "acl_plugin_get_version_reply"
+            }
+        },
+        {
+            "macip_acl_interface_add_del": {
+                "reply": "macip_acl_interface_add_del_reply"
+            }
+        },
+        {
+            "acl_interface_set_acl_list": {
+                "reply": "acl_interface_set_acl_list_reply"
+            }
+        },
+        {
+            "acl_dump": {
+                "reply": "acl_details",
+                "stream": true
+            }
+        },
+        {
+            "acl_interface_list_dump": {
+                "reply": "acl_interface_list_details",
+                "stream": true
+            }
+        },
+        {
+            "macip_acl_interface_list_dump": {
+                "reply": "macip_acl_interface_list_details",
+                "stream": true
+            }
+        },
+        {
+            "acl_add_replace": {
+                "reply": "acl_add_replace_reply"
+            }
+        },
+        {
+            "acl_plugin_control_ping": {
+                "reply": "acl_plugin_control_ping_reply"
+            }
+        },
+        {
+            "macip_acl_interface_get": {
+                "reply": "macip_acl_interface_get_reply"
+            }
+        },
+        {
+            "macip_acl_add": {
+                "reply": "macip_acl_add_reply"
+            }
+        },
+        {
+            "macip_acl_add_replace": {
+                "reply": "macip_acl_add_replace_reply"
+            }
+        },
+        {
+            "macip_acl_dump": {
+                "reply": "macip_acl_details",
+                "stream": true
+            }
+        }
     ],
-    "messages" : [
-        ["acl_plugin_get_version",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            {"crc" : "0xd7c07748"}
-        ],
-        ["acl_plugin_get_version_reply",
-            ["u16", "_vl_msg_id"],
-            ["u32", "context"],
-            ["u32", "major"],
-            ["u32", "minor"],
-            {"crc" : "0x43eb59a5"}
-        ],
-        ["acl_add_replace",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u32", "acl_index"],
-            ["u8", "tag", 64],
-            {"crc" : "0x3c317936"}
-        ],
-        ["acl_add_replace_reply",
-            ["u16", "_vl_msg_id"],
-            ["u32", "context"],
-            ["u32", "acl_index"],
-            ["i32", "retval"],
-            {"crc" : "0xa5e6d0cf"}
-        ],
-        ["acl_del",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u32", "acl_index"],
-            {"crc" : "0x82cc30ed"}
+    "vl_api_version": "0x1db2ece9",
+    "enums": [],
+    "messages": [
+        [
+            "acl_plugin_get_version",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            {
+                "crc": "0x51077d14"
+            }
+        ],
+        [
+            "acl_plugin_get_version_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "major"
+            ],
+            [
+                "u32",
+                "minor"
+            ],
+            {
+                "crc": "0x9b32cf86"
+            }
+        ],
+        [
+            "acl_plugin_control_ping",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            {
+                "crc": "0x51077d14"
+            }
+        ],
+        [
+            "acl_plugin_control_ping_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "vpe_pid"
+            ],
+            {
+                "crc": "0xf6b0b8ca"
+            }
+        ],
+        [
+            "acl_add_replace",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "u8",
+                "tag",
+                64
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "vl_api_acl_rule_t",
+                "r",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xe839997e"
+            }
+        ],
+        [
+            "acl_add_replace_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xac407b0c"
+            }
+        ],
+        [
+            "acl_del",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0xef34fea4"
+            }
+        ],
+        [
+            "acl_del_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "acl_interface_add_del",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u8",
+                "is_add"
+            ],
+            [
+                "u8",
+                "is_input"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0x0b2aedd1"
+            }
+        ],
+        [
+            "acl_interface_add_del_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "acl_interface_set_acl_list",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "u8",
+                "count"
+            ],
+            [
+                "u8",
+                "n_input"
+            ],
+            [
+                "u32",
+                "acls",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0x8baece38"
+            }
+        ],
+        [
+            "acl_interface_set_acl_list_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "acl_dump",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0xef34fea4"
+            }
+        ],
+        [
+            "acl_details",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "u8",
+                "tag",
+                64
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "vl_api_acl_rule_t",
+                "r",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0x5bd895be"
+            }
+        ],
+        [
+            "acl_interface_list_dump",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            {
+                "crc": "0x529cb13f"
+            }
+        ],
+        [
+            "acl_interface_list_details",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "u8",
+                "count"
+            ],
+            [
+                "u8",
+                "n_input"
+            ],
+            [
+                "u32",
+                "acls",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xd5e80809"
+            }
+        ],
+        [
+            "macip_acl_add",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u8",
+                "tag",
+                64
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "vl_api_macip_acl_rule_t",
+                "r",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xb3d3d65a"
+            }
+        ],
+        [
+            "macip_acl_add_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xac407b0c"
+            }
+        ],
+        [
+            "macip_acl_add_replace",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "u8",
+                "tag",
+                64
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "vl_api_macip_acl_rule_t",
+                "r",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xa0e8c01b"
+            }
+        ],
+        [
+            "macip_acl_add_replace_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xac407b0c"
+            }
+        ],
+        [
+            "macip_acl_del",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0xef34fea4"
+            }
+        ],
+        [
+            "macip_acl_del_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "macip_acl_interface_add_del",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u8",
+                "is_add"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0x6a6be97c"
+            }
+        ],
+        [
+            "macip_acl_interface_add_del_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "i32",
+                "retval"
+            ],
+            {
+                "crc": "0xe8d4e804"
+            }
+        ],
+        [
+            "macip_acl_dump",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            {
+                "crc": "0xef34fea4"
+            }
+        ],
+        [
+            "macip_acl_details",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "acl_index"
+            ],
+            [
+                "u8",
+                "tag",
+                64
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "vl_api_macip_acl_rule_t",
+                "r",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xdd2b55ba"
+            }
+        ],
+        [
+            "macip_acl_interface_get",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            {
+                "crc": "0x51077d14"
+            }
+        ],
+        [
+            "macip_acl_interface_get_reply",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "count"
+            ],
+            [
+                "u32",
+                "acls",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0xaccf9b05"
+            }
+        ],
+        [
+            "macip_acl_interface_list_dump",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "client_index"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            {
+                "crc": "0x529cb13f"
+            }
+        ],
+        [
+            "macip_acl_interface_list_details",
+            [
+                "u16",
+                "_vl_msg_id"
+            ],
+            [
+                "u32",
+                "context"
+            ],
+            [
+                "u32",
+                "sw_if_index"
+            ],
+            [
+                "u8",
+                "count"
+            ],
+            [
+                "u32",
+                "acls",
+                0,
+                "count"
+            ],
+            {
+                "crc": "0x29783fa0"
+            }
         ]
     ],
-"vl_api_version" :"0x3cd02d84"
+    "types": [
+        [
+            "acl_rule",
+            [
+                "u8",
+                "is_permit"
+            ],
+            [
+                "u8",
+                "is_ipv6"
+            ],
+            [
+                "u8",
+                "src_ip_addr",
+                16
+            ],
+            [
+                "u8",
+                "src_ip_prefix_len"
+            ],
+            [
+                "u8",
+                "dst_ip_addr",
+                16
+            ],
+            [
+                "u8",
+                "dst_ip_prefix_len"
+            ],
+            [
+                "u8",
+                "proto"
+            ],
+            [
+                "u16",
+                "srcport_or_icmptype_first"
+            ],
+            [
+                "u16",
+                "srcport_or_icmptype_last"
+            ],
+            [
+                "u16",
+                "dstport_or_icmpcode_first"
+            ],
+            [
+                "u16",
+                "dstport_or_icmpcode_last"
+            ],
+            [
+                "u8",
+                "tcp_flags_mask"
+            ],
+            [
+                "u8",
+                "tcp_flags_value"
+            ],
+            {
+                "crc": "0x6f99bf4d"
+            }
+        ],
+        [
+            "macip_acl_rule",
+            [
+                "u8",
+                "is_permit"
+            ],
+            [
+                "u8",
+                "is_ipv6"
+            ],
+            [
+                "u8",
+                "src_mac",
+                6
+            ],
+            [
+                "u8",
+                "src_mac_mask",
+                6
+            ],
+            [
+                "u8",
+                "src_ip_addr",
+                16
+            ],
+            [
+                "u8",
+                "src_ip_prefix_len"
+            ],
+            {
+                "crc": "0x70589f1e"
+            }
+        ]
+    ]
 }