diff options
Diffstat (limited to 'binapi/svs')
-rw-r--r-- | binapi/svs/svs.ba.go | 22 | ||||
-rw-r--r-- | binapi/svs/svs_rest.ba.go | 97 | ||||
-rw-r--r-- | binapi/svs/svs_rpc.ba.go | 21 |
3 files changed, 24 insertions, 116 deletions
diff --git a/binapi/svs/svs.ba.go b/binapi/svs/svs.ba.go index 911e936..d08173a 100644 --- a/binapi/svs/svs.ba.go +++ b/binapi/svs/svs.ba.go @@ -1,7 +1,7 @@ // Code generated by GoVPP's binapi-generator. DO NOT EDIT. // versions: -// binapi-generator: v0.4.0-dev -// VPP: 20.05-release +// binapi-generator: v0.6.0-dev +// VPP: 22.02-release // source: /usr/share/vpp/api/plugins/svs.api.json // Package svs contains generated bindings for API file svs.api. @@ -12,10 +12,10 @@ package svs import ( - api "git.fd.io/govpp.git/api" - interface_types "git.fd.io/govpp.git/binapi/interface_types" - ip_types "git.fd.io/govpp.git/binapi/ip_types" - codec "git.fd.io/govpp.git/codec" + api "go.fd.io/govpp/api" + interface_types "go.fd.io/govpp/binapi/interface_types" + ip_types "go.fd.io/govpp/binapi/ip_types" + codec "go.fd.io/govpp/codec" ) // This is a compile-time assertion to ensure that this generated file @@ -27,7 +27,7 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "svs" APIVersion = "1.0.0" - VersionCrc = 0x1644b2d6 + VersionCrc = 0x816cf275 ) // SvsDetails defines message 'svs_details'. @@ -39,7 +39,7 @@ type SvsDetails struct { func (m *SvsDetails) Reset() { *m = SvsDetails{} } func (*SvsDetails) GetMessageName() string { return "svs_details" } -func (*SvsDetails) GetCrcString() string { return "b8523d64" } +func (*SvsDetails) GetCrcString() string { return "6282cd55" } func (*SvsDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -250,7 +250,7 @@ type SvsRouteAddDel struct { func (m *SvsRouteAddDel) Reset() { *m = SvsRouteAddDel{} } func (*SvsRouteAddDel) GetMessageName() string { return "svs_route_add_del" } -func (*SvsRouteAddDel) GetCrcString() string { return "d39e31fc" } +func (*SvsRouteAddDel) GetCrcString() string { return "e49bc63c" } func (*SvsRouteAddDel) GetMessageType() api.MessageType { return api.RequestMessage } @@ -400,13 +400,13 @@ func (m *SvsTableAddDelReply) Unmarshal(b []byte) error { func init() { file_svs_binapi_init() } func file_svs_binapi_init() { - api.RegisterMessage((*SvsDetails)(nil), "svs_details_b8523d64") + api.RegisterMessage((*SvsDetails)(nil), "svs_details_6282cd55") api.RegisterMessage((*SvsDump)(nil), "svs_dump_51077d14") api.RegisterMessage((*SvsEnableDisable)(nil), "svs_enable_disable_634b89d2") api.RegisterMessage((*SvsEnableDisableReply)(nil), "svs_enable_disable_reply_e8d4e804") api.RegisterMessage((*SvsPluginGetVersion)(nil), "svs_plugin_get_version_51077d14") api.RegisterMessage((*SvsPluginGetVersionReply)(nil), "svs_plugin_get_version_reply_9b32cf86") - api.RegisterMessage((*SvsRouteAddDel)(nil), "svs_route_add_del_d39e31fc") + api.RegisterMessage((*SvsRouteAddDel)(nil), "svs_route_add_del_e49bc63c") api.RegisterMessage((*SvsRouteAddDelReply)(nil), "svs_route_add_del_reply_e8d4e804") api.RegisterMessage((*SvsTableAddDel)(nil), "svs_table_add_del_7d21cb2a") api.RegisterMessage((*SvsTableAddDelReply)(nil), "svs_table_add_del_reply_e8d4e804") diff --git a/binapi/svs/svs_rest.ba.go b/binapi/svs/svs_rest.ba.go deleted file mode 100644 index 4293223..0000000 --- a/binapi/svs/svs_rest.ba.go +++ /dev/null @@ -1,97 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package svs - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/svs_enable_disable", func(w http.ResponseWriter, req *http.Request) { - var request = new(SvsEnableDisable) - b, err := ioutil.ReadAll(req.Body) - if err != nil { - http.Error(w, "read body failed", http.StatusBadRequest) - return - } - if err := json.Unmarshal(b, request); err != nil { - http.Error(w, "unmarshal data failed", http.StatusBadRequest) - return - } - reply, err := rpc.SvsEnableDisable(req.Context(), request) - if err != nil { - http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError) - return - } - rep, err := json.MarshalIndent(reply, "", " ") - if err != nil { - http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError) - return - } - w.Write(rep) - }) - mux.HandleFunc("/svs_plugin_get_version", func(w http.ResponseWriter, req *http.Request) { - var request = new(SvsPluginGetVersion) - reply, err := rpc.SvsPluginGetVersion(req.Context(), request) - if err != nil { - http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError) - return - } - rep, err := json.MarshalIndent(reply, "", " ") - if err != nil { - http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError) - return - } - w.Write(rep) - }) - mux.HandleFunc("/svs_route_add_del", func(w http.ResponseWriter, req *http.Request) { - var request = new(SvsRouteAddDel) - b, err := ioutil.ReadAll(req.Body) - if err != nil { - http.Error(w, "read body failed", http.StatusBadRequest) - return - } - if err := json.Unmarshal(b, request); err != nil { - http.Error(w, "unmarshal data failed", http.StatusBadRequest) - return - } - reply, err := rpc.SvsRouteAddDel(req.Context(), request) - if err != nil { - http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError) - return - } - rep, err := json.MarshalIndent(reply, "", " ") - if err != nil { - http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError) - return - } - w.Write(rep) - }) - mux.HandleFunc("/svs_table_add_del", func(w http.ResponseWriter, req *http.Request) { - var request = new(SvsTableAddDel) - b, err := ioutil.ReadAll(req.Body) - if err != nil { - http.Error(w, "read body failed", http.StatusBadRequest) - return - } - if err := json.Unmarshal(b, request); err != nil { - http.Error(w, "unmarshal data failed", http.StatusBadRequest) - return - } - reply, err := rpc.SvsTableAddDel(req.Context(), request) - if err != nil { - http.Error(w, "request failed: "+err.Error(), http.StatusInternalServerError) - return - } - rep, err := json.MarshalIndent(reply, "", " ") - if err != nil { - http.Error(w, "marshal failed: "+err.Error(), http.StatusInternalServerError) - return - } - w.Write(rep) - }) - return http.HandlerFunc(mux.ServeHTTP) -} diff --git a/binapi/svs/svs_rpc.ba.go b/binapi/svs/svs_rpc.ba.go index d934f9e..8a4d78c 100644 --- a/binapi/svs/svs_rpc.ba.go +++ b/binapi/svs/svs_rpc.ba.go @@ -5,12 +5,13 @@ package svs import ( "context" "fmt" - api "git.fd.io/govpp.git/api" - vpe "git.fd.io/govpp.git/binapi/vpe" "io" + + api "go.fd.io/govpp/api" + memclnt "go.fd.io/govpp/binapi/memclnt" ) -// RPCService defines RPC service svs. +// RPCService defines RPC service svs. type RPCService interface { SvsDump(ctx context.Context, in *SvsDump) (RPCService_SvsDumpClient, error) SvsEnableDisable(ctx context.Context, in *SvsEnableDisable) (*SvsEnableDisableReply, error) @@ -36,7 +37,7 @@ func (c *serviceClient) SvsDump(ctx context.Context, in *SvsDump) (RPCService_Sv if err := x.Stream.SendMsg(in); err != nil { return nil, err } - if err = x.Stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err = x.Stream.SendMsg(&memclnt.ControlPing{}); err != nil { return nil, err } return x, nil @@ -59,7 +60,11 @@ func (c *serviceClient_SvsDumpClient) Recv() (*SvsDetails, error) { switch m := msg.(type) { case *SvsDetails: return m, nil - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: + err = c.Stream.Close() + if err != nil { + return nil, err + } return nil, io.EOF default: return nil, fmt.Errorf("unexpected message: %T %v", m, m) @@ -72,7 +77,7 @@ func (c *serviceClient) SvsEnableDisable(ctx context.Context, in *SvsEnableDisab if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) SvsPluginGetVersion(ctx context.Context, in *SvsPluginGetVersion) (*SvsPluginGetVersionReply, error) { @@ -90,7 +95,7 @@ func (c *serviceClient) SvsRouteAddDel(ctx context.Context, in *SvsRouteAddDel) if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) SvsTableAddDel(ctx context.Context, in *SvsTableAddDel) (*SvsTableAddDelReply, error) { @@ -99,5 +104,5 @@ func (c *serviceClient) SvsTableAddDel(ctx context.Context, in *SvsTableAddDel) if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } |