diff options
Diffstat (limited to 'binapi/dhcp')
-rw-r--r-- | binapi/dhcp/dhcp.ba.go | 53 | ||||
-rw-r--r-- | binapi/dhcp/dhcp_rest.ba.go | 249 | ||||
-rw-r--r-- | binapi/dhcp/dhcp_rpc.ba.go | 43 |
3 files changed, 53 insertions, 292 deletions
diff --git a/binapi/dhcp/dhcp.ba.go b/binapi/dhcp/dhcp.ba.go index 7e0fd0b..941447f 100644 --- a/binapi/dhcp/dhcp.ba.go +++ b/binapi/dhcp/dhcp.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/dhcp.api.json // Package dhcp contains generated bindings for API file dhcp.api. @@ -14,12 +14,13 @@ package dhcp import ( - api "git.fd.io/govpp.git/api" - ethernet_types "git.fd.io/govpp.git/binapi/ethernet_types" - 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" + ethernet_types "go.fd.io/govpp/binapi/ethernet_types" + 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 @@ -31,7 +32,7 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "dhcp" APIVersion = "3.0.1" - VersionCrc = 0x96274cae + VersionCrc = 0x3cf8291a ) // DHCPClientState defines enum 'dhcp_client_state'. @@ -359,7 +360,7 @@ type DHCP6PdReplyEvent struct { func (m *DHCP6PdReplyEvent) Reset() { *m = DHCP6PdReplyEvent{} } func (*DHCP6PdReplyEvent) GetMessageName() string { return "dhcp6_pd_reply_event" } -func (*DHCP6PdReplyEvent) GetCrcString() string { return "cb3e462b" } +func (*DHCP6PdReplyEvent) GetCrcString() string { return "5e878029" } func (*DHCP6PdReplyEvent) GetMessageType() api.MessageType { return api.EventMessage } @@ -458,7 +459,7 @@ type DHCP6PdSendClientMessage struct { func (m *DHCP6PdSendClientMessage) Reset() { *m = DHCP6PdSendClientMessage{} } func (*DHCP6PdSendClientMessage) GetMessageName() string { return "dhcp6_pd_send_client_message" } -func (*DHCP6PdSendClientMessage) GetCrcString() string { return "064badb8" } +func (*DHCP6PdSendClientMessage) GetCrcString() string { return "3739fd8d" } func (*DHCP6PdSendClientMessage) GetMessageType() api.MessageType { return api.RequestMessage } @@ -594,7 +595,7 @@ type DHCP6ReplyEvent struct { func (m *DHCP6ReplyEvent) Reset() { *m = DHCP6ReplyEvent{} } func (*DHCP6ReplyEvent) GetMessageName() string { return "dhcp6_reply_event" } -func (*DHCP6ReplyEvent) GetCrcString() string { return "9f3af9e5" } +func (*DHCP6ReplyEvent) GetCrcString() string { return "85b7b17e" } func (*DHCP6ReplyEvent) GetMessageType() api.MessageType { return api.EventMessage } @@ -690,7 +691,7 @@ type DHCP6SendClientMessage struct { func (m *DHCP6SendClientMessage) Reset() { *m = DHCP6SendClientMessage{} } func (*DHCP6SendClientMessage) GetMessageName() string { return "dhcp6_send_client_message" } -func (*DHCP6SendClientMessage) GetCrcString() string { return "f6f14ef0" } +func (*DHCP6SendClientMessage) GetCrcString() string { return "f8222476" } func (*DHCP6SendClientMessage) GetMessageType() api.MessageType { return api.RequestMessage } @@ -812,7 +813,7 @@ type DHCPClientConfig struct { func (m *DHCPClientConfig) Reset() { *m = DHCPClientConfig{} } func (*DHCPClientConfig) GetMessageName() string { return "dhcp_client_config" } -func (*DHCPClientConfig) GetCrcString() string { return "959b80a3" } +func (*DHCPClientConfig) GetCrcString() string { return "1af013ea" } func (*DHCPClientConfig) GetMessageType() api.MessageType { return api.RequestMessage } @@ -901,7 +902,7 @@ type DHCPClientDetails struct { func (m *DHCPClientDetails) Reset() { *m = DHCPClientDetails{} } func (*DHCPClientDetails) GetMessageName() string { return "dhcp_client_details" } -func (*DHCPClientDetails) GetCrcString() string { return "acd82f5a" } +func (*DHCPClientDetails) GetCrcString() string { return "3c5cd28a" } func (*DHCPClientDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -1036,7 +1037,7 @@ type DHCPComplEvent struct { func (m *DHCPComplEvent) Reset() { *m = DHCPComplEvent{} } func (*DHCPComplEvent) GetMessageName() string { return "dhcp_compl_event" } -func (*DHCPComplEvent) GetCrcString() string { return "e908fd1d" } +func (*DHCPComplEvent) GetCrcString() string { return "554a44e5" } func (*DHCPComplEvent) GetMessageType() api.MessageType { return api.EventMessage } @@ -1260,7 +1261,7 @@ type DHCPProxyConfig struct { func (m *DHCPProxyConfig) Reset() { *m = DHCPProxyConfig{} } func (*DHCPProxyConfig) GetMessageName() string { return "dhcp_proxy_config" } -func (*DHCPProxyConfig) GetCrcString() string { return "6767230e" } +func (*DHCPProxyConfig) GetCrcString() string { return "4058a689" } func (*DHCPProxyConfig) GetMessageType() api.MessageType { return api.RequestMessage } @@ -1352,7 +1353,7 @@ type DHCPProxyDetails struct { func (m *DHCPProxyDetails) Reset() { *m = DHCPProxyDetails{} } func (*DHCPProxyDetails) GetMessageName() string { return "dhcp_proxy_details" } -func (*DHCPProxyDetails) GetCrcString() string { return "ce16f044" } +func (*DHCPProxyDetails) GetCrcString() string { return "dcbaf540" } func (*DHCPProxyDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -1698,24 +1699,24 @@ func file_dhcp_binapi_init() { api.RegisterMessage((*DHCP6ClientsEnableDisableReply)(nil), "dhcp6_clients_enable_disable_reply_e8d4e804") api.RegisterMessage((*DHCP6DuidLlSet)(nil), "dhcp6_duid_ll_set_0f6ca323") api.RegisterMessage((*DHCP6DuidLlSetReply)(nil), "dhcp6_duid_ll_set_reply_e8d4e804") - api.RegisterMessage((*DHCP6PdReplyEvent)(nil), "dhcp6_pd_reply_event_cb3e462b") - api.RegisterMessage((*DHCP6PdSendClientMessage)(nil), "dhcp6_pd_send_client_message_064badb8") + api.RegisterMessage((*DHCP6PdReplyEvent)(nil), "dhcp6_pd_reply_event_5e878029") + api.RegisterMessage((*DHCP6PdSendClientMessage)(nil), "dhcp6_pd_send_client_message_3739fd8d") api.RegisterMessage((*DHCP6PdSendClientMessageReply)(nil), "dhcp6_pd_send_client_message_reply_e8d4e804") - api.RegisterMessage((*DHCP6ReplyEvent)(nil), "dhcp6_reply_event_9f3af9e5") - api.RegisterMessage((*DHCP6SendClientMessage)(nil), "dhcp6_send_client_message_f6f14ef0") + api.RegisterMessage((*DHCP6ReplyEvent)(nil), "dhcp6_reply_event_85b7b17e") + api.RegisterMessage((*DHCP6SendClientMessage)(nil), "dhcp6_send_client_message_f8222476") api.RegisterMessage((*DHCP6SendClientMessageReply)(nil), "dhcp6_send_client_message_reply_e8d4e804") - api.RegisterMessage((*DHCPClientConfig)(nil), "dhcp_client_config_959b80a3") + api.RegisterMessage((*DHCPClientConfig)(nil), "dhcp_client_config_1af013ea") api.RegisterMessage((*DHCPClientConfigReply)(nil), "dhcp_client_config_reply_e8d4e804") - api.RegisterMessage((*DHCPClientDetails)(nil), "dhcp_client_details_acd82f5a") + api.RegisterMessage((*DHCPClientDetails)(nil), "dhcp_client_details_3c5cd28a") api.RegisterMessage((*DHCPClientDump)(nil), "dhcp_client_dump_51077d14") - api.RegisterMessage((*DHCPComplEvent)(nil), "dhcp_compl_event_e908fd1d") + api.RegisterMessage((*DHCPComplEvent)(nil), "dhcp_compl_event_554a44e5") api.RegisterMessage((*DHCPPluginControlPing)(nil), "dhcp_plugin_control_ping_51077d14") api.RegisterMessage((*DHCPPluginControlPingReply)(nil), "dhcp_plugin_control_ping_reply_f6b0b8ca") api.RegisterMessage((*DHCPPluginGetVersion)(nil), "dhcp_plugin_get_version_51077d14") api.RegisterMessage((*DHCPPluginGetVersionReply)(nil), "dhcp_plugin_get_version_reply_9b32cf86") - api.RegisterMessage((*DHCPProxyConfig)(nil), "dhcp_proxy_config_6767230e") + api.RegisterMessage((*DHCPProxyConfig)(nil), "dhcp_proxy_config_4058a689") api.RegisterMessage((*DHCPProxyConfigReply)(nil), "dhcp_proxy_config_reply_e8d4e804") - api.RegisterMessage((*DHCPProxyDetails)(nil), "dhcp_proxy_details_ce16f044") + api.RegisterMessage((*DHCPProxyDetails)(nil), "dhcp_proxy_details_dcbaf540") api.RegisterMessage((*DHCPProxyDump)(nil), "dhcp_proxy_dump_5c5b063f") api.RegisterMessage((*DHCPProxySetVss)(nil), "dhcp_proxy_set_vss_50537301") api.RegisterMessage((*DHCPProxySetVssReply)(nil), "dhcp_proxy_set_vss_reply_e8d4e804") diff --git a/binapi/dhcp/dhcp_rest.ba.go b/binapi/dhcp/dhcp_rest.ba.go deleted file mode 100644 index 4a4d9d1..0000000 --- a/binapi/dhcp/dhcp_rest.ba.go +++ /dev/null @@ -1,249 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package dhcp - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/dhcp6_clients_enable_disable", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCP6ClientsEnableDisable) - 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.DHCP6ClientsEnableDisable(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("/dhcp6_duid_ll_set", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCP6DuidLlSet) - 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.DHCP6DuidLlSet(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("/dhcp6_pd_send_client_message", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCP6PdSendClientMessage) - 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.DHCP6PdSendClientMessage(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("/dhcp6_send_client_message", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCP6SendClientMessage) - 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.DHCP6SendClientMessage(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("/dhcp_client_config", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCPClientConfig) - 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.DHCPClientConfig(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("/dhcp_plugin_control_ping", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCPPluginControlPing) - reply, err := rpc.DHCPPluginControlPing(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("/dhcp_plugin_get_version", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCPPluginGetVersion) - reply, err := rpc.DHCPPluginGetVersion(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("/dhcp_proxy_config", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCPProxyConfig) - 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.DHCPProxyConfig(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("/dhcp_proxy_set_vss", func(w http.ResponseWriter, req *http.Request) { - var request = new(DHCPProxySetVss) - 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.DHCPProxySetVss(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_dhcp6_pd_reply_events", func(w http.ResponseWriter, req *http.Request) { - var request = new(WantDHCP6PdReplyEvents) - 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.WantDHCP6PdReplyEvents(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_dhcp6_reply_events", func(w http.ResponseWriter, req *http.Request) { - var request = new(WantDHCP6ReplyEvents) - 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.WantDHCP6ReplyEvents(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/dhcp/dhcp_rpc.ba.go b/binapi/dhcp/dhcp_rpc.ba.go index 379bb9b..757c04e 100644 --- a/binapi/dhcp/dhcp_rpc.ba.go +++ b/binapi/dhcp/dhcp_rpc.ba.go @@ -5,12 +5,13 @@ package dhcp 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 dhcp. +// RPCService defines RPC service dhcp. type RPCService interface { DHCP6ClientsEnableDisable(ctx context.Context, in *DHCP6ClientsEnableDisable) (*DHCP6ClientsEnableDisableReply, error) DHCP6DuidLlSet(ctx context.Context, in *DHCP6DuidLlSet) (*DHCP6DuidLlSetReply, error) @@ -41,7 +42,7 @@ func (c *serviceClient) DHCP6ClientsEnableDisable(ctx context.Context, in *DHCP6 if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCP6DuidLlSet(ctx context.Context, in *DHCP6DuidLlSet) (*DHCP6DuidLlSetReply, error) { @@ -50,7 +51,7 @@ func (c *serviceClient) DHCP6DuidLlSet(ctx context.Context, in *DHCP6DuidLlSet) if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCP6PdSendClientMessage(ctx context.Context, in *DHCP6PdSendClientMessage) (*DHCP6PdSendClientMessageReply, error) { @@ -59,7 +60,7 @@ func (c *serviceClient) DHCP6PdSendClientMessage(ctx context.Context, in *DHCP6P if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCP6SendClientMessage(ctx context.Context, in *DHCP6SendClientMessage) (*DHCP6SendClientMessageReply, error) { @@ -68,7 +69,7 @@ func (c *serviceClient) DHCP6SendClientMessage(ctx context.Context, in *DHCP6Sen if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCPClientConfig(ctx context.Context, in *DHCPClientConfig) (*DHCPClientConfigReply, error) { @@ -77,7 +78,7 @@ func (c *serviceClient) DHCPClientConfig(ctx context.Context, in *DHCPClientConf if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCPClientDump(ctx context.Context, in *DHCPClientDump) (RPCService_DHCPClientDumpClient, error) { @@ -89,7 +90,7 @@ func (c *serviceClient) DHCPClientDump(ctx context.Context, in *DHCPClientDump) 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 @@ -112,7 +113,11 @@ func (c *serviceClient_DHCPClientDumpClient) Recv() (*DHCPClientDetails, error) switch m := msg.(type) { case *DHCPClientDetails: 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) @@ -125,7 +130,7 @@ func (c *serviceClient) DHCPPluginControlPing(ctx context.Context, in *DHCPPlugi if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCPPluginGetVersion(ctx context.Context, in *DHCPPluginGetVersion) (*DHCPPluginGetVersionReply, error) { @@ -143,7 +148,7 @@ func (c *serviceClient) DHCPProxyConfig(ctx context.Context, in *DHCPProxyConfig if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) DHCPProxyDump(ctx context.Context, in *DHCPProxyDump) (RPCService_DHCPProxyDumpClient, error) { @@ -155,7 +160,7 @@ func (c *serviceClient) DHCPProxyDump(ctx context.Context, in *DHCPProxyDump) (R 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 @@ -178,7 +183,11 @@ func (c *serviceClient_DHCPProxyDumpClient) Recv() (*DHCPProxyDetails, error) { switch m := msg.(type) { case *DHCPProxyDetails: 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) @@ -191,7 +200,7 @@ func (c *serviceClient) DHCPProxySetVss(ctx context.Context, in *DHCPProxySetVss if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) WantDHCP6PdReplyEvents(ctx context.Context, in *WantDHCP6PdReplyEvents) (*WantDHCP6PdReplyEventsReply, error) { @@ -200,7 +209,7 @@ func (c *serviceClient) WantDHCP6PdReplyEvents(ctx context.Context, in *WantDHCP if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) WantDHCP6ReplyEvents(ctx context.Context, in *WantDHCP6ReplyEvents) (*WantDHCP6ReplyEventsReply, error) { @@ -209,5 +218,5 @@ func (c *serviceClient) WantDHCP6ReplyEvents(ctx context.Context, in *WantDHCP6R if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } |