changing private to local for clarity

controllers/networkHttpController.go

@@ -111,8 +111,8 @@ func validateNetwork(operation string, network models.Network) error {
                 return isvalid
         })
 
-        _ = v.RegisterValidation("privaterange_valid", func(fl validator.FieldLevel) bool {
-                isvalid := !*network.IsPrivate || functions.IsIpv4CIDR(fl.Field().String())
+        _ = v.RegisterValidation("localrange_valid", func(fl validator.FieldLevel) bool {
+                isvalid := !*network.IsLocal || functions.IsIpv4CIDR(fl.Field().String())
                 return isvalid
         })
 
@@ -269,7 +269,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 
 	haschange := false
 	hasrangeupdate := false
-	hasprivaterangeupdate := false
+	haslocalrangeupdate := false
 
 	_ = json.NewDecoder(r.Body).Decode(&networkChange)
 
@@ -304,20 +304,20 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 	     hasrangeupdate = true
 
         }
-	if networkChange.PrivateRange != "" {
-            network.PrivateRange = networkChange.PrivateRange
+	if networkChange.LocalRange != "" {
+            network.LocalRange = networkChange.LocalRange
 
-            var isAddressOK bool = functions.IsIpv4CIDR(networkChange.PrivateRange)
+            var isAddressOK bool = functions.IsIpv4CIDR(networkChange.LocalRange)
             if !isAddressOK {
-		    err := errors.New("Invalid Range of " +  networkChange.PrivateRange + " for internal addresses.")
+		    err := errors.New("Invalid Range of " +  networkChange.LocalRange + " for internal addresses.")
                     returnErrorResponse(w,r,formatError(err, "internal"))
                     return
             }
              haschange = true
-             hasprivaterangeupdate = true
+             haslocalrangeupdate = true
 	}
-	if networkChange.IsPrivate != nil {
-		network.IsPrivate = networkChange.IsPrivate
+	if networkChange.IsLocal != nil {
+		network.IsLocal = networkChange.IsLocal
 	}
 	if networkChange.DefaultListenPort != 0 {
 		network.DefaultListenPort = networkChange.DefaultListenPort
@@ -374,8 +374,8 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
                         {"nodeslastmodified", network.NodesLastModified},
                         {"networklastmodified", network.NetworkLastModified},
                         {"allowmanualsignup", network.AllowManualSignUp},
-                        {"privaterange", network.PrivateRange},
-                        {"isprivate", network.IsPrivate},
+                        {"localrange", network.LocalRange},
+                        {"islocal", network.IsLocal},
                         {"defaultcheckininterval", network.DefaultCheckInInterval},
 		}},
         }
@@ -397,7 +397,7 @@ func updateNetwork(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	if hasprivaterangeupdate {
+	if haslocalrangeupdate {
                 err = functions.UpdateNetworkPrivateAddresses(params["networkname"])
                 if err != nil {
                         returnErrorResponse(w,r,formatError(err, "internal"))
@@ -470,9 +470,9 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 
 	//TODO: Not really doing good validation here. Same as createNode, updateNode, and updateNetwork
 	//Need to implement some better validation across the board
-        if network.IsPrivate == nil {
+        if network.IsLocal == nil {
                 falsevar := false
-                network.IsPrivate = &falsevar
+                network.IsLocal = &falsevar
         }
 
         err = validateNetwork("create", network)
@@ -545,8 +545,8 @@ func createAccessKey(w http.ResponseWriter, r *http.Request) {
         }
 
 	privAddr := ""
-	if *network.IsPrivate {
-		privAddr = network.PrivateRange
+	if *network.IsLocal {
+		privAddr = network.LocalRange
 	}
 
 

go.mod

@@ -3,6 +3,7 @@ module github.com/gravitl/netmaker
 go 1.15
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/golang/protobuf v1.4.3

main.go

@@ -239,7 +239,7 @@ func createDefaultNetwork() (bool, error) {
         network.SetNetworkLastModified()
         network.KeyUpdateTimeStamp = time.Now().Unix()
 	priv := false
-	network.IsPrivate = &priv
+	network.IsLocal = &priv
         network.KeyUpdateTimeStamp = time.Now().Unix()
 	allow := true
 	network.AllowManualSignUp = &allow

models/network.go

@@ -24,8 +24,8 @@ type Network struct {
         DefaultSaveConfig      *bool `json:"defaultsaveconfig" bson:"defaultsaveconfig"`
 	AccessKeys	[]AccessKey `json:"accesskeys" bson:"accesskeys"`
 	AllowManualSignUp *bool `json:"allowmanualsignup" bson:"allowmanualsignup"`
-	IsPrivate *bool `json:"isprivate" bson:"isprivate"`
-	PrivateRange string `json:"privaterange" bson:"privaterange" validate:"privaterange_valid"`
+	IsLocal *bool `json:"islocal" bson:"islocal"`
+	LocalRange string `json:"localrange" bson:"localrange" validate:"localrange_valid"`
 	DefaultCheckInInterval int32 `json:"checkininterval,omitempty" bson:"checkininterval,omitempty" validate:"omitempty,numeric,min=1,max=100000"`
 }
 

netclient/functions/common.go

@@ -1,7 +1,7 @@
 package functions
 
 import (
-	//"github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 	"fmt"
 	"time"
 	"errors"
@@ -1244,17 +1244,24 @@ func getPeers(macaddress string, network string, server string) ([]wgtypes.PeerC
 
         stream, err := wcclient.GetPeers(ctx, req, grpc.Header(&header))
 	if err != nil {
-                return nil, err
+                fmt.Println("Error retrieving peers")
+                fmt.Println(err)
+		return nil, err
         }
-	fmt.Println("Parsing  peers response")
-        for {
-                // stream.Recv returns a pointer to a ListBlogRes at the current iteration
+	fmt.Println("Parsing peers response")
+	for {
 		res, err := stream.Recv()
                 // If end of stream, break the loop
 
+
 		if err == io.EOF {
-                        break
+                        fmt.Println("ERROR ENCOUNTERED WITH peer")
+                        fmt.Println(res)
+                        fmt.Println(err)
+			break
                 }
+			spew.Dump(res)
+
                 // if err, return an error
                 if err != nil {
 			if strings.Contains(err.Error(), "mongo: no documents in result") {