minor revise for cpumem client stage3

Author: CMGS

resource/plugins/cpumem/client/cpu.go

@@ -0,0 +1,35 @@
+package client
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/projecteru2/core/resource/plugins/cpumem/types"
+	"github.com/projecteru2/core/utils"
+)
+
+// NewNUMAFromStr .
+func NewNUMAFromStr(numa []string) (types.NUMA, error) {
+	r := types.NUMA{}
+	for index, numaCPUList := range numa {
+		nodeID := fmt.Sprintf("%d", index)
+		for _, cpuID := range strings.Split(numaCPUList, ",") {
+			r[cpuID] = nodeID
+		}
+	}
+	return r, nil
+}
+
+// NewNUMAMemoryFromStr .
+func NewNUMAMemoryFromStr(numaMemory []string) (types.NUMAMemory, error) {
+	r := types.NUMAMemory{}
+	for index, nodeMemory := range numaMemory {
+		nodeID := fmt.Sprintf("%d", index)
+		mem, err := utils.ParseRAMInHuman(nodeMemory)
+		if err != nil {
+			return r, err
+		}
+		r[nodeID] = mem
+	}
+	return r, nil
+}

resource/plugins/cpumem/types/node.go

@@ -215,6 +215,7 @@ func (n *NodeResourceRequest) Parse(config coretypes.Config, rawParams resourcet
 	}
 
 	for nodeID, nodeMemory := range rawParams.RawParams("numa-memory") {
+		// stupid golang covert int64 to float64 when using json.unmarshal
 		n.NUMAMemory[nodeID] = int64(nodeMemory.(float64))
 	}
 	return nil

rpc/transform.go

@@ -12,7 +12,6 @@ import (
 	pb "github.com/projecteru2/core/rpc/gen"
 	"github.com/projecteru2/core/types"
 	"github.com/projecteru2/core/utils"
-	"github.com/sanity-io/litter"
 
 	"golang.org/x/net/context"
 )
@@ -540,17 +539,12 @@ func toCoreRemoveImageOptions(opts *pb.RemoveImageOptions) *types.ImageOptions {
 func toCoreResources(resources map[string][]byte) resourcetypes.Resources {
 	r := resourcetypes.Resources{}
 	for k, v := range resources {
-		fmt.Println("==============")
-		fmt.Println(k, string(v))
-		fmt.Println("==============")
 		rp := resourcetypes.RawParams{}
 		if err := json.Unmarshal(v, &rp); err != nil {
 			log.WithFunc("toCoreResources").Errorf(nil, err, "%v", string(v)) // nolint
 			continue
 		}
 		r[k] = rp
-		litter.Dump(rp)
-		fmt.Println("==============")
 	}
 	return r
 }