From 6476a2b64a2e1ea6c0d695127d726a348cc5c99b Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Thu, 31 Jan 2019 08:23:02 +0100 Subject: Generator improvements - all objects are now sorted alphabetically for more consistent output - unions now have constructor generated - log level for warnings was changed to debug - GetAllMessages renamed to GetRegisteredMessages Change-Id: I976453004a2fd8b6cb95ca0acfcef56913bf8d38 Signed-off-by: Ondrej Fabry --- examples/bin_api/vpe/vpe.ba.go | 457 ++++++++++++++++++++--------------------- 1 file changed, 228 insertions(+), 229 deletions(-) (limited to 'examples/bin_api/vpe/vpe.ba.go') diff --git a/examples/bin_api/vpe/vpe.ba.go b/examples/bin_api/vpe/vpe.ba.go index e0d5f97..9eb4c98 100644 --- a/examples/bin_api/vpe/vpe.ba.go +++ b/examples/bin_api/vpe/vpe.ba.go @@ -5,10 +5,9 @@ Package vpe is a generated from VPP binary API module 'vpe'. It contains following objects: - 18 messages - 1 type 9 services - + 1 type + 18 messages */ package vpe @@ -92,9 +91,9 @@ func (*ThreadData) GetCrcString() string { /* Messages */ -// ControlPing represents VPP binary API message 'control_ping': +// AddNodeNext represents VPP binary API message 'add_node_next': // -// "control_ping", +// "add_node_next", // [ // "u16", // "_vl_msg_id" @@ -107,25 +106,38 @@ func (*ThreadData) GetCrcString() string { // "u32", // "context" // ], +// [ +// "u8", +// "node_name", +// 64 +// ], +// [ +// "u8", +// "next_name", +// 64 +// ], // { -// "crc": "0x51077d14" +// "crc": "0x9ab92f7a" // } // -type ControlPing struct{} +type AddNodeNext struct { + NodeName []byte `struc:"[64]byte"` + NextName []byte `struc:"[64]byte"` +} -func (*ControlPing) GetMessageName() string { - return "control_ping" +func (*AddNodeNext) GetMessageName() string { + return "add_node_next" } -func (*ControlPing) GetCrcString() string { - return "51077d14" +func (*AddNodeNext) GetCrcString() string { + return "9ab92f7a" } -func (*ControlPing) GetMessageType() api.MessageType { +func (*AddNodeNext) GetMessageType() api.MessageType { return api.RequestMessage } -// ControlPingReply represents VPP binary API message 'control_ping_reply': +// AddNodeNextReply represents VPP binary API message 'add_node_next_reply': // -// "control_ping_reply", +// "add_node_next_reply", // [ // "u16", // "_vl_msg_id" @@ -140,29 +152,24 @@ func (*ControlPing) GetMessageType() api.MessageType { // ], // [ // "u32", -// "client_index" -// ], -// [ -// "u32", -// "vpe_pid" +// "next_index" // ], // { -// "crc": "0xf6b0b8ca" +// "crc": "0x2ed75f32" // } // -type ControlPingReply struct { - Retval int32 - ClientIndex uint32 - VpePID uint32 +type AddNodeNextReply struct { + Retval int32 + NextIndex uint32 } -func (*ControlPingReply) GetMessageName() string { - return "control_ping_reply" +func (*AddNodeNextReply) GetMessageName() string { + return "add_node_next_reply" } -func (*ControlPingReply) GetCrcString() string { - return "f6b0b8ca" +func (*AddNodeNextReply) GetCrcString() string { + return "2ed75f32" } -func (*ControlPingReply) GetMessageType() api.MessageType { +func (*AddNodeNextReply) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -241,9 +248,9 @@ func (*CliInband) GetMessageType() api.MessageType { return api.RequestMessage } -// CliReply represents VPP binary API message 'cli_reply': +// CliInbandReply represents VPP binary API message 'cli_inband_reply': // -// "cli_reply", +// "cli_inband_reply", // [ // "u16", // "_vl_msg_id" @@ -257,31 +264,32 @@ func (*CliInband) GetMessageType() api.MessageType { // "retval" // ], // [ -// "u64", -// "reply_in_shmem" +// "string", +// "reply" // ], // { -// "crc": "0x06d68297" +// "crc": "0x6d3c80a4" // } // -type CliReply struct { +type CliInbandReply struct { Retval int32 - ReplyInShmem uint64 + XXX_ReplyLen uint32 `struc:"sizeof=Reply"` + Reply string } -func (*CliReply) GetMessageName() string { - return "cli_reply" +func (*CliInbandReply) GetMessageName() string { + return "cli_inband_reply" } -func (*CliReply) GetCrcString() string { - return "06d68297" +func (*CliInbandReply) GetCrcString() string { + return "6d3c80a4" } -func (*CliReply) GetMessageType() api.MessageType { +func (*CliInbandReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// CliInbandReply represents VPP binary API message 'cli_inband_reply': +// CliReply represents VPP binary API message 'cli_reply': // -// "cli_inband_reply", +// "cli_reply", // [ // "u16", // "_vl_msg_id" @@ -295,32 +303,31 @@ func (*CliReply) GetMessageType() api.MessageType { // "retval" // ], // [ -// "string", -// "reply" +// "u64", +// "reply_in_shmem" // ], // { -// "crc": "0x6d3c80a4" +// "crc": "0x06d68297" // } // -type CliInbandReply struct { +type CliReply struct { Retval int32 - XXX_ReplyLen uint32 `struc:"sizeof=Reply"` - Reply string + ReplyInShmem uint64 } -func (*CliInbandReply) GetMessageName() string { - return "cli_inband_reply" +func (*CliReply) GetMessageName() string { + return "cli_reply" } -func (*CliInbandReply) GetCrcString() string { - return "6d3c80a4" +func (*CliReply) GetCrcString() string { + return "06d68297" } -func (*CliInbandReply) GetMessageType() api.MessageType { +func (*CliReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// GetNodeIndex represents VPP binary API message 'get_node_index': +// ControlPing represents VPP binary API message 'control_ping': // -// "get_node_index", +// "control_ping", // [ // "u16", // "_vl_msg_id" @@ -333,32 +340,25 @@ func (*CliInbandReply) GetMessageType() api.MessageType { // "u32", // "context" // ], -// [ -// "u8", -// "node_name", -// 64 -// ], // { -// "crc": "0x6c9a495d" +// "crc": "0x51077d14" // } // -type GetNodeIndex struct { - NodeName []byte `struc:"[64]byte"` -} +type ControlPing struct{} -func (*GetNodeIndex) GetMessageName() string { - return "get_node_index" +func (*ControlPing) GetMessageName() string { + return "control_ping" } -func (*GetNodeIndex) GetCrcString() string { - return "6c9a495d" +func (*ControlPing) GetCrcString() string { + return "51077d14" } -func (*GetNodeIndex) GetMessageType() api.MessageType { +func (*ControlPing) GetMessageType() api.MessageType { return api.RequestMessage } -// GetNodeIndexReply represents VPP binary API message 'get_node_index_reply': +// ControlPingReply represents VPP binary API message 'control_ping_reply': // -// "get_node_index_reply", +// "control_ping_reply", // [ // "u16", // "_vl_msg_id" @@ -373,30 +373,35 @@ func (*GetNodeIndex) GetMessageType() api.MessageType { // ], // [ // "u32", -// "node_index" +// "client_index" +// ], +// [ +// "u32", +// "vpe_pid" // ], // { -// "crc": "0xa8600b89" +// "crc": "0xf6b0b8ca" // } // -type GetNodeIndexReply struct { - Retval int32 - NodeIndex uint32 +type ControlPingReply struct { + Retval int32 + ClientIndex uint32 + VpePID uint32 } -func (*GetNodeIndexReply) GetMessageName() string { - return "get_node_index_reply" +func (*ControlPingReply) GetMessageName() string { + return "control_ping_reply" } -func (*GetNodeIndexReply) GetCrcString() string { - return "a8600b89" +func (*ControlPingReply) GetCrcString() string { + return "f6b0b8ca" } -func (*GetNodeIndexReply) GetMessageType() api.MessageType { +func (*ControlPingReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// AddNodeNext represents VPP binary API message 'add_node_next': +// GetNextIndex represents VPP binary API message 'get_next_index': // -// "add_node_next", +// "get_next_index", // [ // "u16", // "_vl_msg_id" @@ -423,24 +428,24 @@ func (*GetNodeIndexReply) GetMessageType() api.MessageType { // "crc": "0x9ab92f7a" // } // -type AddNodeNext struct { +type GetNextIndex struct { NodeName []byte `struc:"[64]byte"` NextName []byte `struc:"[64]byte"` } -func (*AddNodeNext) GetMessageName() string { - return "add_node_next" +func (*GetNextIndex) GetMessageName() string { + return "get_next_index" } -func (*AddNodeNext) GetCrcString() string { +func (*GetNextIndex) GetCrcString() string { return "9ab92f7a" } -func (*AddNodeNext) GetMessageType() api.MessageType { +func (*GetNextIndex) GetMessageType() api.MessageType { return api.RequestMessage } -// AddNodeNextReply represents VPP binary API message 'add_node_next_reply': +// GetNextIndexReply represents VPP binary API message 'get_next_index_reply': // -// "add_node_next_reply", +// "get_next_index_reply", // [ // "u16", // "_vl_msg_id" @@ -461,24 +466,24 @@ func (*AddNodeNext) GetMessageType() api.MessageType { // "crc": "0x2ed75f32" // } // -type AddNodeNextReply struct { +type GetNextIndexReply struct { Retval int32 NextIndex uint32 } -func (*AddNodeNextReply) GetMessageName() string { - return "add_node_next_reply" +func (*GetNextIndexReply) GetMessageName() string { + return "get_next_index_reply" } -func (*AddNodeNextReply) GetCrcString() string { +func (*GetNextIndexReply) GetCrcString() string { return "2ed75f32" } -func (*AddNodeNextReply) GetMessageType() api.MessageType { +func (*GetNextIndexReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// ShowVersion represents VPP binary API message 'show_version': +// GetNodeGraph represents VPP binary API message 'get_node_graph': // -// "show_version", +// "get_node_graph", // [ // "u16", // "_vl_msg_id" @@ -495,21 +500,21 @@ func (*AddNodeNextReply) GetMessageType() api.MessageType { // "crc": "0x51077d14" // } // -type ShowVersion struct{} +type GetNodeGraph struct{} -func (*ShowVersion) GetMessageName() string { - return "show_version" +func (*GetNodeGraph) GetMessageName() string { + return "get_node_graph" } -func (*ShowVersion) GetCrcString() string { +func (*GetNodeGraph) GetCrcString() string { return "51077d14" } -func (*ShowVersion) GetMessageType() api.MessageType { +func (*GetNodeGraph) GetMessageType() api.MessageType { return api.RequestMessage } -// ShowVersionReply represents VPP binary API message 'show_version_reply': +// GetNodeGraphReply represents VPP binary API message 'get_node_graph_reply': // -// "show_version_reply", +// "get_node_graph_reply", // [ // "u16", // "_vl_msg_id" @@ -523,50 +528,31 @@ func (*ShowVersion) GetMessageType() api.MessageType { // "retval" // ], // [ -// "string", -// "program" -// ], -// [ -// "string", -// "version" -// ], -// [ -// "string", -// "build_date" -// ], -// [ -// "string", -// "build_directory" +// "u64", +// "reply_in_shmem" // ], // { -// "crc": "0xb9bcf6df" +// "crc": "0x06d68297" // } // -type ShowVersionReply struct { - Retval int32 - XXX_ProgramLen uint32 `struc:"sizeof=Program"` - Program string - XXX_VersionLen uint32 `struc:"sizeof=Version"` - Version string - XXX_BuildDateLen uint32 `struc:"sizeof=BuildDate"` - BuildDate string - XXX_BuildDirectoryLen uint32 `struc:"sizeof=BuildDirectory"` - BuildDirectory string +type GetNodeGraphReply struct { + Retval int32 + ReplyInShmem uint64 } -func (*ShowVersionReply) GetMessageName() string { - return "show_version_reply" +func (*GetNodeGraphReply) GetMessageName() string { + return "get_node_graph_reply" } -func (*ShowVersionReply) GetCrcString() string { - return "b9bcf6df" +func (*GetNodeGraphReply) GetCrcString() string { + return "06d68297" } -func (*ShowVersionReply) GetMessageType() api.MessageType { +func (*GetNodeGraphReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// ShowThreads represents VPP binary API message 'show_threads': +// GetNodeIndex represents VPP binary API message 'get_node_index': // -// "show_threads", +// "get_node_index", // [ // "u16", // "_vl_msg_id" @@ -579,25 +565,32 @@ func (*ShowVersionReply) GetMessageType() api.MessageType { // "u32", // "context" // ], +// [ +// "u8", +// "node_name", +// 64 +// ], // { -// "crc": "0x51077d14" +// "crc": "0x6c9a495d" // } // -type ShowThreads struct{} +type GetNodeIndex struct { + NodeName []byte `struc:"[64]byte"` +} -func (*ShowThreads) GetMessageName() string { - return "show_threads" +func (*GetNodeIndex) GetMessageName() string { + return "get_node_index" } -func (*ShowThreads) GetCrcString() string { - return "51077d14" +func (*GetNodeIndex) GetCrcString() string { + return "6c9a495d" } -func (*ShowThreads) GetMessageType() api.MessageType { +func (*GetNodeIndex) GetMessageType() api.MessageType { return api.RequestMessage } -// ShowThreadsReply represents VPP binary API message 'show_threads_reply': +// GetNodeIndexReply represents VPP binary API message 'get_node_index_reply': // -// "show_threads_reply", +// "get_node_index_reply", // [ // "u16", // "_vl_msg_id" @@ -612,37 +605,30 @@ func (*ShowThreads) GetMessageType() api.MessageType { // ], // [ // "u32", -// "count" -// ], -// [ -// "vl_api_thread_data_t", -// "thread_data", -// 0, -// "count" +// "node_index" // ], // { -// "crc": "0x6942fb35" +// "crc": "0xa8600b89" // } // -type ShowThreadsReply struct { - Retval int32 - Count uint32 `struc:"sizeof=ThreadData"` - ThreadData []ThreadData +type GetNodeIndexReply struct { + Retval int32 + NodeIndex uint32 } -func (*ShowThreadsReply) GetMessageName() string { - return "show_threads_reply" +func (*GetNodeIndexReply) GetMessageName() string { + return "get_node_index_reply" } -func (*ShowThreadsReply) GetCrcString() string { - return "6942fb35" +func (*GetNodeIndexReply) GetCrcString() string { + return "a8600b89" } -func (*ShowThreadsReply) GetMessageType() api.MessageType { +func (*GetNodeIndexReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// GetNodeGraph represents VPP binary API message 'get_node_graph': +// ShowThreads represents VPP binary API message 'show_threads': // -// "get_node_graph", +// "show_threads", // [ // "u16", // "_vl_msg_id" @@ -659,21 +645,21 @@ func (*ShowThreadsReply) GetMessageType() api.MessageType { // "crc": "0x51077d14" // } // -type GetNodeGraph struct{} +type ShowThreads struct{} -func (*GetNodeGraph) GetMessageName() string { - return "get_node_graph" +func (*ShowThreads) GetMessageName() string { + return "show_threads" } -func (*GetNodeGraph) GetCrcString() string { +func (*ShowThreads) GetCrcString() string { return "51077d14" } -func (*GetNodeGraph) GetMessageType() api.MessageType { +func (*ShowThreads) GetMessageType() api.MessageType { return api.RequestMessage } -// GetNodeGraphReply represents VPP binary API message 'get_node_graph_reply': +// ShowThreadsReply represents VPP binary API message 'show_threads_reply': // -// "get_node_graph_reply", +// "show_threads_reply", // [ // "u16", // "_vl_msg_id" @@ -687,31 +673,38 @@ func (*GetNodeGraph) GetMessageType() api.MessageType { // "retval" // ], // [ -// "u64", -// "reply_in_shmem" +// "u32", +// "count" +// ], +// [ +// "vl_api_thread_data_t", +// "thread_data", +// 0, +// "count" // ], // { -// "crc": "0x06d68297" +// "crc": "0x6942fb35" // } // -type GetNodeGraphReply struct { - Retval int32 - ReplyInShmem uint64 +type ShowThreadsReply struct { + Retval int32 + Count uint32 `struc:"sizeof=ThreadData"` + ThreadData []ThreadData } -func (*GetNodeGraphReply) GetMessageName() string { - return "get_node_graph_reply" +func (*ShowThreadsReply) GetMessageName() string { + return "show_threads_reply" } -func (*GetNodeGraphReply) GetCrcString() string { - return "06d68297" +func (*ShowThreadsReply) GetCrcString() string { + return "6942fb35" } -func (*GetNodeGraphReply) GetMessageType() api.MessageType { +func (*ShowThreadsReply) GetMessageType() api.MessageType { return api.ReplyMessage } -// GetNextIndex represents VPP binary API message 'get_next_index': +// ShowVersion represents VPP binary API message 'show_version': // -// "get_next_index", +// "show_version", // [ // "u16", // "_vl_msg_id" @@ -724,38 +717,25 @@ func (*GetNodeGraphReply) GetMessageType() api.MessageType { // "u32", // "context" // ], -// [ -// "u8", -// "node_name", -// 64 -// ], -// [ -// "u8", -// "next_name", -// 64 -// ], // { -// "crc": "0x9ab92f7a" +// "crc": "0x51077d14" // } // -type GetNextIndex struct { - NodeName []byte `struc:"[64]byte"` - NextName []byte `struc:"[64]byte"` -} +type ShowVersion struct{} -func (*GetNextIndex) GetMessageName() string { - return "get_next_index" +func (*ShowVersion) GetMessageName() string { + return "show_version" } -func (*GetNextIndex) GetCrcString() string { - return "9ab92f7a" +func (*ShowVersion) GetCrcString() string { + return "51077d14" } -func (*GetNextIndex) GetMessageType() api.MessageType { +func (*ShowVersion) GetMessageType() api.MessageType { return api.RequestMessage } -// GetNextIndexReply represents VPP binary API message 'get_next_index_reply': +// ShowVersionReply represents VPP binary API message 'show_version_reply': // -// "get_next_index_reply", +// "show_version_reply", // [ // "u16", // "_vl_msg_id" @@ -769,45 +749,64 @@ func (*GetNextIndex) GetMessageType() api.MessageType { // "retval" // ], // [ -// "u32", -// "next_index" +// "string", +// "program" +// ], +// [ +// "string", +// "version" +// ], +// [ +// "string", +// "build_date" +// ], +// [ +// "string", +// "build_directory" // ], // { -// "crc": "0x2ed75f32" +// "crc": "0xb9bcf6df" // } // -type GetNextIndexReply struct { - Retval int32 - NextIndex uint32 +type ShowVersionReply struct { + Retval int32 + XXX_ProgramLen uint32 `struc:"sizeof=Program"` + Program string + XXX_VersionLen uint32 `struc:"sizeof=Version"` + Version string + XXX_BuildDateLen uint32 `struc:"sizeof=BuildDate"` + BuildDate string + XXX_BuildDirectoryLen uint32 `struc:"sizeof=BuildDirectory"` + BuildDirectory string } -func (*GetNextIndexReply) GetMessageName() string { - return "get_next_index_reply" +func (*ShowVersionReply) GetMessageName() string { + return "show_version_reply" } -func (*GetNextIndexReply) GetCrcString() string { - return "2ed75f32" +func (*ShowVersionReply) GetCrcString() string { + return "b9bcf6df" } -func (*GetNextIndexReply) GetMessageType() api.MessageType { +func (*ShowVersionReply) GetMessageType() api.MessageType { return api.ReplyMessage } func init() { - api.RegisterMessage((*ControlPing)(nil), "vpe.ControlPing") - api.RegisterMessage((*ControlPingReply)(nil), "vpe.ControlPingReply") + api.RegisterMessage((*AddNodeNext)(nil), "vpe.AddNodeNext") + api.RegisterMessage((*AddNodeNextReply)(nil), "vpe.AddNodeNextReply") api.RegisterMessage((*Cli)(nil), "vpe.Cli") api.RegisterMessage((*CliInband)(nil), "vpe.CliInband") - api.RegisterMessage((*CliReply)(nil), "vpe.CliReply") api.RegisterMessage((*CliInbandReply)(nil), "vpe.CliInbandReply") + api.RegisterMessage((*CliReply)(nil), "vpe.CliReply") + api.RegisterMessage((*ControlPing)(nil), "vpe.ControlPing") + api.RegisterMessage((*ControlPingReply)(nil), "vpe.ControlPingReply") + api.RegisterMessage((*GetNextIndex)(nil), "vpe.GetNextIndex") + api.RegisterMessage((*GetNextIndexReply)(nil), "vpe.GetNextIndexReply") + api.RegisterMessage((*GetNodeGraph)(nil), "vpe.GetNodeGraph") + api.RegisterMessage((*GetNodeGraphReply)(nil), "vpe.GetNodeGraphReply") api.RegisterMessage((*GetNodeIndex)(nil), "vpe.GetNodeIndex") api.RegisterMessage((*GetNodeIndexReply)(nil), "vpe.GetNodeIndexReply") - api.RegisterMessage((*AddNodeNext)(nil), "vpe.AddNodeNext") - api.RegisterMessage((*AddNodeNextReply)(nil), "vpe.AddNodeNextReply") - api.RegisterMessage((*ShowVersion)(nil), "vpe.ShowVersion") - api.RegisterMessage((*ShowVersionReply)(nil), "vpe.ShowVersionReply") api.RegisterMessage((*ShowThreads)(nil), "vpe.ShowThreads") api.RegisterMessage((*ShowThreadsReply)(nil), "vpe.ShowThreadsReply") - api.RegisterMessage((*GetNodeGraph)(nil), "vpe.GetNodeGraph") - api.RegisterMessage((*GetNodeGraphReply)(nil), "vpe.GetNodeGraphReply") - api.RegisterMessage((*GetNextIndex)(nil), "vpe.GetNextIndex") - api.RegisterMessage((*GetNextIndexReply)(nil), "vpe.GetNextIndexReply") + api.RegisterMessage((*ShowVersion)(nil), "vpe.ShowVersion") + api.RegisterMessage((*ShowVersionReply)(nil), "vpe.ShowVersionReply") } -- cgit 1.2.3-korg