增加节点IP地址管理等功能

internal/rpc/services/service_node.go

@@ -52,12 +52,25 @@ func (this *NodeService) CountAllEnabledNodes(ctx context.Context, req *pb.Count
 	return &pb.CountAllEnabledNodesResponse{Count: count}, nil
 }
 
-func (this *NodeService) ListEnabledNodes(ctx context.Context, req *pb.ListEnabledNodesRequest) (*pb.ListEnabledNodesResponse, error) {
+// 计算匹配的节点数量
+func (this *NodeService) CountAllEnabledNodesMatch(ctx context.Context, req *pb.CountAllEnabledNodesMatchRequest) (*pb.CountAllEnabledNodesMatchResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
 		return nil, err
 	}
-	nodes, err := models.SharedNodeDAO.ListEnabledNodes(req.Offset, req.Size)
+	count, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(req.ClusterId)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CountAllEnabledNodesMatchResponse{Count: count}, nil
+}
+
+func (this *NodeService) ListEnabledNodesMatch(ctx context.Context, req *pb.ListEnabledNodesMatchRequest) (*pb.ListEnabledNodesMatchResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+	nodes, err := models.SharedNodeDAO.ListEnabledNodesMatch(req.Offset, req.Size, req.ClusterId)
 	if err != nil {
 		return nil, err
 	}
@@ -80,7 +93,7 @@ func (this *NodeService) ListEnabledNodes(ctx context.Context, req *pb.ListEnabl
 		})
 	}
 
-	return &pb.ListEnabledNodesResponse{
+	return &pb.ListEnabledNodesMatchResponse{
 		Nodes: result,
 	}, nil
 }
