diff options
Diffstat (limited to 'binapi/igmp')
-rw-r--r-- | binapi/igmp/igmp.ba.go | 35 | ||||
-rw-r--r-- | binapi/igmp/igmp_rest.ba.go | 175 | ||||
-rw-r--r-- | binapi/igmp/igmp_rpc.ba.go | 37 |
3 files changed, 41 insertions, 206 deletions
diff --git a/binapi/igmp/igmp.ba.go b/binapi/igmp/igmp.ba.go index 5026657..8dc9a3d 100644 --- a/binapi/igmp/igmp.ba.go +++ b/binapi/igmp/igmp.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/igmp.api.json // Package igmp contains generated bindings for API file igmp.api. @@ -14,11 +14,12 @@ package igmp 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" "strconv" + + 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 @@ -30,7 +31,7 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "igmp" APIVersion = "1.0.0" - VersionCrc = 0x290eccf8 + VersionCrc = 0x95a4ff29 ) // FilterMode defines enum 'filter_mode'. @@ -177,7 +178,7 @@ type IgmpDetails struct { func (m *IgmpDetails) Reset() { *m = IgmpDetails{} } func (*IgmpDetails) GetMessageName() string { return "igmp_details" } -func (*IgmpDetails) GetCrcString() string { return "52f12a89" } +func (*IgmpDetails) GetCrcString() string { return "38f09929" } func (*IgmpDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -326,7 +327,7 @@ type IgmpEvent struct { func (m *IgmpEvent) Reset() { *m = IgmpEvent{} } func (*IgmpEvent) GetMessageName() string { return "igmp_event" } -func (*IgmpEvent) GetCrcString() string { return "d7696eaf" } +func (*IgmpEvent) GetCrcString() string { return "85fe93ec" } func (*IgmpEvent) GetMessageType() api.MessageType { return api.OtherMessage } @@ -368,7 +369,7 @@ type IgmpGroupPrefixDetails struct { func (m *IgmpGroupPrefixDetails) Reset() { *m = IgmpGroupPrefixDetails{} } func (*IgmpGroupPrefixDetails) GetMessageName() string { return "igmp_group_prefix_details" } -func (*IgmpGroupPrefixDetails) GetCrcString() string { return "c3b3c526" } +func (*IgmpGroupPrefixDetails) GetCrcString() string { return "259ccd81" } func (*IgmpGroupPrefixDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -437,7 +438,7 @@ type IgmpGroupPrefixSet struct { func (m *IgmpGroupPrefixSet) Reset() { *m = IgmpGroupPrefixSet{} } func (*IgmpGroupPrefixSet) GetMessageName() string { return "igmp_group_prefix_set" } -func (*IgmpGroupPrefixSet) GetCrcString() string { return "d4f20ac5" } +func (*IgmpGroupPrefixSet) GetCrcString() string { return "5b14a5ce" } func (*IgmpGroupPrefixSet) GetMessageType() api.MessageType { return api.RequestMessage } @@ -512,7 +513,7 @@ type IgmpListen struct { func (m *IgmpListen) Reset() { *m = IgmpListen{} } func (*IgmpListen) GetMessageName() string { return "igmp_listen" } -func (*IgmpListen) GetCrcString() string { return "3f93a51a" } +func (*IgmpListen) GetCrcString() string { return "19a49f1e" } func (*IgmpListen) GetMessageType() api.MessageType { return api.RequestMessage } @@ -825,16 +826,16 @@ func init() { file_igmp_binapi_init() } func file_igmp_binapi_init() { api.RegisterMessage((*IgmpClearInterface)(nil), "igmp_clear_interface_f9e6675e") api.RegisterMessage((*IgmpClearInterfaceReply)(nil), "igmp_clear_interface_reply_e8d4e804") - api.RegisterMessage((*IgmpDetails)(nil), "igmp_details_52f12a89") + api.RegisterMessage((*IgmpDetails)(nil), "igmp_details_38f09929") api.RegisterMessage((*IgmpDump)(nil), "igmp_dump_f9e6675e") api.RegisterMessage((*IgmpEnableDisable)(nil), "igmp_enable_disable_b1edfb96") api.RegisterMessage((*IgmpEnableDisableReply)(nil), "igmp_enable_disable_reply_e8d4e804") - api.RegisterMessage((*IgmpEvent)(nil), "igmp_event_d7696eaf") - api.RegisterMessage((*IgmpGroupPrefixDetails)(nil), "igmp_group_prefix_details_c3b3c526") + api.RegisterMessage((*IgmpEvent)(nil), "igmp_event_85fe93ec") + api.RegisterMessage((*IgmpGroupPrefixDetails)(nil), "igmp_group_prefix_details_259ccd81") api.RegisterMessage((*IgmpGroupPrefixDump)(nil), "igmp_group_prefix_dump_51077d14") - api.RegisterMessage((*IgmpGroupPrefixSet)(nil), "igmp_group_prefix_set_d4f20ac5") + api.RegisterMessage((*IgmpGroupPrefixSet)(nil), "igmp_group_prefix_set_5b14a5ce") api.RegisterMessage((*IgmpGroupPrefixSetReply)(nil), "igmp_group_prefix_set_reply_e8d4e804") - api.RegisterMessage((*IgmpListen)(nil), "igmp_listen_3f93a51a") + api.RegisterMessage((*IgmpListen)(nil), "igmp_listen_19a49f1e") api.RegisterMessage((*IgmpListenReply)(nil), "igmp_listen_reply_e8d4e804") api.RegisterMessage((*IgmpProxyDeviceAddDel)(nil), "igmp_proxy_device_add_del_0b9be9ce") api.RegisterMessage((*IgmpProxyDeviceAddDelInterface)(nil), "igmp_proxy_device_add_del_interface_1a9ec24a") diff --git a/binapi/igmp/igmp_rest.ba.go b/binapi/igmp/igmp_rest.ba.go deleted file mode 100644 index c3869ff..0000000 --- a/binapi/igmp/igmp_rest.ba.go +++ /dev/null @@ -1,175 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package igmp - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/igmp_clear_interface", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpClearInterface) - 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.IgmpClearInterface(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("/igmp_enable_disable", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpEnableDisable) - 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.IgmpEnableDisable(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("/igmp_group_prefix_set", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpGroupPrefixSet) - 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.IgmpGroupPrefixSet(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("/igmp_listen", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpListen) - 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.IgmpListen(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("/igmp_proxy_device_add_del", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpProxyDeviceAddDel) - 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.IgmpProxyDeviceAddDel(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("/igmp_proxy_device_add_del_interface", func(w http.ResponseWriter, req *http.Request) { - var request = new(IgmpProxyDeviceAddDelInterface) - 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.IgmpProxyDeviceAddDelInterface(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("/want_igmp_events", func(w http.ResponseWriter, req *http.Request) { - var request = new(WantIgmpEvents) - 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.WantIgmpEvents(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/igmp/igmp_rpc.ba.go b/binapi/igmp/igmp_rpc.ba.go index b873bda..74c3b41 100644 --- a/binapi/igmp/igmp_rpc.ba.go +++ b/binapi/igmp/igmp_rpc.ba.go @@ -5,12 +5,13 @@ package igmp 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 igmp. +// RPCService defines RPC service igmp. type RPCService interface { IgmpClearInterface(ctx context.Context, in *IgmpClearInterface) (*IgmpClearInterfaceReply, error) IgmpDump(ctx context.Context, in *IgmpDump) (RPCService_IgmpDumpClient, error) @@ -37,7 +38,7 @@ func (c *serviceClient) IgmpClearInterface(ctx context.Context, in *IgmpClearInt if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) IgmpDump(ctx context.Context, in *IgmpDump) (RPCService_IgmpDumpClient, error) { @@ -49,7 +50,7 @@ func (c *serviceClient) IgmpDump(ctx context.Context, in *IgmpDump) (RPCService_ 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 @@ -72,7 +73,11 @@ func (c *serviceClient_IgmpDumpClient) Recv() (*IgmpDetails, error) { switch m := msg.(type) { case *IgmpDetails: 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) @@ -85,7 +90,7 @@ func (c *serviceClient) IgmpEnableDisable(ctx context.Context, in *IgmpEnableDis if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) IgmpGroupPrefixDump(ctx context.Context, in *IgmpGroupPrefixDump) (RPCService_IgmpGroupPrefixDumpClient, error) { @@ -97,7 +102,7 @@ func (c *serviceClient) IgmpGroupPrefixDump(ctx context.Context, in *IgmpGroupPr 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 @@ -120,7 +125,11 @@ func (c *serviceClient_IgmpGroupPrefixDumpClient) Recv() (*IgmpGroupPrefixDetail switch m := msg.(type) { case *IgmpGroupPrefixDetails: 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) @@ -133,7 +142,7 @@ func (c *serviceClient) IgmpGroupPrefixSet(ctx context.Context, in *IgmpGroupPre if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) IgmpListen(ctx context.Context, in *IgmpListen) (*IgmpListenReply, error) { @@ -142,7 +151,7 @@ func (c *serviceClient) IgmpListen(ctx context.Context, in *IgmpListen) (*IgmpLi if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) IgmpProxyDeviceAddDel(ctx context.Context, in *IgmpProxyDeviceAddDel) (*IgmpProxyDeviceAddDelReply, error) { @@ -151,7 +160,7 @@ func (c *serviceClient) IgmpProxyDeviceAddDel(ctx context.Context, in *IgmpProxy if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) IgmpProxyDeviceAddDelInterface(ctx context.Context, in *IgmpProxyDeviceAddDelInterface) (*IgmpProxyDeviceAddDelInterfaceReply, error) { @@ -160,7 +169,7 @@ func (c *serviceClient) IgmpProxyDeviceAddDelInterface(ctx context.Context, in * if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) WantIgmpEvents(ctx context.Context, in *WantIgmpEvents) (*WantIgmpEventsReply, error) { @@ -169,5 +178,5 @@ func (c *serviceClient) WantIgmpEvents(ctx context.Context, in *WantIgmpEvents) if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } |