fix(backend): 增加字段

server/api/v1/node.proto

@@ -79,9 +79,9 @@ message NodeReply {
   int32 vgpu_used = 5;
   int32 vgpu_total = 6;
   int32 core_used = 7;
-  int32 core_total = 8;
+  int64 core_total = 8;
   int32 memory_used = 9;
-  int32 memory_total = 10;
+  int64 memory_total = 10;
   string uid = 11;
   string name = 12;
   int32 card_cnt = 13;
@@ -93,6 +93,8 @@ message NodeReply {
   string kube_proxy_version = 19;
   string architecture = 20;
   string creation_timestamp = 21;
+  int64 disk_size = 22;
+
 }
 
 message NodesReply {

server/api/v1/resource_pool.proto

@@ -137,6 +137,7 @@ message ResourcePoolListData{
   int64 available_memory = 6;//kb
   int64 total_memory = 7; // kb
   int64 disk_size = 8;
+  repeated string node_list = 9;
 }
 
 message ResourcePoolListRequest {

server/internal/service/node.go

@@ -51,8 +51,8 @@ func (s *NodeService) GetAllNodes(ctx context.Context, req *pb.GetAllNodesReq) (
 
 		coreTotal, memoryTotal, err := s.queryNodeMetrics(ctx, node.Name)
 		if err == nil {
-			nodeReply.CoreTotal = coreTotal
-			nodeReply.MemoryTotal = memoryTotal
+			nodeReply.CoreTotal = int64(coreTotal)
+			nodeReply.MemoryTotal = int64(memoryTotal)
 		}
 
 		if filters.Ip != "" && filters.Ip != nodeReply.Ip {
@@ -103,13 +103,16 @@ func (s *NodeService) buildNodeReply(ctx context.Context, node *biz.Node) (*pb.N
 		KubeProxyVersion:        node.KubeProxyVersion,
 		Architecture:            node.Architecture,
 		CreationTimestamp:       node.CreationTimestamp,
+		CoreTotal:               node.CPUCores,
+		MemoryTotal:             node.TotalMemory,
+		DiskSize:                node.DiskTotal,
 	}
 
 	for _, device := range node.Devices {
 		nodeReply.Type = append(nodeReply.Type, device.Type)
 		nodeReply.VgpuTotal += device.Count
-		nodeReply.CoreTotal += device.Devcore
-		nodeReply.MemoryTotal += device.Devmem
+		nodeReply.CoreTotal += int64(device.Devcore)
+		nodeReply.MemoryTotal += int64(device.Devmem)
 		vGPU, core, memory, err := s.pod.StatisticsByDeviceId(ctx, device.AliasId)
 		if err == nil {
 			nodeReply.VgpuUsed += vGPU

server/internal/service/resource_pool.go

@@ -123,8 +123,10 @@ func (s *ResourcePoolService) List(ctx context.Context, req *pb.ResourcePoolList
 		var poolData pb.ResourcePoolListData
 		poolData.PoolId = resourcePool.Id
 		poolData.PoolName = resourcePool.PoolName
+
 		dbNodes, _ := database.QueryNodesByPoolId(resourcePool.Id)
 		poolData.NodeNum = int64(len(dbNodes))
+
 		for _, n := range dbNodes {
 			node := k8sNodes[n.NodeName]
 			if node == nil {
@@ -135,7 +137,7 @@ func (s *ResourcePoolService) List(ctx context.Context, req *pb.ResourcePoolList
 			poolData.TotalMemory = poolData.TotalMemory + node.TotalMemory
 			poolData.AvailableMemory = poolData.AvailableMemory + node.AvailableMemory
 			poolData.DiskSize = poolData.DiskSize + node.DiskTotal
-
+			poolData.NodeList = append(poolData.NodeList, n.NodeIp)
 		}
 		data = append(data, &poolData)
 	}