aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorOndrej Fabry <ofabry@cisco.com>2020-07-17 10:36:28 +0200
committerOndrej Fabry <ofabry@cisco.com>2020-07-17 11:43:41 +0200
commitd1f24d37bd447b64e402298bb8eb2479681facf9 (patch)
treea3fc21ba730a91d8a402c7a5bf9c614e3677c4fc /core
parent1548c7e12531e3d055567d761c580a1c7ff0ac40 (diff)
Improve binapi generator
- simplified Size/Marshal/Unmarshal methods - replace struc in unions with custom marshal/unmarshal - fix imports in generated files - fix mock adapter - generate rpc service using low-level stream API (dumps generate control ping or stream msg..) - move examples/binapi to binapi and generate all API for latest release - add binapigen.Plugin for developing custom generator plugins - optionally generate HTTP handlers (REST API) for RPC services - add govpp program for browsing VPP API Change-Id: I092e9ed2b0c17972b3476463c3d4b14dd76ed42b Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'core')
-rw-r--r--core/channel_test.go8
-rw-r--r--core/connection_test.go11
-rw-r--r--core/stream.go19
3 files changed, 27 insertions, 11 deletions
diff --git a/core/channel_test.go b/core/channel_test.go
index d06e2b3..fa3e58d 100644
--- a/core/channel_test.go
+++ b/core/channel_test.go
@@ -22,10 +22,10 @@ import (
"git.fd.io/govpp.git/adapter/mock"
"git.fd.io/govpp.git/api"
- "git.fd.io/govpp.git/examples/binapi/interface_types"
- "git.fd.io/govpp.git/examples/binapi/interfaces"
- "git.fd.io/govpp.git/examples/binapi/memif"
- "git.fd.io/govpp.git/examples/binapi/vpe"
+ interfaces "git.fd.io/govpp.git/binapi/interface"
+ "git.fd.io/govpp.git/binapi/interface_types"
+ "git.fd.io/govpp.git/binapi/memif"
+ "git.fd.io/govpp.git/binapi/vpe"
)
type testCtx struct {
diff --git a/core/connection_test.go b/core/connection_test.go
index 453bbce..230eea5 100644
--- a/core/connection_test.go
+++ b/core/connection_test.go
@@ -15,17 +15,18 @@
package core_test
import (
- "git.fd.io/govpp.git/examples/binapi/interface_types"
"testing"
. "github.com/onsi/gomega"
"git.fd.io/govpp.git/adapter/mock"
"git.fd.io/govpp.git/api"
+ "git.fd.io/govpp.git/binapi/ethernet_types"
+ interfaces "git.fd.io/govpp.git/binapi/interface"
+ "git.fd.io/govpp.git/binapi/interface_types"
+ "git.fd.io/govpp.git/binapi/vpe"
"git.fd.io/govpp.git/codec"
"git.fd.io/govpp.git/core"
- "git.fd.io/govpp.git/examples/binapi/interfaces"
- "git.fd.io/govpp.git/examples/binapi/vpe"
)
type testCtx struct {
@@ -96,14 +97,14 @@ func TestCodec(t *testing.T) {
var msgCodec = codec.DefaultCodec
// request
- data, err := msgCodec.EncodeMsg(&interfaces.CreateLoopback{MacAddress: interfaces.MacAddress{1, 2, 3, 4, 5, 6}}, 11)
+ data, err := msgCodec.EncodeMsg(&interfaces.CreateLoopback{MacAddress: ethernet_types.MacAddress{1, 2, 3, 4, 5, 6}}, 11)
Expect(err).ShouldNot(HaveOccurred())
Expect(data).ShouldNot(BeEmpty())
msg1 := &interfaces.CreateLoopback{}
err = msgCodec.DecodeMsg(data, msg1)
Expect(err).ShouldNot(HaveOccurred())
- Expect(msg1.MacAddress).To(BeEquivalentTo(interfaces.MacAddress{1, 2, 3, 4, 5, 6}))
+ Expect(msg1.MacAddress).To(BeEquivalentTo(ethernet_types.MacAddress{1, 2, 3, 4, 5, 6}))
// reply
data, err = msgCodec.EncodeMsg(&vpe.ControlPingReply{Retval: 55}, 22)
diff --git a/core/stream.go b/core/stream.go
index edc3f2b..171b201 100644
--- a/core/stream.go
+++ b/core/stream.go
@@ -62,8 +62,23 @@ func (c *Connection) NewStream(ctx context.Context) (api.Stream, error) {
}
func (c *Connection) Invoke(ctx context.Context, req api.Message, reply api.Message) error {
- // TODO: implement invoke
- panic("not implemented")
+ stream, err := c.NewStream(ctx)
+ if err != nil {
+ return err
+ }
+ if err := stream.SendMsg(req); err != nil {
+ return err
+ }
+ msg, err := stream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ if msg.GetMessageName() != reply.GetMessageName() ||
+ msg.GetCrcString() != reply.GetCrcString() {
+ return fmt.Errorf("unexpected reply: %T %+v", msg, msg)
+ }
+ reflect.ValueOf(reply).Elem().Set(reflect.ValueOf(msg).Elem())
+ return nil
}
func (s *Stream) Context() context.Context {