diff options
Diffstat (limited to 'binapi/geneve')
-rw-r--r-- | binapi/geneve/geneve.ba.go | 139 | ||||
-rw-r--r-- | binapi/geneve/geneve_rest.ba.go | 60 | ||||
-rw-r--r-- | binapi/geneve/geneve_rpc.ba.go | 29 |
3 files changed, 146 insertions, 82 deletions
diff --git a/binapi/geneve/geneve.ba.go b/binapi/geneve/geneve.ba.go index fcd512d..c864308 100644 --- a/binapi/geneve/geneve.ba.go +++ b/binapi/geneve/geneve.ba.go @@ -1,22 +1,22 @@ // Code generated by GoVPP's binapi-generator. DO NOT EDIT. // versions: -// binapi-generator: v0.4.0-dev -// VPP: 20.05-release -// source: /usr/share/vpp/api/core/geneve.api.json +// binapi-generator: v0.6.0-dev +// VPP: 22.02-release +// source: /usr/share/vpp/api/plugins/geneve.api.json // Package geneve contains generated bindings for API file geneve.api. // // Contents: -// 6 messages +// 8 messages // package geneve import ( - api "git.fd.io/govpp.git/api" - _ "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" + api "go.fd.io/govpp/api" + _ "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 @@ -27,11 +27,12 @@ const _ = api.GoVppAPIPackageIsVersion2 const ( APIFile = "geneve" - APIVersion = "2.0.0" - VersionCrc = 0x7730c1d3 + APIVersion = "2.1.0" + VersionCrc = 0xe3dbb8a3 ) // GeneveAddDelTunnel defines message 'geneve_add_del_tunnel'. +// Deprecated: the message will be removed in the future versions type GeneveAddDelTunnel struct { IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` LocalAddress ip_types.Address `binapi:"address,name=local_address" json:"local_address,omitempty"` @@ -44,7 +45,7 @@ type GeneveAddDelTunnel struct { func (m *GeneveAddDelTunnel) Reset() { *m = GeneveAddDelTunnel{} } func (*GeneveAddDelTunnel) GetMessageName() string { return "geneve_add_del_tunnel" } -func (*GeneveAddDelTunnel) GetCrcString() string { return "976693b5" } +func (*GeneveAddDelTunnel) GetCrcString() string { return "99445831" } func (*GeneveAddDelTunnel) GetMessageType() api.MessageType { return api.RequestMessage } @@ -94,6 +95,110 @@ func (m *GeneveAddDelTunnel) Unmarshal(b []byte) error { return nil } +// GeneveAddDelTunnel2 defines message 'geneve_add_del_tunnel2'. +type GeneveAddDelTunnel2 struct { + IsAdd bool `binapi:"bool,name=is_add" json:"is_add,omitempty"` + LocalAddress ip_types.Address `binapi:"address,name=local_address" json:"local_address,omitempty"` + RemoteAddress ip_types.Address `binapi:"address,name=remote_address" json:"remote_address,omitempty"` + McastSwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=mcast_sw_if_index" json:"mcast_sw_if_index,omitempty"` + EncapVrfID uint32 `binapi:"u32,name=encap_vrf_id" json:"encap_vrf_id,omitempty"` + DecapNextIndex uint32 `binapi:"u32,name=decap_next_index" json:"decap_next_index,omitempty"` + Vni uint32 `binapi:"u32,name=vni" json:"vni,omitempty"` + L3Mode bool `binapi:"bool,name=l3_mode" json:"l3_mode,omitempty"` +} + +func (m *GeneveAddDelTunnel2) Reset() { *m = GeneveAddDelTunnel2{} } +func (*GeneveAddDelTunnel2) GetMessageName() string { return "geneve_add_del_tunnel2" } +func (*GeneveAddDelTunnel2) GetCrcString() string { return "8c2a9999" } +func (*GeneveAddDelTunnel2) GetMessageType() api.MessageType { + return api.RequestMessage +} + +func (m *GeneveAddDelTunnel2) Size() (size int) { + if m == nil { + return 0 + } + size += 1 // m.IsAdd + size += 1 // m.LocalAddress.Af + size += 1 * 16 // m.LocalAddress.Un + size += 1 // m.RemoteAddress.Af + size += 1 * 16 // m.RemoteAddress.Un + size += 4 // m.McastSwIfIndex + size += 4 // m.EncapVrfID + size += 4 // m.DecapNextIndex + size += 4 // m.Vni + size += 1 // m.L3Mode + return size +} +func (m *GeneveAddDelTunnel2) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeBool(m.IsAdd) + buf.EncodeUint8(uint8(m.LocalAddress.Af)) + buf.EncodeBytes(m.LocalAddress.Un.XXX_UnionData[:], 16) + buf.EncodeUint8(uint8(m.RemoteAddress.Af)) + buf.EncodeBytes(m.RemoteAddress.Un.XXX_UnionData[:], 16) + buf.EncodeUint32(uint32(m.McastSwIfIndex)) + buf.EncodeUint32(m.EncapVrfID) + buf.EncodeUint32(m.DecapNextIndex) + buf.EncodeUint32(m.Vni) + buf.EncodeBool(m.L3Mode) + return buf.Bytes(), nil +} +func (m *GeneveAddDelTunnel2) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.IsAdd = buf.DecodeBool() + m.LocalAddress.Af = ip_types.AddressFamily(buf.DecodeUint8()) + copy(m.LocalAddress.Un.XXX_UnionData[:], buf.DecodeBytes(16)) + m.RemoteAddress.Af = ip_types.AddressFamily(buf.DecodeUint8()) + copy(m.RemoteAddress.Un.XXX_UnionData[:], buf.DecodeBytes(16)) + m.McastSwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + m.EncapVrfID = buf.DecodeUint32() + m.DecapNextIndex = buf.DecodeUint32() + m.Vni = buf.DecodeUint32() + m.L3Mode = buf.DecodeBool() + return nil +} + +// GeneveAddDelTunnel2Reply defines message 'geneve_add_del_tunnel2_reply'. +type GeneveAddDelTunnel2Reply struct { + Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` + SwIfIndex interface_types.InterfaceIndex `binapi:"interface_index,name=sw_if_index" json:"sw_if_index,omitempty"` +} + +func (m *GeneveAddDelTunnel2Reply) Reset() { *m = GeneveAddDelTunnel2Reply{} } +func (*GeneveAddDelTunnel2Reply) GetMessageName() string { return "geneve_add_del_tunnel2_reply" } +func (*GeneveAddDelTunnel2Reply) GetCrcString() string { return "5383d31f" } +func (*GeneveAddDelTunnel2Reply) GetMessageType() api.MessageType { + return api.ReplyMessage +} + +func (m *GeneveAddDelTunnel2Reply) Size() (size int) { + if m == nil { + return 0 + } + size += 4 // m.Retval + size += 4 // m.SwIfIndex + return size +} +func (m *GeneveAddDelTunnel2Reply) Marshal(b []byte) ([]byte, error) { + if b == nil { + b = make([]byte, m.Size()) + } + buf := codec.NewBuffer(b) + buf.EncodeInt32(m.Retval) + buf.EncodeUint32(uint32(m.SwIfIndex)) + return buf.Bytes(), nil +} +func (m *GeneveAddDelTunnel2Reply) Unmarshal(b []byte) error { + buf := codec.NewBuffer(b) + m.Retval = buf.DecodeInt32() + m.SwIfIndex = interface_types.InterfaceIndex(buf.DecodeUint32()) + return nil +} + // GeneveAddDelTunnelReply defines message 'geneve_add_del_tunnel_reply'. type GeneveAddDelTunnelReply struct { Retval int32 `binapi:"i32,name=retval" json:"retval,omitempty"` @@ -144,7 +249,7 @@ type GeneveTunnelDetails struct { func (m *GeneveTunnelDetails) Reset() { *m = GeneveTunnelDetails{} } func (*GeneveTunnelDetails) GetMessageName() string { return "geneve_tunnel_details" } -func (*GeneveTunnelDetails) GetCrcString() string { return "e27e2748" } +func (*GeneveTunnelDetails) GetCrcString() string { return "6b16eb24" } func (*GeneveTunnelDetails) GetMessageType() api.MessageType { return api.ReplyMessage } @@ -305,9 +410,11 @@ func (m *SwInterfaceSetGeneveBypassReply) Unmarshal(b []byte) error { func init() { file_geneve_binapi_init() } func file_geneve_binapi_init() { - api.RegisterMessage((*GeneveAddDelTunnel)(nil), "geneve_add_del_tunnel_976693b5") + api.RegisterMessage((*GeneveAddDelTunnel)(nil), "geneve_add_del_tunnel_99445831") + api.RegisterMessage((*GeneveAddDelTunnel2)(nil), "geneve_add_del_tunnel2_8c2a9999") + api.RegisterMessage((*GeneveAddDelTunnel2Reply)(nil), "geneve_add_del_tunnel2_reply_5383d31f") api.RegisterMessage((*GeneveAddDelTunnelReply)(nil), "geneve_add_del_tunnel_reply_5383d31f") - api.RegisterMessage((*GeneveTunnelDetails)(nil), "geneve_tunnel_details_e27e2748") + api.RegisterMessage((*GeneveTunnelDetails)(nil), "geneve_tunnel_details_6b16eb24") api.RegisterMessage((*GeneveTunnelDump)(nil), "geneve_tunnel_dump_f9e6675e") api.RegisterMessage((*SwInterfaceSetGeneveBypass)(nil), "sw_interface_set_geneve_bypass_65247409") api.RegisterMessage((*SwInterfaceSetGeneveBypassReply)(nil), "sw_interface_set_geneve_bypass_reply_e8d4e804") @@ -317,6 +424,8 @@ func file_geneve_binapi_init() { func AllMessages() []api.Message { return []api.Message{ (*GeneveAddDelTunnel)(nil), + (*GeneveAddDelTunnel2)(nil), + (*GeneveAddDelTunnel2Reply)(nil), (*GeneveAddDelTunnelReply)(nil), (*GeneveTunnelDetails)(nil), (*GeneveTunnelDump)(nil), diff --git a/binapi/geneve/geneve_rest.ba.go b/binapi/geneve/geneve_rest.ba.go deleted file mode 100644 index 4987b1d..0000000 --- a/binapi/geneve/geneve_rest.ba.go +++ /dev/null @@ -1,60 +0,0 @@ -// Code generated by GoVPP's binapi-generator. DO NOT EDIT. - -package geneve - -import ( - "encoding/json" - "io/ioutil" - "net/http" -) - -func RESTHandler(rpc RPCService) http.Handler { - mux := http.NewServeMux() - mux.HandleFunc("/geneve_add_del_tunnel", func(w http.ResponseWriter, req *http.Request) { - var request = new(GeneveAddDelTunnel) - 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.GeneveAddDelTunnel(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("/sw_interface_set_geneve_bypass", func(w http.ResponseWriter, req *http.Request) { - var request = new(SwInterfaceSetGeneveBypass) - 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.SwInterfaceSetGeneveBypass(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/geneve/geneve_rpc.ba.go b/binapi/geneve/geneve_rpc.ba.go index df9a6be..62b84b0 100644 --- a/binapi/geneve/geneve_rpc.ba.go +++ b/binapi/geneve/geneve_rpc.ba.go @@ -5,14 +5,16 @@ package geneve 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 geneve. +// RPCService defines RPC service geneve. type RPCService interface { GeneveAddDelTunnel(ctx context.Context, in *GeneveAddDelTunnel) (*GeneveAddDelTunnelReply, error) + GeneveAddDelTunnel2(ctx context.Context, in *GeneveAddDelTunnel2) (*GeneveAddDelTunnel2Reply, error) GeneveTunnelDump(ctx context.Context, in *GeneveTunnelDump) (RPCService_GeneveTunnelDumpClient, error) SwInterfaceSetGeneveBypass(ctx context.Context, in *SwInterfaceSetGeneveBypass) (*SwInterfaceSetGeneveBypassReply, error) } @@ -31,7 +33,16 @@ func (c *serviceClient) GeneveAddDelTunnel(ctx context.Context, in *GeneveAddDel if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) +} + +func (c *serviceClient) GeneveAddDelTunnel2(ctx context.Context, in *GeneveAddDelTunnel2) (*GeneveAddDelTunnel2Reply, error) { + out := new(GeneveAddDelTunnel2Reply) + err := c.conn.Invoke(ctx, in, out) + if err != nil { + return nil, err + } + return out, api.RetvalToVPPApiError(out.Retval) } func (c *serviceClient) GeneveTunnelDump(ctx context.Context, in *GeneveTunnelDump) (RPCService_GeneveTunnelDumpClient, error) { @@ -43,7 +54,7 @@ func (c *serviceClient) GeneveTunnelDump(ctx context.Context, in *GeneveTunnelDu 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 +77,11 @@ func (c *serviceClient_GeneveTunnelDumpClient) Recv() (*GeneveTunnelDetails, err switch m := msg.(type) { case *GeneveTunnelDetails: 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 +94,5 @@ func (c *serviceClient) SwInterfaceSetGeneveBypass(ctx context.Context, in *SwIn if err != nil { return nil, err } - return out, nil + return out, api.RetvalToVPPApiError(out.Retval) } |