@@ -171,9 +184,13 @@ func (this *NodeService) FindEnabledNode(ctx context.Context, req *pb.FindEnable
 	}
 
 	return &pb.FindEnabledNodeResponse{Node: &pb.Node{
-		Id:     int64(node.Id),
-		Name:   node.Name,
-		Status: node.Status,
+		Id:          int64(node.Id),
+		Name:        node.Name,
+		Status:      node.Status,
+		UniqueId:    node.UniqueId,
+		Secret:      node.Secret,
+		InstallDir:  node.InstallDir,
+		IsInstalled: node.IsInstalled == 1,
 		Cluster: &pb.NodeCluster{
 			Id:   int64(node.ClusterId),
 			Name: clusterName,

internal/rpc/services/service_node_cluster.go

@@ -10,7 +10,78 @@ import (
 type NodeClusterService struct {
 }
 
-func (this *NodeClusterService) FindAllEnabledClusters(ctx context.Context, req *pb.FindAllEnabledNodeClustersRequest) (*pb.FindAllEnabledNodeClustersResponse, error) {
+// 创建集群
+func (this *NodeClusterService) CreateNodeCluster(ctx context.Context, req *pb.CreateNodeClusterRequest) (*pb.CreateNodeClusterResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	clusterId, err := models.SharedNodeClusterDAO.CreateCluster(req.Name, req.GrantId, req.InstallDir)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateNodeClusterResponse{ClusterId: clusterId}, nil
+}
+
+// 修改集群
+func (this *NodeClusterService) UpdateNodeCluster(ctx context.Context, req *pb.UpdateNodeClusterRequest) (*pb.UpdateNodeClusterResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeClusterDAO.UpdateCluster(req.ClusterId, req.Name, req.GrantId, req.InstallDir)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateNodeClusterResponse{}, nil
+}
+
+// 禁用集群
+func (this *NodeClusterService) DisableNodeCluster(ctx context.Context, req *pb.DisableNodeClusterRequest) (*pb.DisableNodeClusterResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeClusterDAO.DisableNodeCluster(req.ClusterId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.DisableNodeClusterResponse{}, nil
+}
+
+// 查找单个集群
+func (this *NodeClusterService) FindEnabledNodeCluster(ctx context.Context, req *pb.FindEnabledNodeClusterRequest) (*pb.FindEnabledNodeClusterResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(req.ClusterId)
+	if err != nil {
+		return nil, err
+	}
+
+	if cluster == nil {
+		return &pb.FindEnabledNodeClusterResponse{}, nil
+	}
+
+	return &pb.FindEnabledNodeClusterResponse{Cluster: &pb.NodeCluster{
+		Id:         int64(cluster.Id),
+		Name:       cluster.Name,
+		CreatedAt:  int64(cluster.CreatedAt),
+		InstallDir: cluster.InstallDir,
+		GrantId:    int64(cluster.GrantId),
+	}}, nil
+}
+
+// 查找所有可用的集群
+func (this *NodeClusterService) FindAllEnabledNodeClusters(ctx context.Context, req *pb.FindAllEnabledNodeClustersRequest) (*pb.FindAllEnabledNodeClustersResponse, error) {
 	_ = req
 
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
@@ -38,7 +109,7 @@ func (this *NodeClusterService) FindAllEnabledClusters(ctx context.Context, req
 }
 
 // 查找所有变更的集群
-func (this *NodeClusterService) FindAllChangedClusters(ctx context.Context, req *pb.FindAllChangedClustersRequest) (*pb.FindAllChangedClustersResponse, error) {
+func (this *NodeClusterService) FindAllChangedNodeClusters(ctx context.Context, req *pb.FindAllChangedNodeClustersRequest) (*pb.FindAllChangedNodeClustersResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
 		return nil, err
@@ -49,7 +120,7 @@ func (this *NodeClusterService) FindAllChangedClusters(ctx context.Context, req
 		return nil, err
 	}
 	if len(clusterIds) == 0 {
-		return &pb.FindAllChangedClustersResponse{
+		return &pb.FindAllChangedNodeClustersResponse{
 			Clusters: []*pb.NodeCluster{},
 		}, nil
 	}
@@ -68,5 +139,46 @@ func (this *NodeClusterService) FindAllChangedClusters(ctx context.Context, req
 			CreatedAt: int64(cluster.CreatedAt),
 		})
 	}
-	return &pb.FindAllChangedClustersResponse{Clusters: result}, nil
+	return &pb.FindAllChangedNodeClustersResponse{Clusters: result}, nil
+}
+
+// 计算所有集群数量
+func (this *NodeClusterService) CountAllEnabledNodeClusters(ctx context.Context, req *pb.CountAllEnabledNodeClustersRequest) (*pb.CountAllEnabledNodeClustersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	count, err := models.SharedNodeClusterDAO.CountAllEnabledClusters()
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CountAllEnabledNodeClustersResponse{Count: count}, nil
+}
+
+// 列出单页集群
+func (this *NodeClusterService) ListEnabledNodeClusters(ctx context.Context, req *pb.ListEnabledNodeClustersRequest) (*pb.ListEnabledNodeClustersResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	clusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.NodeCluster{}
+	for _, cluster := range clusters {
+		result = append(result, &pb.NodeCluster{
+			Id:         int64(cluster.Id),
+			Name:       cluster.Name,
+			CreatedAt:  int64(cluster.CreatedAt),
+			GrantId:    int64(cluster.GrantId),
+			InstallDir: cluster.InstallDir,
+		})
+	}
+
+	return &pb.ListEnabledNodeClustersResponse{Clusters: result}, nil
 }

internal/rpc/services/service_node_ip_address.go

@@ -0,0 +1,149 @@
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc/pb"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+)
+
+type NodeIPAddressService struct {
+}
+
+// 创建IP地址
+func (this *NodeIPAddressService) CreateNodeIPAddress(ctx context.Context, req *pb.CreateNodeIPAddressRequest) (*pb.CreateNodeIPAddressResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	addressId, err := models.SharedNodeIPAddressDAO.CreateAddress(req.NodeId, req.Name, req.Ip)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateNodeIPAddressResponse{AddressId: addressId}, nil
+}
+
+// 修改IP地址
+func (this *NodeIPAddressService) UpdateNodeIPAddress(ctx context.Context, req *pb.UpdateNodeIPAddressRequest) (*pb.UpdateNodeIPAddressResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeIPAddressDAO.UpdateAddress(req.AddressId, req.Name, req.Ip)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateNodeIPAddressResponse{}, nil
+}
+
+// 修改IP地址所属节点
+func (this *NodeIPAddressService) UpdateNodeIPAddressNodeId(ctx context.Context, req *pb.UpdateNodeIPAddressNodeIdRequest) (*pb.UpdateNodeIPAddressNodeIdResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeIPAddressDAO.UpdateAddressNodeId(req.AddressId, req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.UpdateNodeIPAddressNodeIdResponse{}, nil
+}
+
+// 禁用单个IP地址
+func (this *NodeIPAddressService) DisableNodeIPAddress(ctx context.Context, req *pb.DisableNodeIPAddressRequest) (*pb.DisableNodeIPAddressResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeIPAddressDAO.DisableAddress(req.AddressId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.DisableNodeIPAddressResponse{}, nil
+}
+
+// 禁用某个节点的IP地址
+func (this *NodeIPAddressService) DisableAllIPAddressesWithNodeId(ctx context.Context, req *pb.DisableAllIPAddressesWithNodeIdRequest) (*pb.DisableAllIPAddressesWithNodeIdResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeIPAddressDAO.DisableAllAddressesWithNodeId(req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.DisableAllIPAddressesWithNodeIdResponse{}, nil
+}
+
+// 查找单个IP地址
+func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context, req *pb.FindEnabledNodeIPAddressRequest) (*pb.FindEnabledNodeIPAddressResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	address, err := models.SharedNodeIPAddressDAO.FindEnabledAddress(req.AddressId)
+	if err != nil {
+		return nil, err
+	}
+
+	var result *pb.NodeIPAddress = nil
+	if address != nil {
+		result = &pb.NodeIPAddress{
+			Id:          int64(address.Id),
+			NodeId:      int64(address.NodeId),
+			Name:        address.Name,
+			Ip:          address.IP,
+			Description: address.Description,
+			State:       int64(address.State),
+			Order:       int64(address.Order),
+		}
+	}
+
+	return &pb.FindEnabledNodeIPAddressResponse{IpAddress: result}, nil
+}
+
+// 查找节点的所有地址
+func (this *NodeIPAddressService) FindAllEnabledIPAddressesWithNodeId(ctx context.Context, req *pb.FindAllEnabledIPAddressesWithNodeIdRequest) (*pb.FindAllEnabledIPAddressesWithNodeIdResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	addresses, err := models.SharedNodeIPAddressDAO.FindAllEnabledAddressesWithNode(req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.NodeIPAddress{}
+	for _, address := range addresses {
+		result = append(result, &pb.NodeIPAddress{
+			Id:          int64(address.Id),
+			NodeId:      int64(address.NodeId),
+			Name:        address.Name,
+			Ip:          address.IP,
+			Description: address.Description,
+			State:       int64(address.State),
+			Order:       int64(address.Order),
+		})
+	}
+
+	return &pb.FindAllEnabledIPAddressesWithNodeIdResponse{Addresses: result}, nil
+}