Merge pull request #911 from gravitl/refactor_v0.12.1_send_network_on_create

send created network back in response to net create

controllers/network.go

@@ -326,7 +326,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = logic.CreateNetwork(network)
+	network, err = logic.CreateNetwork(network)
 	if err != nil {
 		returnErrorResponse(w, r, formatError(err, "badrequest"))
 		return
@@ -348,6 +348,7 @@ func createNetwork(w http.ResponseWriter, r *http.Request) {
 
 	logger.Log(1, r.Header.Get("user"), "created network", network.NetID)
 	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(network)
 }
 
 // BEGIN KEY MANAGEMENT SECTION

controllers/network_test.go

@@ -27,7 +27,7 @@ func TestCreateNetwork(t *testing.T) {
 	// if tests break - check here (removed displayname)
 	//network.DisplayName = "mynetwork"
 
-	err := logic.CreateNetwork(network)
+	_, err := logic.CreateNetwork(network)
 	assert.Nil(t, err)
 }
 func TestGetNetwork(t *testing.T) {

logic/networks.go

@@ -68,7 +68,7 @@ func DeleteNetwork(network string) error {
 }
 
 // CreateNetwork - creates a network in database
-func CreateNetwork(network models.Network) error {
+func CreateNetwork(network models.Network) (models.Network, error) {
 
 	network.SetDefaults()
 	network.SetNodesLastModified()
@@ -77,18 +77,18 @@ func CreateNetwork(network models.Network) error {
 	err := ValidateNetwork(&network, false)
 	if err != nil {
 		//returnErrorResponse(w, r, formatError(err, "badrequest"))
-		return err
+		return models.Network{}, err
 	}
 
 	data, err := json.Marshal(&network)
 	if err != nil {
-		return err
+		return models.Network{}, err
 	}
 	if err = database.Insert(network.NetID, string(data), database.NETWORKS_TABLE_NAME); err != nil {
-		return err
+		return models.Network{}, err
 	}
 
-	return err
+	return network, nil
 }
 
 // NetworkNodesUpdatePullChanges - tells nodes on network to pull

serverctl/serverctl.go

@@ -39,7 +39,8 @@ func InitializeCommsNetwork() error {
 		network.DefaultUDPHolePunch = "yes"
 		network.IsComms = "yes"
 		logger.Log(1, "comms net does not exist, creating with ID,", network.NetID, "and CIDR,", network.AddressRange)
-		return logic.CreateNetwork(network)
+		_, err = logic.CreateNetwork(network)
+		return err
 	}
 	time.Sleep(time.Second << 1)
 	SyncServerNetwork(COMMS_NETID)