2 files changed, 18 insertions, 8 deletions
diff --git a/internal/testbinapi/binapi2001/vhost_user/vhost_user.ba.go b/internal/testbinapi/binapi2001/vhost_user/vhost_user.ba.go
index cd5a64a..a3aa648 100644
--- a/internal/testbinapi/binapi2001/vhost_user/vhost_user.ba.go
+++ b/internal/testbinapi/binapi2001/vhost_user/vhost_user.ba.go
@@ -1,6 +1,6 @@
 // Code generated by GoVPP's binapi-generator. DO NOT EDIT.
 // versions:
-//  binapi-generator: v0.4.0-dev
+//  binapi-generator: v0.5.0-dev
 //  VPP:              20.01
 // source: .vppapi/core/vhost_user.api.json
 
@@ -14,10 +14,11 @@
 package vhost_user
 
 import (
-	api "git.fd.io/govpp.git/api"
-	codec "git.fd.io/govpp.git/codec"
 	"net"
 	"strconv"
+
+	api "git.fd.io/govpp.git/api"
+	codec "git.fd.io/govpp.git/codec"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -391,15 +392,19 @@ func ParseMacAddress(s string) (MacAddress, error) {
 	copy(macaddr[:], mac[:])
 	return macaddr, nil
 }
+
 func (x MacAddress) ToMAC() net.HardwareAddr {
 	return net.HardwareAddr(x[:])
 }
+
 func (x MacAddress) String() string {
 	return x.ToMAC().String()
 }
+
 func (x *MacAddress) MarshalText() ([]byte, error) {
 	return []byte(x.String()), nil
 }
+
 func (x *MacAddress) UnmarshalText(text []byte) error {
 	mac, err := ParseMacAddress(string(text))
 	if err != nil {
diff --git a/internal/testbinapi/binapi2001/vhost_user/vhost_user_rpc.ba.go b/internal/testbinapi/binapi2001/vhost_user/vhost_user_rpc.ba.go
index 91132eb..dcb13ff 100644
--- a/internal/testbinapi/binapi2001/vhost_user/vhost_user_rpc.ba.go
+++ b/internal/testbinapi/binapi2001/vhost_user/vhost_user_rpc.ba.go
@@ -5,12 +5,13 @@ package vhost_user
 import (
 	"context"
 	"fmt"
+	"io"
+
 	api "git.fd.io/govpp.git/api"
 	vpe "git.fd.io/govpp.git/internal/testbinapi/binapi2001/vpe"
-	"io"
 )
 
-// RPCService defines RPC service  vhost_user.
+// RPCService defines RPC service vhost_user.
 type RPCService interface {
 	CreateVhostUserIf(ctx context.Context, in *CreateVhostUserIf) (*CreateVhostUserIfReply, error)
 	DeleteVhostUserIf(ctx context.Context, in *DeleteVhostUserIf) (*DeleteVhostUserIfReply, error)
@@ -32,7 +33,7 @@ func (c *serviceClient) CreateVhostUserIf(ctx context.Context, in *CreateVhostUs
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) DeleteVhostUserIf(ctx context.Context, in *DeleteVhostUserIf) (*DeleteVhostUserIfReply, error) {
@@ -41,7 +42,7 @@ func (c *serviceClient) DeleteVhostUserIf(ctx context.Context, in *DeleteVhostUs
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) ModifyVhostUserIf(ctx context.Context, in *ModifyVhostUserIf) (*ModifyVhostUserIfReply, error) {
@@ -50,7 +51,7 @@ func (c *serviceClient) ModifyVhostUserIf(ctx context.Context, in *ModifyVhostUs
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	return out, api.RetvalToVPPApiError(out.Retval)
 }
 
 func (c *serviceClient) SwInterfaceVhostUserDump(ctx context.Context, in *SwInterfaceVhostUserDump) (RPCService_SwInterfaceVhostUserDumpClient, error) {
@@ -86,6 +87,10 @@ func (c *serviceClient_SwInterfaceVhostUserDumpClient) Recv() (*SwInterfaceVhost
 	case *SwInterfaceVhostUserDetails:
 		return m, nil
 	case *vpe.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)