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

Merge pull request #1876 from gravitl/story/GRA-793

Browse source 
consolidated add default hosts to net function
This commit is contained in:
dcarns 2022-12-27 11:03:52 -05:00 • committed by GitHub
commit 2df89c196a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
controllers/network.go
View file

@ -447,15 +447,9 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
event.Commands, err.Error()))
}
// add default hosts to network
defaultHosts := logic.GetDefaultHosts()
for i := range defaultHosts {
newNode := models.Node{}
newNode.Network = network.NetID
newNode.Server = servercfg.GetServer()
if err = logic.AssociateNodeToHost(&newNode, &defaultHosts[i]); err != nil {
logger.Log(0, "error occurred when adding network", network.NetID, "to host", defaultHosts[i].Name)
}
if err = logic.AddDefaultHostsToNetwork(network.NetID, servercfg.GetServer()); err != nil {
logger.Log(0, fmt.Sprintf("failed to add default hosts to network [%v]: %v",
network.NetID, err.Error()))
}
// TODO: Send message notifying host of new peers/network conf

15
logic/hosts.go
View file

@ -261,3 +261,18 @@ func GetDefaultHosts() []models.Host {
}
return defaultHostList[:]
}
// AddDefaultHostsToNetwork - adds a node to network for every default host on Netmaker server
func AddDefaultHostsToNetwork(network, server string) error {
// add default hosts to network
defaultHosts := GetDefaultHosts()
for i := range defaultHosts {
newNode := models.Node{}
newNode.Network = network
newNode.Server = server
if err := AssociateNodeToHost(&newNode, &defaultHosts[i]); err != nil {
return err
}
}
return nil
}