zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 18:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactored logic for Hub change

Browse Source
This commit is contained in:
Matthew R Kasun
2022-06-21 15:19:54 +00:00
parent b8854e8fa5
commit 5aa2c16df1
6 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
logic/nodes.go
View File

@@ -121,13 +121,6 @@ func IsLeader(node *models.Node) bool {
// UpdateNode - takes a node and updates another node with it's values
func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
var err error
if newNode.IsHub == "yes" && currentNode.IsHub != "yes" {
if err = unsetHub(newNode.Network); err != nil {
return err
}
}
if newNode.Address != currentNode.Address {
if network, err := GetParentNetwork(newNode.Network); err == nil {
if !IsAddressInCIDR(newNode.Address, network.AddressRange) {
@@ -140,7 +133,6 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
if currentNode.IsServer == "yes" && !validateServer(currentNode, newNode) {
return fmt.Errorf("this operation is not supported on server nodes")
}
// check for un-settable server values
if err := ValidateNode(newNode, true); err != nil {
return err
@@ -381,6 +373,7 @@ func SetNodeDefaults(node *models.Node) {
//TODO: Maybe I should make Network a part of the node struct. Then we can just query the Network object for stuff.
parentNetwork, _ := GetNetworkByNode(node)
node.NetworkSettings = parentNetwork
node.ExpirationDateTime = time.Now().Unix() + models.TEN_YEARS_IN_SECONDS
@@ -619,25 +612,26 @@ func validateServer(currentNode, newNode *models.Node) bool {
}
// unsetHub - unset hub on network nodes
func unsetHub(networkName string) error {
func UnsetHub(networkName string) (*models.Node, error) {
var nodesToUpdate models.Node
nodes, err := GetNetworkNodes(networkName)
if err != nil {
return err
return &nodesToUpdate, err
}
for i := range nodes {
if nodes[i].IsHub == "yes" {
nodes[i].IsHub = "no"
nodesToUpdate = nodes[i]
newNodeData, err := json.Marshal(&nodes[i])
if err != nil {
logger.Log(1, "error on node during hub update")
return err
return &nodesToUpdate, err
}
database.Insert(nodes[i].ID, string(newNodeData), database.NODES_TABLE_NAME)
}
}
return nil
return &nodesToUpdate, nil
}
// FindRelay - returns the node that is the relay for a relayed node