refactor cpumem addnode stage2

Author: CMGS

resource/plugins/cpumem/client/node.go

@@ -2,8 +2,6 @@ package client
 
 import (
 	"encoding/json"
-	"strconv"
-	"strings"
 
 	"github.com/projecteru2/core/resource/plugins/cpumem/types"
 )
@@ -14,53 +12,23 @@ type cpuType interface {
 
 // NodeResourceRequest includes all possible fields passed by eru-core for editing node, it not parsed!
 type NodeResourceRequest[T cpuType] struct {
-	CPU        T        `json:"cpu"`
-	Share      int64    `json:"share"`
-	Memory     int64    `json:"memory"`
-	NUMA       []string `json:"numa-cpu"`
-	NUMAMemory []int64  `json:"numa-memory"`
+	CPU    T     `json:"cpu"`
+	Share  int64 `json:"share"`
+	Memory int64 `json:"memory"`
 
-	NUMACPUMap    types.NUMA       `json:"-"`
-	NUMAMemoryMap types.NUMAMemory `json:"-"`
+	NUMA       types.NUMA       `json:"numa-cpu"`
+	NUMAMemory types.NUMAMemory `json:"numa-memory"`
 }
 
 // NewNodeResourceRequest .
-func NewNodeResourceRequest[T cpuType](cpu T, share, memory int64, NUMACPUMap types.NUMA, NUMAMemoryMap types.NUMAMemory) (*NodeResourceRequest[T], error) {
+func NewNodeResourceRequest[T cpuType](cpu T, share, memory int64, NUMA types.NUMA, NUMAMemory types.NUMAMemory) (*NodeResourceRequest[T], error) {
 	r := &NodeResourceRequest[T]{
-		CPU:    cpu,
-		Share:  share,
-		Memory: memory,
+		CPU:        cpu,
+		Share:      share,
+		Memory:     memory,
+		NUMA:       NUMA,
+		NUMAMemory: NUMAMemory,
 	}
-	tmpNUMA := map[int][]string{}
-	for cpuID, nodeID := range NUMACPUMap {
-		nID, err := strconv.Atoi(nodeID)
-		if err != nil {
-			return nil, err
-		}
-		if tmpNUMA[nID] == nil {
-			tmpNUMA[nID] = []string{cpuID}
-			continue
-		}
-		tmpNUMA[nID] = append(tmpNUMA[nID], cpuID)
-	}
-	r.NUMA = make([]string, len(tmpNUMA))
-	for nodeID, cpus := range tmpNUMA {
-		r.NUMA[nodeID] = strings.Join(cpus, ",")
-	}
-
-	tmpNUMAMemory := map[int]int64{}
-	for nodeID, memory := range NUMAMemoryMap {
-		nID, err := strconv.Atoi(nodeID)
-		if err != nil {
-			return nil, err
-		}
-		tmpNUMAMemory[nID] = memory
-	}
-	r.NUMAMemory = make([]int64, len(tmpNUMAMemory))
-	for nodeID, memory := range tmpNUMAMemory {
-		r.NUMAMemory[nodeID] = memory
-	}
-
 	return r, nil
 }
 

resource/plugins/cpumem/types/node.go

@@ -179,8 +179,6 @@ type NodeResourceRequest struct {
 }
 
 func (n *NodeResourceRequest) Parse(config coretypes.Config, rawParams resourcetypes.RawParams) error {
-	var err error
-
 	if n.CPUMap == nil {
 		n.CPUMap = CPUMap{}
 	}
@@ -208,30 +206,17 @@ func (n *NodeResourceRequest) Parse(config coretypes.Config, rawParams resourcet
 			n.CPUMap[cpuID] = int(pieces)
 		}
 	}
-
-	if n.Memory, err = coreutils.ParseRAMInHuman(rawParams.String("memory")); err != nil {
-		return err
-	}
+	n.Memory = rawParams.Int64("memory")
 
 	n.NUMA = NUMA{}
 	n.NUMAMemory = NUMAMemory{}
-
-	for index, numaCPUList := range rawParams.StringSlice("numa-cpu") {
-		nodeID := fmt.Sprintf("%d", index)
-		for _, cpuID := range strings.Split(numaCPUList, ",") {
-			n.NUMA[cpuID] = nodeID
-		}
+	for cpuID, nodeID := range rawParams.RawParams("numa-cpu") {
+		n.NUMA[cpuID] = nodeID.(string)
 	}
 
-	for index, nodeMemory := range rawParams.StringSlice("numa-memory") {
-		nodeID := fmt.Sprintf("%d", index)
-		mem, err := coreutils.ParseRAMInHuman(nodeMemory)
-		if err != nil {
-			return err
-		}
-		n.NUMAMemory[nodeID] = mem
+	for nodeID, nodeMemory := range rawParams.RawParams("numa-memory") {
+		n.NUMAMemory[nodeID] = int64(nodeMemory.(float64))
 	}
-
 	return nil
 }
 

rpc/transform.go

@@ -12,6 +12,7 @@ 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"
 )
@@ -539,12 +540,17 @@ 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
 }