proto: add network stats

So that agent can transfer network stats to runtime

Fixes: #535

Signed-off-by: ZeroMagic <[email protected]>

grpc.go

@@ -1182,18 +1182,30 @@ func (a *agentGRPC) StatsContainer(ctx context.Context, req *pb.StatsContainerRe
 		return nil, err
 	}
 
-	data, err := json.Marshal(stats.CgroupStats)
+	cgroupData, err := json.Marshal(stats.CgroupStats)
+	if err != nil {
+		return nil, err
+	}
+
+	netData, err := json.Marshal(stats.Interfaces)
 	if err != nil {
 		return nil, err
 	}
 
 	var cgroupStats pb.CgroupStats
-	err = json.Unmarshal(data, &cgroupStats)
+	networkStats := make([]*pb.NetworkStats, 0)
+
+	err = json.Unmarshal(cgroupData, &cgroupStats)
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(netData, &networkStats)
 	if err != nil {
 		return nil, err
 	}
 	resp := &pb.StatsContainerResponse{
-		CgroupStats: &cgroupStats,
+		CgroupStats:  &cgroupStats,
+		NetworkStats: networkStats,
 	}
 
 	return resp, nil

grpc_test.go

@@ -23,6 +23,7 @@ import (
 
 	pb "github.com/kata-containers/agent/protocols/grpc"
 	"github.com/opencontainers/runc/libcontainer"
+	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/seccomp"
 	"github.com/opencontainers/runtime-spec/specs-go"
@@ -516,16 +517,26 @@ func TestStatsContainer(t *testing.T) {
 	assert.Error(err)
 	assert.Nil(r)
 
+	network := &libcontainer.NetworkInterface{}
+	interfaces := make([]*libcontainer.NetworkInterface, 0)
+	interfaces = append(interfaces, network)
+
 	a.sandbox.containers[containerID] = &container{
 		container: &mockContainer{
 			id: containerID,
+			stats: libcontainer.Stats{
+				CgroupStats: &cgroups.Stats{},
+				Interfaces:  interfaces,
+			},
 		},
 	}
 
 	r, err = a.StatsContainer(context.TODO(), req)
 	assert.NoError(err)
 	assert.NotNil(r)
 
+	assert.NotNil(r.CgroupStats)
+	assert.NotNil(r.NetworkStats)
 }
 
 func TestPauseContainer(t *testing.T) {