gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2024-09-21 07:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

updated routes to use uuid

Browse source
This commit is contained in:
0xdcarns 2022-01-11 12:00:14 -05:00 committed by Matthew R Kasun
parent ff79860487
commit 73c982b9fa
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
logic/util.go
View file

@ -48,7 +48,7 @@ func DeleteNodeByMacAddress(node *models.Node, exterminate bool) error {
var key = node.ID
if !exterminate {
args := strings.Split(key, "###")
node, err := GetNode(args[0], args[1])
node, err := GetNodeByMacAddress(args[0], args[1])
if err != nil {
return err
}
@ -160,29 +160,29 @@ func SetNetworkNodesLastModified(networkName string) error {
return nil
}
// GetNode - fetches a node from database
func GetNode(macaddress string, network string) (models.Node, error) {
var node models.Node
// // GetNode - fetches a node from database
// func GetNode(macaddress string, network string) (models.Node, error) {
// var node models.Node
key, err := GetRecordKey(macaddress, network)
if err != nil {
return node, err
}
data, err := database.FetchRecord(database.NODES_TABLE_NAME, key)
if err != nil {
if data == "" {
data, _ = database.FetchRecord(database.DELETED_NODES_TABLE_NAME, key)
err = json.Unmarshal([]byte(data), &node)
}
return node, err
}
if err = json.Unmarshal([]byte(data), &node); err != nil {
return node, err
}
SetNodeDefaults(&node)
// key, err := GetRecordKey(macaddress, network)
// if err != nil {
// return node, err
// }
// data, err := database.FetchRecord(database.NODES_TABLE_NAME, key)
// if err != nil {
// if data == "" {
// data, _ = database.FetchRecord(database.DELETED_NODES_TABLE_NAME, key)
// err = json.Unmarshal([]byte(data), &node)
// }
// return node, err
// }
// if err = json.Unmarshal([]byte(data), &node); err != nil {
// return node, err
// }
// SetNodeDefaults(&node)
return node, err
}
// return node, err
// }
// DeleteNodeByID - deletes a node from database or moves into delete nodes table
func DeleteNodeByID(node *models.Node, exterminate bool) error {