update unitests

cluster/calcium/node_test.go

@@ -93,16 +93,24 @@ func TestListPodNodes(t *testing.T) {
 	store := &storemocks.Store{}
 	c.store = store
 	store.On("GetNodesByPod", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
-	_, err := c.ListPodNodes(ctx, "", nil, false)
+	_, err := c.ListPodNodes(ctx, &types.ListNodesOptions{})
 	assert.Error(t, err)
 	store.On("GetNodesByPod", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nodes, nil)
-	ns, err := c.ListPodNodes(ctx, "", nil, false)
+	ns, err := c.ListPodNodes(ctx, &types.ListNodesOptions{})
+	nss := []*types.Node{}
+	for n := range ns {
+		nss = append(nss, n)
+	}
 	assert.NoError(t, err)
-	assert.Equal(t, len(ns), 2)
-	assert.Equal(t, ns[0].Name, name1)
-	ns, err = c.ListPodNodes(ctx, "", nil, true)
+	assert.Equal(t, len(nss), 2)
+	assert.Equal(t, nss[0].Name, name1)
+	ns, err = c.ListPodNodes(ctx, &types.ListNodesOptions{})
 	assert.NoError(t, err)
-	assert.Equal(t, len(ns), 2)
+	cnt := 0
+	for range ns {
+		cnt++
+	}
+	assert.Equal(t, cnt, 2)
 }
 
 func TestGetNode(t *testing.T) {

cluster/calcium/resource.go

@@ -29,9 +29,8 @@ func (c *Calcium) PodResource(ctx context.Context, podname string) (chan *types.
 			pool.Go(ctx, func() {
 				nodeResource, err := c.doGetNodeResource(ctx, node.Name, false)
 				if err != nil {
-					logger.Err(ctx, err)
 					nodeResource = &types.NodeResource{
-						Name: node.Name, Diffs: []string{err.Error()},
+						Name: node.Name, Diffs: []string{logger.Err(ctx, err).Error()},
 					}
 				}
 				ch <- nodeResource

cluster/calcium/resource_test.go

@@ -30,13 +30,15 @@ func TestPodResource(t *testing.T) {
 	store := &storemocks.Store{}
 	c.store = store
 	lock := &lockmocks.DistributedLock{}
-	store.On("CreateLock", mock.Anything, mock.Anything).Return(lock, nil)
 	lock.On("Lock", mock.Anything).Return(context.TODO(), nil)
 	lock.On("Unlock", mock.Anything).Return(nil)
 	// failed by GetNodesByPod
 	store.On("GetNodesByPod", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
-	_, err := c.PodResource(ctx, podname)
+	ch, err := c.PodResource(ctx, podname)
 	assert.Error(t, err)
+	store.AssertExpectations(t)
+
+	// failed by ListNodeWorkloads
 	node := &types.Node{
 		NodeMeta: types.NodeMeta{
 			Name:           nodename,
@@ -49,10 +51,14 @@ func TestPodResource(t *testing.T) {
 	}
 	store.On("GetNodesByPod", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]*types.Node{node}, nil)
 	store.On("GetNode", mock.Anything, mock.Anything).Return(node, nil)
-	// failed by ListNodeWorkloads
 	store.On("ListNodeWorkloads", mock.Anything, mock.Anything, mock.Anything).Return(nil, types.ErrNoETCD).Once()
-	_, err = c.PodResource(ctx, podname)
-	assert.Error(t, err)
+	store.On("CreateLock", mock.Anything, mock.Anything).Return(lock, nil)
+	ch, err = c.PodResource(ctx, podname)
+	assert.NoError(t, err)
+	msg := <-ch
+	assert.True(t, strings.Contains(msg.Diffs[0], types.ErrNoETCD.Error()))
+	store.AssertExpectations(t)
+
 	workloads := []*types.Workload{
 		{
 			ResourceMeta: types.ResourceMeta{
@@ -84,10 +90,11 @@ func TestPodResource(t *testing.T) {
 	// success
 	r, err := c.PodResource(ctx, podname)
 	assert.NoError(t, err)
-	assert.Equal(t, r.NodesResource[0].CPUPercent, 0.9)
-	assert.Equal(t, r.NodesResource[0].MemoryPercent, 0.5)
-	assert.Equal(t, r.NodesResource[0].StoragePercent, 0.1)
-	assert.NotEmpty(t, r.NodesResource[0].Diffs)
+	first := <-r
+	assert.Equal(t, first.CPUPercent, 0.9)
+	assert.Equal(t, first.MemoryPercent, 0.5)
+	assert.Equal(t, first.StoragePercent, 0.1)
+	assert.NotEmpty(t, first.Diffs)
 }
 
 func TestNodeResource(t *testing.T) {

rpc/rpc.go

@@ -157,6 +157,7 @@ func (v *Vibranium) GetPodResource(ctx context.Context, opts *pb.GetPodOptions)
 	return podResource, nil
 }
 
+// PodResourceStream returns a stream of NodeResource
 func (v *Vibranium) PodResourceStream(opts *pb.GetPodOptions, stream pb.CoreRPC_PodResourceStreamServer) error {
 	ctx := v.taskAdd(stream.Context(), "PodResourceStream", false)
 	defer v.taskDone(ctx, "PodResourceStream", false)
@@ -217,6 +218,7 @@ func (v *Vibranium) ListPodNodes(ctx context.Context, opts *pb.ListNodesOptions)
 	return &pb.Nodes{Nodes: nodes}, nil
 }
 
+// PodNodesStream returns a stream of Node
 func (v *Vibranium) PodNodesStream(opts *pb.ListNodesOptions, stream pb.CoreRPC_PodNodesStreamServer) error {
 	ctx := v.taskAdd(stream.Context(), "PodNodesStream", false)
 	defer v.taskDone(ctx, "PodNodesStream", false)

types/node_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"math"
 	"reflect"
+	"strings"
 	"testing"
 
 	enginemocks "github.com/projecteru2/core/engine/mocks"
@@ -25,13 +26,13 @@ func TestNode(t *testing.T) {
 	assert.Equal(t, node.Volume, VolumeMap{})
 	assert.Equal(t, node.InitVolume, VolumeMap{})
 	ctx := context.Background()
-	_, err := node.Info(ctx)
+	err := node.Info(ctx)
 	assert.Error(t, err)
 
 	node.Engine = mockEngine
-	info, err := node.Info(ctx)
+	err = node.Info(ctx)
 	assert.NoError(t, err)
-	assert.Equal(t, info.ID, "test")
+	assert.True(t, strings.Contains(node.NodeInfo, "test"))
 
 	node.CPUUsed = 0.0
 	node.SetCPUUsed(1.0, IncrUsage)

types/options.go

@@ -175,6 +175,7 @@ func (o *ReplaceOptions) Normalize() {
 	}
 }
 
+// ListNodesOptions for list nodes
 type ListNodesOptions struct {
 	Podname string
 	Labels  map[string]string