mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-19 15:15:17 +08:00
consolidated add default hosts to net function
This commit is contained in:
@@ -447,15 +447,9 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
|
|||||||
event.Commands, err.Error()))
|
event.Commands, err.Error()))
|
||||||
}
|
}
|
||||||
|
|
||||||
// add default hosts to network
|
if err = logic.AddDefaultHostsToNetwork(network.NetID, servercfg.GetServer()); err != nil {
|
||||||
defaultHosts := logic.GetDefaultHosts()
|
logger.Log(0, fmt.Sprintf("failed to add default hosts to network [%v]: %v",
|
||||||
for i := range defaultHosts {
|
network.NetID, err.Error()))
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Send message notifying host of new peers/network conf
|
// TODO: Send message notifying host of new peers/network conf
|
||||||
|
@@ -261,3 +261,18 @@ func GetDefaultHosts() []models.Host {
|
|||||||
}
|
}
|
||||||
return defaultHostList[:]
|
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
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user