Merge pull request #1871 from gravitl/GRA-824-ip-assigment

update IsIPUnique

controllers/node.go

@@ -17,7 +17,6 @@ import (
 	"github.com/gravitl/netmaker/models/promodels"
 	"github.com/gravitl/netmaker/mq"
 	"github.com/gravitl/netmaker/servercfg"
-	"github.com/kr/pretty"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -661,8 +660,6 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	data.Node.Peers = peerUpdate.Peers
-	pretty.Println(data.Node.Peers)
-
 	// Create client for this host in Mq
 	event := mq.MqDynsecPayload{
 		Commands: []mq.MqDynSecCmd{
@@ -706,13 +703,6 @@ func createNode(w http.ResponseWriter, r *http.Request) {
 		ServerConfig: server,
 		PeerIDs:      peerUpdate.PeerIDs,
 	}
-
-	//host, newNode := node.ConvertToNewNode()
-
-	logic.UpsertHost(&data.Host)
-	//logic.CreateNode()
-	//logic.SaveNode(data.Node)
-
 	logger.Log(1, r.Header.Get("user"), "created new node", data.Host.Name, "on network", networkName)
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(response)

logic/networks.go

@@ -222,11 +222,11 @@ func IsIPUnique(network string, ip string, tableName string, isIpv6 bool) bool {
 			continue
 		}
 		if isIpv6 {
-			if node.Address6.String() == ip && node.Network == network {
+			if node.Address6.IP.String() == ip && node.Network == network {
 				return false
 			}
 		} else {
-			if node.Address.String() == ip && node.Network == network {
+			if node.Address.IP.String() == ip && node.Network == network {
 				return false
 			}
 		}

logic/nodes.go

@@ -570,7 +570,6 @@ func createNode(node *models.Node) error {
 	} else if !IsIPUnique(node.Network, node.Address.String(), database.NODES_TABLE_NAME, false) {
 		return fmt.Errorf("invalid address: ipv4 " + node.Address.String() + " is not unique")
 	}
-
 	if node.Address6.IP == nil {
 		if parentNetwork.IsIPv6 == "yes" {
 			if node.Address6.IP, err = UniqueAddress6(node.Network, false); err != nil {
@@ -585,7 +584,6 @@ func createNode(node *models.Node) error {
 	} else if !IsIPUnique(node.Network, node.Address6.String(), database.NODES_TABLE_NAME, true) {
 		return fmt.Errorf("invalid address: ipv6 " + node.Address6.String() + " is not unique")
 	}
-
 	node.ID = uuid.New()
 	//Create a JWT for the node
 	tokenString, _ := CreateJWT(node.ID.String(), host.MacAddress.String(), node.Network)

logic/peers.go

@@ -921,11 +921,6 @@ func getEgressIPs(node, peer *models.Node) []net.IPNet {
 
 func getNodeAllowedIPs(peer, node *models.Node) []net.IPNet {
 	var allowedips = []net.IPNet{}
-	host, err := GetHost(node.HostID.String())
-	if err != nil {
-		logger.Log(0, "error retrieving host for node", node.ID.String(), err.Error())
-	}
-
 	if peer.Address.IP != nil {
 		allowedips = append(allowedips, peer.Address)
 	}