From 875718d8243f3a3d4da23472cd307fcfb83ba8ea Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Tue, 27 Dec 2022 10:15:00 -0500
Subject: [PATCH] consolidated add default hosts to net function

---
 controllers/network.go | 12 +++---------
 logic/hosts.go         | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/controllers/network.go b/controllers/network.go
index de3004c8..a5dcf9f2 100644
--- a/controllers/network.go
+++ b/controllers/network.go
@@ -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
diff --git a/logic/hosts.go b/logic/hosts.go
index df834adf..283dd9bf 100644
--- a/logic/hosts.go
+++ b/logic/hosts.go
@@ -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
+}