From 6643c9a4013db03f7f840ba038cf29f69e92c7ea Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Mon, 13 Feb 2023 15:17:13 -0500
Subject: [PATCH] adapt createNetwork + default host addition

---
 controllers/network.go |  5 -----
 logic/hosts.go         | 16 +---------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/controllers/network.go b/controllers/network.go
index 40a6fd02..bed8dbd0 100644
--- a/controllers/network.go
+++ b/controllers/network.go
@@ -403,11 +403,6 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	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()))
-	}
-
 	defaultHosts := logic.GetDefaultHosts()
 	for i := range defaultHosts {
 		currHost := &defaultHosts[i]
diff --git a/logic/hosts.go b/logic/hosts.go
index 4fb349ed..f6d14391 100644
--- a/logic/hosts.go
+++ b/logic/hosts.go
@@ -216,6 +216,7 @@ func UpdateHostNetwork(h *models.Host, network string, add bool) (*models.Node,
 		newNode := models.Node{}
 		newNode.Server = servercfg.GetServer()
 		newNode.Network = network
+		newNode.HostID = h.ID
 		if err := AssociateNodeToHost(&newNode, h); err != nil {
 			return nil, err
 		}
@@ -308,21 +309,6 @@ 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
-}
-
 // GetHostNetworks - fetches all the networks
 func GetHostNetworks(hostID string) []string {
 	currHost, err := GetHost(hostID)