From a3bb834db727a3ac9a1ffcfeae9265e5dead851f Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Wed, 15 Aug 2018 12:59:25 +0200 Subject: Refactor GoVPP Squashed commit of the following: commit 348930db31575e9f59b3834d9fec07411f011e05 Author: Ondrej Fabry Date: Wed Aug 15 11:30:13 2018 +0200 Use debug level for log about different context commit 9fc963c559cea67a41b85c6cdadc322fb3b1fc7c Author: Ondrej Fabry Date: Wed Aug 15 11:22:03 2018 +0200 Remove annoying logs and add env vars for debugging commit fdc9fd624d13feadb602e0d03d58f8a44b7a565f Author: Ondrej Fabry Date: Wed Aug 15 11:18:47 2018 +0200 Fix printing unknown VPPApiError commit 8f968be36a91de4d4a8ea17593ba314f82aa9583 Author: Ondrej Fabry Date: Tue Aug 14 17:25:10 2018 +0200 Refactor entire GoVPP - fix some cases with inconsistent VPP messages, causing messages to be incorrectly identified as event or request - simplify API, remove direct access to internal Go channels - add module name with message to registration of messages - start watching filesystem only when vpe-api file does not exist - simplify code in message codec and remove unneeded parts - retrieve IDs of all registered messages after connect to VPP - define fallback for control ping in core to avoid duplicate registration - add SetLogLevel function to set logger level more easily - remove lot of unused code commit 34dd1b7e10ef0324aa8c4e4cc42375bd6021c6cb Author: Ondrej Fabry Date: Mon Aug 13 11:29:54 2018 +0200 Rename VnetError to VPPApiError commit c6549d6f77847a1367a12ff47fb716e2955e973a Author: Ondrej Fabry Date: Mon Aug 13 10:23:43 2018 +0200 Fix examples and regenerate binapi commit 4612e36b416779771f5efab4fc654c2766d2cb1c Author: Ondrej Fabry Date: Mon Aug 13 09:51:22 2018 +0200 Add parsing and generation for services commit ac9c5280c5aa27e325f327609e2364cc66f3723f Author: Ondrej Fabry Date: Fri Aug 10 14:30:15 2018 +0200 Fix exit status on error and add continue-onerror flag commit 9b3f4ef9fc7c8c62037fa107085eae18a8725314 Author: Ondrej Fabry Date: Thu Aug 9 15:20:56 2018 +0200 Return VnetError when Retval != 0 commit 8fd21a907b5e628ec4d2026215b83d15da96c297 Author: Ondrej Fabry Date: Thu Aug 9 14:59:05 2018 +0200 Add all missing errors from api_errno.h commit 08450f288d3046ebaecf40203174ae342a07f1eb Author: Ondrej Fabry Date: Thu Aug 9 14:29:27 2018 +0200 Update README commit d8dced0728dd62243539be741868fb7d9b8de4cc Author: Ondrej Fabry Date: Thu Aug 9 13:59:59 2018 +0200 Regenerate vpe in core commit 254da7592cdbf634cf7aa46ae36ce7bb6d4ee555 Author: Ondrej Fabry Date: Thu Aug 9 13:37:00 2018 +0200 Add VnetError type for Retvals commit 4475c1087fb53ab4c788e530bc7fef7cfc89d2cd Author: Ondrej Fabry Date: Thu Aug 9 13:36:07 2018 +0200 Add registration API commit 892a3ea5a2c703e2f7c29331663f6a6fa706bff5 Author: Ondrej Fabry Date: Thu Aug 9 13:30:43 2018 +0200 Generate registration for messages and check all IDs on connect commit 389ed03b6e7082260281866c3449d72d72347c99 Author: Ondrej Fabry Date: Thu Aug 9 11:32:41 2018 +0200 Show error for empty adapter (on Darwin/Windows) commit ef1ea040d656ade64242432dc5f06810ed8dcde6 Author: Ondrej Fabry Date: Thu Aug 9 11:31:37 2018 +0200 Improve logged info commit d4adae3b14ed54c8d693060dd857fa9ba5ec8e06 Author: Ondrej Fabry Date: Thu Aug 9 11:27:48 2018 +0200 Update examples commit 63921e1346014701a22639a2611129563bb1eb78 Author: Ondrej Fabry Date: Thu Aug 9 11:02:56 2018 +0200 Generate unions and fix some issues - add comments between sections - define structs on single line if it has no fields - generate unions with setters/getters for each field - fix detection of message type commit 6ab3e3fa590b245898306a6ffaf32c7721eab60c Author: Ondrej Fabry Date: Wed Aug 8 15:37:10 2018 +0200 Refactor binapi-generator - split JSON parsing from code generation - parse and generate enums - parse unions (no generation yet) - change output file suffix to '.ba.go' - cleanup and simplify code - split code into files - add flag for debug mode Change-Id: I58f685e0d4c7a38e9a7b6ea0a1f47792d95d7399 Signed-off-by: Ondrej Fabry --- core/bin_api/vpe/vpe.go | 711 ------------------------------------------------ 1 file changed, 711 deletions(-) delete mode 100644 core/bin_api/vpe/vpe.go (limited to 'core/bin_api/vpe/vpe.go') diff --git a/core/bin_api/vpe/vpe.go b/core/bin_api/vpe/vpe.go deleted file mode 100644 index 547e200..0000000 --- a/core/bin_api/vpe/vpe.go +++ /dev/null @@ -1,711 +0,0 @@ -// Code generated by govpp binapi-generator DO NOT EDIT. -// Package vpe represents the VPP binary API of the 'vpe' VPP module. -// Generated from 'bin_api/vpe.api.json' -package vpe - -import "git.fd.io/govpp.git/api" - -// VlApiVersion contains version of the API. -const VlAPIVersion = 0xe02a02b0 - -// ControlPing represents the VPP binary API message 'control_ping'. -// Generated from 'bin_api/vpe.api.json', line 48: -// -// "control_ping", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// { -// "crc": "0x51077d14" -// } -// -type ControlPing struct { -} - -func (*ControlPing) GetMessageName() string { - return "control_ping" -} -func (*ControlPing) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*ControlPing) GetCrcString() string { - return "51077d14" -} -func NewControlPing() api.Message { - return &ControlPing{} -} - -// ControlPingReply represents the VPP binary API message 'control_ping_reply'. -// Generated from 'bin_api/vpe.api.json', line 66: -// -// "control_ping_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "vpe_pid" -// ], -// { -// "crc": "0xf6b0b8ca" -// } -// -type ControlPingReply struct { - Retval int32 - ClientIndex uint32 - VpePid uint32 -} - -func (*ControlPingReply) GetMessageName() string { - return "control_ping_reply" -} -func (*ControlPingReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*ControlPingReply) GetCrcString() string { - return "f6b0b8ca" -} -func NewControlPingReply() api.Message { - return &ControlPingReply{} -} - -// Cli represents the VPP binary API message 'cli'. -// Generated from 'bin_api/vpe.api.json', line 92: -// -// "cli", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "u64", -// "cmd_in_shmem" -// ], -// { -// "crc": "0x23bfbfff" -// } -// -type Cli struct { - CmdInShmem uint64 -} - -func (*Cli) GetMessageName() string { - return "cli" -} -func (*Cli) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*Cli) GetCrcString() string { - return "23bfbfff" -} -func NewCli() api.Message { - return &Cli{} -} - -// CliInband represents the VPP binary API message 'cli_inband'. -// Generated from 'bin_api/vpe.api.json', line 114: -// -// "cli_inband", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "u32", -// "length" -// ], -// [ -// "u8", -// "cmd", -// 0, -// "length" -// ], -// { -// "crc": "0x74e00a49" -// } -// -type CliInband struct { - Length uint32 `struc:"sizeof=Cmd"` - Cmd []byte -} - -func (*CliInband) GetMessageName() string { - return "cli_inband" -} -func (*CliInband) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*CliInband) GetCrcString() string { - return "74e00a49" -} -func NewCliInband() api.Message { - return &CliInband{} -} - -// CliReply represents the VPP binary API message 'cli_reply'. -// Generated from 'bin_api/vpe.api.json', line 142: -// -// "cli_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u64", -// "reply_in_shmem" -// ], -// { -// "crc": "0x06d68297" -// } -// -type CliReply struct { - Retval int32 - ReplyInShmem uint64 -} - -func (*CliReply) GetMessageName() string { - return "cli_reply" -} -func (*CliReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*CliReply) GetCrcString() string { - return "06d68297" -} -func NewCliReply() api.Message { - return &CliReply{} -} - -// CliInbandReply represents the VPP binary API message 'cli_inband_reply'. -// Generated from 'bin_api/vpe.api.json', line 164: -// -// "cli_inband_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u32", -// "length" -// ], -// [ -// "u8", -// "reply", -// 0, -// "length" -// ], -// { -// "crc": "0x1f22bbb8" -// } -// -type CliInbandReply struct { - Retval int32 - Length uint32 `struc:"sizeof=Reply"` - Reply []byte -} - -func (*CliInbandReply) GetMessageName() string { - return "cli_inband_reply" -} -func (*CliInbandReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*CliInbandReply) GetCrcString() string { - return "1f22bbb8" -} -func NewCliInbandReply() api.Message { - return &CliInbandReply{} -} - -// GetNodeIndex represents the VPP binary API message 'get_node_index'. -// Generated from 'bin_api/vpe.api.json', line 192: -// -// "get_node_index", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "u8", -// "node_name", -// 64 -// ], -// { -// "crc": "0x6c9a495d" -// } -// -type GetNodeIndex struct { - NodeName []byte `struc:"[64]byte"` -} - -func (*GetNodeIndex) GetMessageName() string { - return "get_node_index" -} -func (*GetNodeIndex) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*GetNodeIndex) GetCrcString() string { - return "6c9a495d" -} -func NewGetNodeIndex() api.Message { - return &GetNodeIndex{} -} - -// GetNodeIndexReply represents the VPP binary API message 'get_node_index_reply'. -// Generated from 'bin_api/vpe.api.json', line 215: -// -// "get_node_index_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u32", -// "node_index" -// ], -// { -// "crc": "0xa8600b89" -// } -// -type GetNodeIndexReply struct { - Retval int32 - NodeIndex uint32 -} - -func (*GetNodeIndexReply) GetMessageName() string { - return "get_node_index_reply" -} -func (*GetNodeIndexReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*GetNodeIndexReply) GetCrcString() string { - return "a8600b89" -} -func NewGetNodeIndexReply() api.Message { - return &GetNodeIndexReply{} -} - -// AddNodeNext represents the VPP binary API message 'add_node_next'. -// Generated from 'bin_api/vpe.api.json', line 237: -// -// "add_node_next", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "u8", -// "node_name", -// 64 -// ], -// [ -// "u8", -// "next_name", -// 64 -// ], -// { -// "crc": "0x9ab92f7a" -// } -// -type AddNodeNext struct { - NodeName []byte `struc:"[64]byte"` - NextName []byte `struc:"[64]byte"` -} - -func (*AddNodeNext) GetMessageName() string { - return "add_node_next" -} -func (*AddNodeNext) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*AddNodeNext) GetCrcString() string { - return "9ab92f7a" -} -func NewAddNodeNext() api.Message { - return &AddNodeNext{} -} - -// AddNodeNextReply represents the VPP binary API message 'add_node_next_reply'. -// Generated from 'bin_api/vpe.api.json', line 265: -// -// "add_node_next_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u32", -// "next_index" -// ], -// { -// "crc": "0x2ed75f32" -// } -// -type AddNodeNextReply struct { - Retval int32 - NextIndex uint32 -} - -func (*AddNodeNextReply) GetMessageName() string { - return "add_node_next_reply" -} -func (*AddNodeNextReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*AddNodeNextReply) GetCrcString() string { - return "2ed75f32" -} -func NewAddNodeNextReply() api.Message { - return &AddNodeNextReply{} -} - -// ShowVersion represents the VPP binary API message 'show_version'. -// Generated from 'bin_api/vpe.api.json', line 287: -// -// "show_version", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// { -// "crc": "0x51077d14" -// } -// -type ShowVersion struct { -} - -func (*ShowVersion) GetMessageName() string { - return "show_version" -} -func (*ShowVersion) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*ShowVersion) GetCrcString() string { - return "51077d14" -} -func NewShowVersion() api.Message { - return &ShowVersion{} -} - -// ShowVersionReply represents the VPP binary API message 'show_version_reply'. -// Generated from 'bin_api/vpe.api.json', line 305: -// -// "show_version_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u8", -// "program", -// 32 -// ], -// [ -// "u8", -// "version", -// 32 -// ], -// [ -// "u8", -// "build_date", -// 32 -// ], -// [ -// "u8", -// "build_directory", -// 256 -// ], -// { -// "crc": "0x8b5a13b4" -// } -// -type ShowVersionReply struct { - Retval int32 - Program []byte `struc:"[32]byte"` - Version []byte `struc:"[32]byte"` - BuildDate []byte `struc:"[32]byte"` - BuildDirectory []byte `struc:"[256]byte"` -} - -func (*ShowVersionReply) GetMessageName() string { - return "show_version_reply" -} -func (*ShowVersionReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*ShowVersionReply) GetCrcString() string { - return "8b5a13b4" -} -func NewShowVersionReply() api.Message { - return &ShowVersionReply{} -} - -// GetNodeGraph represents the VPP binary API message 'get_node_graph'. -// Generated from 'bin_api/vpe.api.json', line 343: -// -// "get_node_graph", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// { -// "crc": "0x51077d14" -// } -// -type GetNodeGraph struct { -} - -func (*GetNodeGraph) GetMessageName() string { - return "get_node_graph" -} -func (*GetNodeGraph) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*GetNodeGraph) GetCrcString() string { - return "51077d14" -} -func NewGetNodeGraph() api.Message { - return &GetNodeGraph{} -} - -// GetNodeGraphReply represents the VPP binary API message 'get_node_graph_reply'. -// Generated from 'bin_api/vpe.api.json', line 361: -// -// "get_node_graph_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u64", -// "reply_in_shmem" -// ], -// { -// "crc": "0x06d68297" -// } -// -type GetNodeGraphReply struct { - Retval int32 - ReplyInShmem uint64 -} - -func (*GetNodeGraphReply) GetMessageName() string { - return "get_node_graph_reply" -} -func (*GetNodeGraphReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*GetNodeGraphReply) GetCrcString() string { - return "06d68297" -} -func NewGetNodeGraphReply() api.Message { - return &GetNodeGraphReply{} -} - -// GetNextIndex represents the VPP binary API message 'get_next_index'. -// Generated from 'bin_api/vpe.api.json', line 383: -// -// "get_next_index", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "client_index" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "u8", -// "node_name", -// 64 -// ], -// [ -// "u8", -// "next_name", -// 64 -// ], -// { -// "crc": "0x9ab92f7a" -// } -// -type GetNextIndex struct { - NodeName []byte `struc:"[64]byte"` - NextName []byte `struc:"[64]byte"` -} - -func (*GetNextIndex) GetMessageName() string { - return "get_next_index" -} -func (*GetNextIndex) GetMessageType() api.MessageType { - return api.RequestMessage -} -func (*GetNextIndex) GetCrcString() string { - return "9ab92f7a" -} -func NewGetNextIndex() api.Message { - return &GetNextIndex{} -} - -// GetNextIndexReply represents the VPP binary API message 'get_next_index_reply'. -// Generated from 'bin_api/vpe.api.json', line 411: -// -// "get_next_index_reply", -// [ -// "u16", -// "_vl_msg_id" -// ], -// [ -// "u32", -// "context" -// ], -// [ -// "i32", -// "retval" -// ], -// [ -// "u32", -// "next_index" -// ], -// { -// "crc": "0x2ed75f32" -// } -// -type GetNextIndexReply struct { - Retval int32 - NextIndex uint32 -} - -func (*GetNextIndexReply) GetMessageName() string { - return "get_next_index_reply" -} -func (*GetNextIndexReply) GetMessageType() api.MessageType { - return api.ReplyMessage -} -func (*GetNextIndexReply) GetCrcString() string { - return "2ed75f32" -} -func NewGetNextIndexReply() api.Message { - return &GetNextIndexReply{} -} -- cgit 1.2.3-korg