better way to extract resource from engine info

Author: yuyang0

engine/types/info.go

@@ -7,4 +7,5 @@ type Info struct {
 	NCPU         int
 	MemTotal     int64
 	StorageTotal int64
+	Resources    map[string][]byte
 }

engine/virt/virt.go

@@ -74,6 +74,7 @@ func (v *Virt) Info(ctx context.Context) (*enginetypes.Info, error) {
 		NCPU:         resp.CPU,
 		MemTotal:     resp.Mem,
 		StorageTotal: resp.Storage,
+		Resources:    resp.Resources,
 	}, nil
 }
 

resource/plugins/cpumem/node.go

@@ -37,16 +37,31 @@ func (p Plugin) AddNode(ctx context.Context, nodename string, resource plugintyp
 		return nil, err
 	}
 
-	if info != nil {
+	if info != nil { //nolint
+		// extrace NodeResource from Resources
+		var nodeRes cpumemtypes.NodeResource
+		if b, ok := info.Resources[p.Name()]; ok {
+			if err := json.Unmarshal(b, &nodeRes); err != nil {
+				return nil, err
+			}
+			// NodeResource has higher priority
+			info.NCPU = int(nodeRes.CPU)
+			info.MemTotal = nodeRes.Memory
+		}
 		if len(req.CPUMap) == 0 {
 			req.CPUMap = cpumemtypes.CPUMap{}
 			for i := 0; i < info.NCPU; i++ {
 				req.CPUMap[strconv.Itoa(i)] = p.config.Scheduler.ShareBase
 			}
+			req.NUMA = nodeRes.NUMA
 		}
 
 		if req.Memory == 0 {
 			req.Memory = info.MemTotal * rate / 10 // use 80% of real memory
+			req.NUMAMemory = cpumemtypes.NUMAMemory{}
+			for k, v := range nodeRes.NUMAMemory {
+				req.NUMAMemory[k] = v * rate / 10
+			}
 		}
 	}