gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-25 00:24:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed node count err

Browse source
This commit is contained in:
worker-9 2021-08-05 13:03:05 -04:00
parent f5c4258a55
commit 8337daf007
2 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
controllers/networkHttpController.go
View file

@ -354,16 +354,11 @@ func deleteNetwork(w http.ResponseWriter, r *http.Request) {
}
func DeleteNetwork(network string) error {
nodecount, err := functions.GetNetworkNodeNumber(network)
if err != nil {
return err
} else if nodecount > 0 {
return errors.New("node check failed. All nodes must be deleted before deleting network")
_, err := database.FetchRecords(database.NODES_TABLE_NAME)
if database.IsEmptyRecord(err) {
return database.DeleteRecord(database.NETWORKS_TABLE_NAME, network)
}
database.DeleteRecord(database.NETWORKS_TABLE_NAME, network)
return err
return errors.New("node check failed. All nodes must be deleted before deleting network")
}
//Create a network

21
functions/helpers.go
View file

@ -323,27 +323,6 @@ func IsMacAddressUnique(macaddress string, networkName string) (bool, error) {
return true, nil
}
func GetNetworkNodeNumber(networkName string) (int, error) {
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
count := 0
if err != nil {
return count, err
}
for _, value := range collection {
var node models.Node
if err = json.Unmarshal([]byte(value), &node); err != nil {
return count, err
} else {
if node.Network == networkName {
count++
}
}
}
return count, nil
}
//Checks to see if access key is valid
//Does so by checking against all keys and seeing if any have the same value
//may want to hash values before comparing...consider this