Fix the routine to update network metadata

Author: Fawad Khaliq

plugin/driver/driver.go

@@ -139,8 +139,7 @@ func (driver *driver) createNetwork(w http.ResponseWriter, r *http.Request) {
 	neName := create.Options[netlabel.GenericData].(map[string]interface{})["bridge"]
 
 	if neName != nil {
-		neID := GetNeId(neName.(string), domainid.(string))
-		AddNetworkInfo(create.NetworkID, neID)
+                AddNetworkInfo(create.NetworkID, neName.(string), domainid.(string))
 		AddGatewayInfo(create.NetworkID, domainid.(string), gatewayip)
 		emptyResponse(w)
 

plugin/driver/pg_helper.go

@@ -77,25 +77,24 @@ func BridgeDelete(ID string, domainid string) {
 	RestCall("DELETE", url, nil)
 }
 
-func AddNetworkInfo(dNetwork string, neID string) {
-
-	url := "/0/connectivity/domain?configonly=true&level=3"
-	body, _ := RestCall("GET", url, nil)
-	var domain_data map[string]interface{}
-	err := json.Unmarshal([]byte(body), &domain_data)
-	if err != nil {
-		panic(err)
-	}
-	for domains, domain_val := range domain_data {
-		if nes, ok := domain_val.(map[string]interface{})["ne"]; ok {
-			if ne, ok := nes.(map[string]interface{})[neID]; ok {
-				ne.(map[string]interface{})["metadata"] = dNetwork
-				ne_data, _ := json.Marshal(ne)
-				RestCall("PUT", "/0/connectivity/domain/"+domains+"/ne/"+neID, ne_data)
-				break
-			}
-		}
-	}
+func AddNetworkInfo(dNetwork string, neName string, domain string) {
+        id := GetNeId(neName, domain)
+        var neId string
+        if id == "" {
+            neId = neName
+        } else {
+            neId = id
+        }
+        url := "/0/connectivity/domain/" + domain + "/ne/" + neId
+        body, _ := RestCall("GET", url+"?configonly=true", nil)
+        var netData map[string]interface{}
+        err := json.Unmarshal([]byte(body), &netData)
+        if err != nil {
+                panic(err)
+        }
+        netData["metadata"] = dNetwork
+        finalData, _ := json.Marshal(netData)
+        RestCall("PUT", url, finalData)
 }
 
 func FindDomainFromNetwork(ID string) (domainid string, netid string) {
@@ -222,20 +221,20 @@ func DomainDelete(domainID string) {
 
 func GetNeId(NeName string, DomainID string) (NeID string) {
 
-	url := "/0/connectivity/domain/" + DomainID + "/ne?configonly=true&level=1"
-	body, _ := RestCall("GET", url, nil)
-	var ne_data map[string]interface{}
-	err := json.Unmarshal([]byte(body), &ne_data)
-	if err != nil {
-		panic(err)
-	}
-	for nes, ne_val := range ne_data {
-		if ne_val.(map[string]interface{})["ne_dname"] == NeName {
-			NeID = nes
-			break
-		}
-	}
-	return
+        url := "/0/connectivity/domain/" + DomainID + "/ne?configonly=true&level=1"
+        body, _ := RestCall("GET", url, nil)
+        var ne_data map[string]interface{}
+        err := json.Unmarshal([]byte(body), &ne_data)
+        if err != nil {
+                panic(err)
+        }
+        for nes, ne_val := range ne_data {
+                if ne_val.(map[string]interface{})["ne_dname"] == NeName {
+                        NeID = nes
+                        return NeID
+                }
+        }
+        return ""
 }
 
 func CreateNetworkLink(NeName string, DomainID string, NetworkID string, IP string, Netmask string) {