aboutsummaryrefslogtreecommitdiffstats
path: root/binapi/nsim
diff options
context:
space:
mode:
Diffstat (limited to 'binapi/nsim')
-rw-r--r--binapi/nsim/nsim.ba.go108
-rw-r--r--binapi/nsim/nsim_rest.ba.go83
-rw-r--r--binapi/nsim/nsim_rpc.ba.go21
3 files changed, 114 insertions, 98 deletions
diff --git a/binapi/nsim/nsim.ba.go b/binapi/nsim/nsim.ba.go
index fb540ac..e7db135 100644
--- a/binapi/nsim/nsim.ba.go
+++ b/binapi/nsim/nsim.ba.go
@@ -1,20 +1,20 @@
// 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/nsim.api.json
// Package nsim contains generated bindings for API file nsim.api.
//
// Contents:
-// 6 messages
+// 8 messages
//
package nsim
import (
- api "git.fd.io/govpp.git/api"
- interface_types "git.fd.io/govpp.git/binapi/interface_types"
- codec "git.fd.io/govpp.git/codec"
+ api "go.fd.io/govpp/api"
+ 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
@@ -25,11 +25,12 @@ const _ = api.GoVppAPIPackageIsVersion2
const (
APIFile = "nsim"
- APIVersion = "2.1.1"
- VersionCrc = 0xcd5b42e8
+ APIVersion = "2.2.1"
+ VersionCrc = 0x3b179b8f
)
// NsimConfigure defines message 'nsim_configure'.
+// Deprecated: the message will be removed in the future versions
type NsimConfigure struct {
DelayInUsec uint32 `binapi:"u32,name=delay_in_usec" json:"delay_in_usec,omitempty"`
AveragePacketSize uint32 `binapi:"u32,name=average_packet_size" json:"average_packet_size,omitempty"`
@@ -74,7 +75,90 @@ func (m *NsimConfigure) Unmarshal(b []byte) error {
return nil
}
+// NsimConfigure2 defines message 'nsim_configure2'.
+type NsimConfigure2 struct {
+ DelayInUsec uint32 `binapi:"u32,name=delay_in_usec" json:"delay_in_usec,omitempty"`
+ AveragePacketSize uint32 `binapi:"u32,name=average_packet_size" json:"average_packet_size,omitempty"`
+ BandwidthInBitsPerSecond uint64 `binapi:"u64,name=bandwidth_in_bits_per_second" json:"bandwidth_in_bits_per_second,omitempty"`
+ PacketsPerDrop uint32 `binapi:"u32,name=packets_per_drop" json:"packets_per_drop,omitempty"`
+ PacketsPerReorder uint32 `binapi:"u32,name=packets_per_reorder" json:"packets_per_reorder,omitempty"`
+}
+
+func (m *NsimConfigure2) Reset() { *m = NsimConfigure2{} }
+func (*NsimConfigure2) GetMessageName() string { return "nsim_configure2" }
+func (*NsimConfigure2) GetCrcString() string { return "64de8ed3" }
+func (*NsimConfigure2) GetMessageType() api.MessageType {
+ return api.RequestMessage
+}
+
+func (m *NsimConfigure2) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 4 // m.DelayInUsec
+ size += 4 // m.AveragePacketSize
+ size += 8 // m.BandwidthInBitsPerSecond
+ size += 4 // m.PacketsPerDrop
+ size += 4 // m.PacketsPerReorder
+ return size
+}
+func (m *NsimConfigure2) Marshal(b []byte) ([]byte, error) {
+ if b == nil {
+ b = make([]byte, m.Size())
+ }
+ buf := codec.NewBuffer(b)
+ buf.EncodeUint32(m.DelayInUsec)
+ buf.EncodeUint32(m.AveragePacketSize)
+ buf.EncodeUint64(m.BandwidthInBitsPerSecond)
+ buf.EncodeUint32(m.PacketsPerDrop)
+ buf.EncodeUint32(m.PacketsPerReorder)
+ return buf.Bytes(), nil
+}
+func (m *NsimConfigure2) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ m.DelayInUsec = buf.DecodeUint32()
+ m.AveragePacketSize = buf.DecodeUint32()
+ m.BandwidthInBitsPerSecond = buf.DecodeUint64()
+ m.PacketsPerDrop = buf.DecodeUint32()
+ m.PacketsPerReorder = buf.DecodeUint32()
+ return nil
+}
+
+// NsimConfigure2Reply defines message 'nsim_configure2_reply'.
+type NsimConfigure2Reply struct {
+ Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
+}
+
+func (m *NsimConfigure2Reply) Reset() { *m = NsimConfigure2Reply{} }
+func (*NsimConfigure2Reply) GetMessageName() string { return "nsim_configure2_reply" }
+func (*NsimConfigure2Reply) GetCrcString() string { return "e8d4e804" }
+func (*NsimConfigure2Reply) GetMessageType() api.MessageType {
+ return api.ReplyMessage
+}
+
+func (m *NsimConfigure2Reply) Size() (size int) {
+ if m == nil {
+ return 0
+ }
+ size += 4 // m.Retval
+ return size
+}
+func (m *NsimConfigure2Reply) Marshal(b []byte) ([]byte, error) {
+ if b == nil {
+ b = make([]byte, m.Size())
+ }
+ buf := codec.NewBuffer(b)
+ buf.EncodeInt32(m.Retval)
+ return buf.Bytes(), nil
+}
+func (m *NsimConfigure2Reply) Unmarshal(b []byte) error {
+ buf := codec.NewBuffer(b)
+ m.Retval = buf.DecodeInt32()
+ return nil
+}
+
// NsimConfigureReply defines message 'nsim_configure_reply'.
+// Deprecated: the message will be removed in the future versions
type NsimConfigureReply struct {
Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"`
}
@@ -118,7 +202,7 @@ func (m *NsimCrossConnectEnableDisable) Reset() { *m = NsimCrossConnectEnableDis
func (*NsimCrossConnectEnableDisable) GetMessageName() string {
return "nsim_cross_connect_enable_disable"
}
-func (*NsimCrossConnectEnableDisable) GetCrcString() string { return "16f70bdf" }
+func (*NsimCrossConnectEnableDisable) GetCrcString() string { return "9c3ead86" }
func (*NsimCrossConnectEnableDisable) GetMessageType() api.MessageType {
return api.RequestMessage
}
@@ -262,8 +346,10 @@ func (m *NsimOutputFeatureEnableDisableReply) Unmarshal(b []byte) error {
func init() { file_nsim_binapi_init() }
func file_nsim_binapi_init() {
api.RegisterMessage((*NsimConfigure)(nil), "nsim_configure_16ed400f")
+ api.RegisterMessage((*NsimConfigure2)(nil), "nsim_configure2_64de8ed3")
+ api.RegisterMessage((*NsimConfigure2Reply)(nil), "nsim_configure2_reply_e8d4e804")
api.RegisterMessage((*NsimConfigureReply)(nil), "nsim_configure_reply_e8d4e804")
- api.RegisterMessage((*NsimCrossConnectEnableDisable)(nil), "nsim_cross_connect_enable_disable_16f70bdf")
+ api.RegisterMessage((*NsimCrossConnectEnableDisable)(nil), "nsim_cross_connect_enable_disable_9c3ead86")
api.RegisterMessage((*NsimCrossConnectEnableDisableReply)(nil), "nsim_cross_connect_enable_disable_reply_e8d4e804")
api.RegisterMessage((*NsimOutputFeatureEnableDisable)(nil), "nsim_output_feature_enable_disable_3865946c")
api.RegisterMessage((*NsimOutputFeatureEnableDisableReply)(nil), "nsim_output_feature_enable_disable_reply_e8d4e804")
@@ -273,6 +359,8 @@ func file_nsim_binapi_init() {
func AllMessages() []api.Message {
return []api.Message{
(*NsimConfigure)(nil),
+ (*NsimConfigure2)(nil),
+ (*NsimConfigure2Reply)(nil),
(*NsimConfigureReply)(nil),
(*NsimCrossConnectEnableDisable)(nil),
(*NsimCrossConnectEnableDisableReply)(nil),
diff --git a/binapi/nsim/nsim_rest.ba.go b/binapi/nsim/nsim_rest.ba.go
deleted file mode 100644
index ba53f21..0000000
--- a/binapi/nsim/nsim_rest.ba.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by GoVPP's binapi-generator. DO NOT EDIT.
-
-package nsim
-
-import (
- "encoding/json"
- "io/ioutil"
- "net/http"
-)
-
-func RESTHandler(rpc RPCService) http.Handler {
- mux := http.NewServeMux()
- mux.HandleFunc("/nsim_configure", func(w http.ResponseWriter, req *http.Request) {
- var request = new(NsimConfigure)
- 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.NsimConfigure(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("/nsim_cross_connect_enable_disable", func(w http.ResponseWriter, req *http.Request) {
- var request = new(NsimCrossConnectEnableDisable)
- 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.NsimCrossConnectEnableDisable(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("/nsim_output_feature_enable_disable", func(w http.ResponseWriter, req *http.Request) {
- var request = new(NsimOutputFeatureEnableDisable)
- 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.NsimOutputFeatureEnableDisable(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/nsim/nsim_rpc.ba.go b/binapi/nsim/nsim_rpc.ba.go
index f35e6b3..a7c3d88 100644
--- a/binapi/nsim/nsim_rpc.ba.go
+++ b/binapi/nsim/nsim_rpc.ba.go
@@ -4,12 +4,14 @@ package nsim
import (
"context"
- api "git.fd.io/govpp.git/api"
+
+ api "go.fd.io/govpp/api"
)
-// RPCService defines RPC service nsim.
+// RPCService defines RPC service nsim.
type RPCService interface {
NsimConfigure(ctx context.Context, in *NsimConfigure) (*NsimConfigureReply, error)
+ NsimConfigure2(ctx context.Context, in *NsimConfigure2) (*NsimConfigure2Reply, error)
NsimCrossConnectEnableDisable(ctx context.Context, in *NsimCrossConnectEnableDisable) (*NsimCrossConnectEnableDisableReply, error)
NsimOutputFeatureEnableDisable(ctx context.Context, in *NsimOutputFeatureEnableDisable) (*NsimOutputFeatureEnableDisableReply, error)
}
@@ -28,7 +30,16 @@ func (c *serviceClient) NsimConfigure(ctx context.Context, in *NsimConfigure) (*
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
+}
+
+func (c *serviceClient) NsimConfigure2(ctx context.Context, in *NsimConfigure2) (*NsimConfigure2Reply, error) {
+ out := new(NsimConfigure2Reply)
+ err := c.conn.Invoke(ctx, in, out)
+ if err != nil {
+ return nil, err
+ }
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) NsimCrossConnectEnableDisable(ctx context.Context, in *NsimCrossConnectEnableDisable) (*NsimCrossConnectEnableDisableReply, error) {
@@ -37,7 +48,7 @@ func (c *serviceClient) NsimCrossConnectEnableDisable(ctx context.Context, in *N
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}
func (c *serviceClient) NsimOutputFeatureEnableDisable(ctx context.Context, in *NsimOutputFeatureEnableDisable) (*NsimOutputFeatureEnableDisableReply, error) {
@@ -46,5 +57,5 @@ func (c *serviceClient) NsimOutputFeatureEnableDisable(ctx context.Context, in *
if err != nil {
return nil, err
}
- return out, nil
+ return out, api.RetvalToVPPApiError(out.Retval)
}