X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=binapi%2Fone%2Fone_rpc.ba.go;h=ceb0ab2814de50e902a4252ac591e7d137422e3f;hb=67cea0df30f7ef348e265c9326f7a9f15ba26240;hp=2ef9c5e62d8ae548bef3cade4647990a9bbeea1e;hpb=c2456559a66107441addb96f673191bde09d6977;p=govpp.git

diff --git a/binapi/one/one_rpc.ba.go b/binapi/one/one_rpc.ba.go
index 2ef9c5e..ceb0ab2 100644
--- a/binapi/one/one_rpc.ba.go
+++ b/binapi/one/one_rpc.ba.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io"
 
-	api "git.fd.io/govpp.git/api"
-	vpe "git.fd.io/govpp.git/binapi/vpe"
+	api "go.fd.io/govpp/api"
+	memclnt "go.fd.io/govpp/binapi/memclnt"
 )
 
 // RPCService defines RPC service one.
@@ -194,7 +194,7 @@ func (c *serviceClient) OneEidTableDump(ctx context.Context, in *OneEidTableDump
 	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
@@ -217,7 +217,11 @@ func (c *serviceClient_OneEidTableDumpClient) Recv() (*OneEidTableDetails, error
 	switch m := msg.(type) {
 	case *OneEidTableDetails:
 		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)
@@ -233,7 +237,7 @@ func (c *serviceClient) OneEidTableMapDump(ctx context.Context, in *OneEidTableM
 	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
@@ -256,7 +260,11 @@ func (c *serviceClient_OneEidTableMapDumpClient) Recv() (*OneEidTableMapDetails,
 	switch m := msg.(type) {
 	case *OneEidTableMapDetails:
 		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)
@@ -272,7 +280,7 @@ func (c *serviceClient) OneEidTableVniDump(ctx context.Context, in *OneEidTableV
 	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
@@ -295,7 +303,11 @@ func (c *serviceClient_OneEidTableVniDumpClient) Recv() (*OneEidTableVniDetails,
 	switch m := msg.(type) {
 	case *OneEidTableVniDetails:
 		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)
@@ -383,7 +395,7 @@ func (c *serviceClient) OneLocatorDump(ctx context.Context, in *OneLocatorDump)
 	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
@@ -406,7 +418,11 @@ func (c *serviceClient_OneLocatorDumpClient) Recv() (*OneLocatorDetails, error)
 	switch m := msg.(type) {
 	case *OneLocatorDetails:
 		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)
@@ -422,7 +438,7 @@ func (c *serviceClient) OneLocatorSetDump(ctx context.Context, in *OneLocatorSet
 	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
@@ -445,7 +461,11 @@ func (c *serviceClient_OneLocatorSetDumpClient) Recv() (*OneLocatorSetDetails, e
 	switch m := msg.(type) {
 	case *OneLocatorSetDetails:
 		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)
@@ -497,7 +517,7 @@ func (c *serviceClient) OneMapResolverDump(ctx context.Context, in *OneMapResolv
 	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
@@ -520,7 +540,11 @@ func (c *serviceClient_OneMapResolverDumpClient) Recv() (*OneMapResolverDetails,
 	switch m := msg.(type) {
 	case *OneMapResolverDetails:
 		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)
@@ -536,7 +560,7 @@ func (c *serviceClient) OneMapServerDump(ctx context.Context, in *OneMapServerDu
 	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
@@ -559,7 +583,11 @@ func (c *serviceClient_OneMapServerDumpClient) Recv() (*OneMapServerDetails, err
 	switch m := msg.(type) {
 	case *OneMapServerDetails:
 		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)
@@ -656,7 +684,7 @@ func (c *serviceClient) OneStatsDump(ctx context.Context, in *OneStatsDump) (RPC
 	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
@@ -679,7 +707,11 @@ func (c *serviceClient_OneStatsDumpClient) Recv() (*OneStatsDetails, error) {
 	switch m := msg.(type) {
 	case *OneStatsDetails:
 		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)