aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/mactime
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/mactime')
-rw-r--r--binapi/mactime/mactime.ba.go22
-rw-r--r--binapi/mactime/mactime_rest.ba.go60
-rw-r--r--binapi/mactime/mactime_rpc.ba.go19
3 files changed, 23 insertions, 78 deletions
diff --git a/binapi/mactime/mactime.ba.go b/binapi/mactime/mactime.ba.go
index deb7472..22fd871 100644
--- a/binapi/mactime/mactime.ba.go
+++ b/binapi/mactime/mactime.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/mactime.api.json
// Package mactime contains generated bindings for API file mactime.api.
@@ -13,10 +13,10 @@
package mactime
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"
- codec "git.fd.io/govpp.git/codec"
+ api "go.fd.io/govpp/api"
+ ethernet_types "go.fd.io/govpp/binapi/ethernet_types"
+ interface_types "go.fd.io/govpp/binapi/interface_types"
+ codec "go.fd.io/govpp/codec"
)
// This is a compile-time assertion to ensure that this generated file
@@ -28,7 +28,7 @@ const _ = api.GoVppAPIPackageIsVersion2
const (
APIFile = "mactime"
APIVersion = "2.0.0"
- VersionCrc = 0x9283d3e
+ VersionCrc = 0xc72e296e
)
// MactimeTimeRange defines type 'mactime_time_range'.
@@ -59,7 +59,7 @@ type MactimeAddDelRange struct {
func (m *MactimeAddDelRange) Reset() { *m = MactimeAddDelRange{} }
func (*MactimeAddDelRange) GetMessageName() string { return "mactime_add_del_range" }
-func (*MactimeAddDelRange) GetCrcString() string { return "101858ef" }
+func (*MactimeAddDelRange) GetCrcString() string { return "cb56e877" }
func (*MactimeAddDelRange) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -178,7 +178,7 @@ type MactimeDetails struct {
func (m *MactimeDetails) Reset() { *m = MactimeDetails{} }
func (*MactimeDetails) GetMessageName() string { return "mactime_details" }
-func (*MactimeDetails) GetCrcString() string { return "44921c06" }
+func (*MactimeDetails) GetCrcString() string { return "da25b13a" }
func (*MactimeDetails) GetMessageType() api.MessageType {
return api.ReplyMessage
}
@@ -386,9 +386,9 @@ func (m *MactimeEnableDisableReply) Unmarshal(b []byte) error {
func init() { file_mactime_binapi_init() }
func file_mactime_binapi_init() {
- api.RegisterMessage((*MactimeAddDelRange)(nil), "mactime_add_del_range_101858ef")
+ api.RegisterMessage((*MactimeAddDelRange)(nil), "mactime_add_del_range_cb56e877")
api.RegisterMessage((*MactimeAddDelRangeReply)(nil), "mactime_add_del_range_reply_e8d4e804")
- api.RegisterMessage((*MactimeDetails)(nil), "mactime_details_44921c06")
+ api.RegisterMessage((*MactimeDetails)(nil), "mactime_details_da25b13a")
api.RegisterMessage((*MactimeDump)(nil), "mactime_dump_8f454e23")
api.RegisterMessage((*MactimeDumpReply)(nil), "mactime_dump_reply_49bcc753")
api.RegisterMessage((*MactimeEnableDisable)(nil), "mactime_enable_disable_3865946c")
diff --git a/binapi/mactime/mactime_rest.ba.go b/binapi/mactime/mactime_rest.ba.go
deleted file mode 100644
index 4318dbc..0000000
--- a/binapi/mactime/mactime_rest.ba.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package mactime
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/mactime_add_del_range", func(w http.ResponseWriter, req *http.Request) {
- var request = new(MactimeAddDelRange)
- 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.MactimeAddDelRange(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("/mactime_enable_disable", func(w http.ResponseWriter, req *http.Request) {
- var request = new(MactimeEnableDisable)
- 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.MactimeEnableDisable(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/mactime/mactime_rpc.ba.go b/binapi/mactime/mactime_rpc.ba.go
index a92a14c..3ae0803 100644
--- a/binapi/mactime/mactime_rpc.ba.go
+++ b/binapi/mactime/mactime_rpc.ba.go
@@ -5,12 +5,13 @@ package mactime
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 mactime.
+// RPCService defines RPC service mactime.
type RPCService interface {
MactimeAddDelRange(ctx context.Context, in *MactimeAddDelRange) (*MactimeAddDelRangeReply, error)
MactimeDump(ctx context.Context, in *MactimeDump) (RPCService_MactimeDumpClient, error)
@@ -31,7 +32,7 @@ func (c *serviceClient) MactimeAddDelRange(ctx context.Context, in *MactimeAddDe
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) MactimeDump(ctx context.Context, in *MactimeDump) (RPCService_MactimeDumpClient, error) {
@@ -43,7 +44,7 @@ func (c *serviceClient) MactimeDump(ctx context.Context, in *MactimeDump) (RPCSe
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
@@ -66,7 +67,11 @@ func (c *serviceClient_MactimeDumpClient) Recv() (*MactimeDetails, error) {
switch m := msg.(type) {
case *MactimeDetails:
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)
@@ -79,5 +84,5 @@ func (c *serviceClient) MactimeEnableDisable(ctx context.Context, in *MactimeEna
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}