TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-27 01:50:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现基础的IP地址阈值

Browse Source
This commit is contained in:
刘祥超
2021-09-12 20:21:42 +08:00
parent 1ea7fe0213
commit 7fcc2b7dba
15 changed files with 616 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/services/service_node.go
View File

@@ -1412,7 +1412,7 @@ func (this *NodeService) UpdateNodeDNS(ctx context.Context, req *pb.UpdateNodeDN
return nil, err
}
} else {
_, err = models.SharedNodeIPAddressDAO.CreateAddress(tx, adminId, req.NodeId, nodeconfigs.NodeRoleNode, "DNS IP", req.IpAddr, true, nil)
_, err = models.SharedNodeIPAddressDAO.CreateAddress(tx, adminId, req.NodeId, nodeconfigs.NodeRoleNode, "DNS IP", req.IpAddr, true)
if err != nil {
return nil, err
}

69
internal/rpc/services/service_node_ip_address.go
View File

@@ -21,7 +21,7 @@ func (this *NodeIPAddressService) CreateNodeIPAddress(ctx context.Context, req *
tx := this.NullTx()
addressId, err := models.SharedNodeIPAddressDAO.CreateAddress(tx, adminId, req.NodeId, req.Role, req.Name, req.Ip, req.CanAccess, req.ThresholdsJSON)
addressId, err := models.SharedNodeIPAddressDAO.CreateAddress(tx, adminId, req.NodeId, req.Role, req.Name, req.Ip, req.CanAccess)
if err != nil {
return nil, err
}
@@ -39,7 +39,7 @@ func (this *NodeIPAddressService) UpdateNodeIPAddress(ctx context.Context, req *
tx := this.NullTx()
err = models.SharedNodeIPAddressDAO.UpdateAddress(tx, adminId, req.NodeIPAddressId, req.Name, req.Ip, req.CanAccess, req.IsOn, req.ThresholdsJSON)
err = models.SharedNodeIPAddressDAO.UpdateAddress(tx, adminId, req.NodeIPAddressId, req.Name, req.Ip, req.CanAccess, req.IsOn)
if err != nil {
return nil, err
}
@@ -119,18 +119,17 @@ func (this *NodeIPAddressService) FindEnabledNodeIPAddress(ctx context.Context,
var result *pb.NodeIPAddress = nil
if address != nil {
result = &pb.NodeIPAddress{
Id: int64(address.Id),
NodeId: int64(address.NodeId),
Role: address.Role,
Name: address.Name,
Ip: address.Ip,
Description: address.Description,
State: int64(address.State),
Order: int64(address.Order),
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
ThresholdsJSON: []byte(address.Thresholds),
Id: int64(address.Id),
NodeId: int64(address.NodeId),
Role: address.Role,
Name: address.Name,
Ip: address.Ip,
Description: address.Description,
State: int64(address.State),
Order: int64(address.Order),
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
}
}
@@ -155,18 +154,17 @@ func (this *NodeIPAddressService) FindAllEnabledIPAddressesWithNodeId(ctx contex
result := []*pb.NodeIPAddress{}
for _, address := range addresses {
result = append(result, &pb.NodeIPAddress{
Id: int64(address.Id),
NodeId: int64(address.NodeId),
Role: address.Role,
Name: address.Name,
Ip: address.Ip,
Description: address.Description,
State: int64(address.State),
Order: int64(address.Order),
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
ThresholdsJSON: []byte(address.Thresholds),
Id: int64(address.Id),
NodeId: int64(address.NodeId),
Role: address.Role,
Name: address.Name,
Ip: address.Ip,
Description: address.Description,
State: int64(address.State),
Order: int64(address.Order),
CanAccess: address.CanAccess == 1,
IsOn: address.IsOn == 1,
IsUp: address.IsUp == 1,
})
}
@@ -207,16 +205,15 @@ func (this *NodeIPAddressService) ListEnabledIPAddresses(ctx context.Context, re
var pbAddrs = []*pb.NodeIPAddress{}
for _, addr := range addresses {
pbAddrs = append(pbAddrs, &pb.NodeIPAddress{
Id: int64(addr.Id),
NodeId: int64(addr.NodeId),
Role: addr.Role,
Name: addr.Name,
Ip: addr.Ip,
Description: addr.Description,
CanAccess: addr.CanAccess == 1,
IsOn: addr.IsOn == 1,
IsUp: addr.IsUp == 1,
ThresholdsJSON: []byte(addr.Thresholds),
Id: int64(addr.Id),
NodeId: int64(addr.NodeId),
Role: addr.Role,
Name: addr.Name,
Ip: addr.Ip,
Description: addr.Description,
CanAccess: addr.CanAccess == 1,
IsOn: addr.IsOn == 1,
IsUp: addr.IsUp == 1,
})
}
return &pb.ListEnabledIPAddressesResponse{NodeIPAddresses: pbAddrs}, nil

171
internal/rpc/services/service_node_ip_address_threshold.go Normal file
View File

@@ -0,0 +1,171 @@
// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
package services
import (
"context"
"encoding/json"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/errors"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
)
// NodeIPAddressThresholdService IP阈值相关服务
type NodeIPAddressThresholdService struct {
BaseService
}
// CreateNodeIPAddressThreshold 创建阈值
func (this *NodeIPAddressThresholdService) CreateNodeIPAddressThreshold(ctx context.Context, req *pb.CreateNodeIPAddressThresholdRequest) (*pb.CreateNodeIPAddressThresholdResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
var items = []*nodeconfigs.NodeValueThresholdItemConfig{}
if len(req.ItemsJSON) > 0 {
err = json.Unmarshal(req.ItemsJSON, &items)
if err != nil {
return nil, errors.New("decode items failed: " + err.Error())
}
}
var actions = []*nodeconfigs.NodeValueThresholdActionConfig{}
if len(req.ActionsJSON) > 0 {
err = json.Unmarshal(req.ActionsJSON, &actions)
if err != nil {
return nil, errors.New("decode actions failed: " + err.Error())
}
}
thresholdId, err := models.SharedNodeIPAddressThresholdDAO.CreateThreshold(tx, req.NodeIPAddressId, items, actions, 0)
if err != nil {
return nil, err
}
return &pb.CreateNodeIPAddressThresholdResponse{NodeIPAddressThresholdId: thresholdId}, nil
}
// UpdateNodeIPAddressThreshold 修改阈值
func (this *NodeIPAddressThresholdService) UpdateNodeIPAddressThreshold(ctx context.Context, req *pb.UpdateNodeIPAddressThresholdRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
var items = []*nodeconfigs.NodeValueThresholdItemConfig{}
if len(req.ItemsJSON) > 0 {
err = json.Unmarshal(req.ItemsJSON, &items)
if err != nil {
return nil, errors.New("decode items failed: " + err.Error())
}
}
var actions = []*nodeconfigs.NodeValueThresholdActionConfig{}
if len(req.ActionsJSON) > 0 {
err = json.Unmarshal(req.ActionsJSON, &actions)
if err != nil {
return nil, errors.New("decode actions failed: " + err.Error())
}
}
err = models.SharedNodeIPAddressThresholdDAO.UpdateThreshold(tx, req.NodeIPAddressThresholdId, items, actions, -1)
if err != nil {
return nil, err
}
return this.Success()
}
// DeleteNodeIPAddressThreshold 删除阈值
func (this *NodeIPAddressThresholdService) DeleteNodeIPAddressThreshold(ctx context.Context, req *pb.DeleteNodeIPAddressThresholdRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
err = models.SharedNodeIPAddressThresholdDAO.DisableNodeIPAddressThreshold(tx, req.NodeIPAddressThresholdId)
if err != nil {
return nil, err
}
return this.Success()
}
// FindAllEnabledNodeIPAddressThresholds 查找IP的所有阈值
func (this *NodeIPAddressThresholdService) FindAllEnabledNodeIPAddressThresholds(ctx context.Context, req *pb.FindAllEnabledNodeIPAddressThresholdsRequest) (*pb.FindAllEnabledNodeIPAddressThresholdsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
thresholds, err := models.SharedNodeIPAddressThresholdDAO.FindAllEnabledThresholdsWithAddrId(tx, req.NodeIPAddressId)
if err != nil {
return nil, err
}
var pbThresholds = []*pb.NodeIPAddressThreshold{}
for _, threshold := range thresholds {
pbThresholds = append(pbThresholds, &pb.NodeIPAddressThreshold{
Id: int64(threshold.Id),
ItemsJSON: []byte(threshold.Items),
ActionsJSON: []byte(threshold.Actions),
})
}
return &pb.FindAllEnabledNodeIPAddressThresholdsResponse{NodeIPAddressThresholds: pbThresholds}, nil
}
// CountAllEnabledNodeIPAddressThresholds 计算IP阈值的数量
func (this *NodeIPAddressThresholdService) CountAllEnabledNodeIPAddressThresholds(ctx context.Context, req *pb.CountAllEnabledNodeIPAddressThresholdsRequest) (*pb.RPCCountResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
count, err := models.SharedNodeIPAddressThresholdDAO.CountAllEnabledThresholdsWithAddrId(tx, req.NodeIPAddressId)
if err != nil {
return nil, err
}
return this.SuccessCount(count)
}
// UpdateAllNodeIPAddressThresholds 批量更新阈值
func (this *NodeIPAddressThresholdService) UpdateAllNodeIPAddressThresholds(ctx context.Context, req *pb.UpdateAllNodeIPAddressThresholdsRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
var thresholds = []*nodeconfigs.NodeValueThresholdConfig{}
err = json.Unmarshal(req.NodeIPAddressThresholdsJSON, &thresholds)
if err != nil {
return nil, errors.New("decode thresholds failed: " + err.Error())
}
err = models.SharedNodeIPAddressThresholdDAO.DisableAllThresholdsWithAddrId(tx, req.NodeIPAddressId)
if err != nil {
return nil, err
}
if len(thresholds) == 0 {
return this.Success()
}
var count = len(thresholds)
for index, threshold := range thresholds {
var order = count - index
if threshold.Id > 0 {
err = models.SharedNodeIPAddressThresholdDAO.UpdateThreshold(tx, threshold.Id, threshold.Items, threshold.Actions, order)
} else {
_, err = models.SharedNodeIPAddressThresholdDAO.CreateThreshold(tx, req.NodeIPAddressId, threshold.Items, threshold.Actions, order)
}
if err != nil {
return nil, err
}
}
return this.Success()
}