add support to launch containers onto pre-defined bridge

Author: msagheer

plugin/driver/driver.go

@@ -26,6 +26,7 @@ import (
 
 	Log "github.com/Sirupsen/logrus"
 	"github.com/docker/libnetwork/drivers/remote/api"
+	"github.com/docker/libnetwork/netlabel"
 	docker "github.com/fsouza/go-dockerclient"
 
 	"github.com/gorilla/mux"
@@ -128,13 +129,25 @@ func (driver *driver) createNetwork(w http.ResponseWriter, r *http.Request) {
 	}
 	Log.Infof("Create network request %+v", &create)
 
-	domainid := create.Options["com.docker.network.generic"].(map[string]interface{})["domain"]
+	domainid := create.Options[netlabel.GenericData].(map[string]interface{})["domain"]
 	if domainid == nil {
 		domainid = default_vd
 	}
 	DomainCreate(domainid.(string))
-	router := create.Options["com.docker.network.generic"].(map[string]interface{})["router"]
+
 	gatewayip := create.IPv4Data[0].Gateway.IP.String()
+	neName := create.Options[netlabel.GenericData].(map[string]interface{})["bridge"]
+
+	if neName != nil {
+		neID := GetNeId(neName.(string), domainid.(string))
+		AddNetworkInfo(create.NetworkID, neID)
+		AddGatewayInfo(create.NetworkID, domainid.(string), gatewayip)
+		emptyResponse(w)
+
+		return
+	}
+
+	router := create.Options[netlabel.GenericData].(map[string]interface{})["router"]
 	BridgeCreate(create.NetworkID, domainid.(string), gatewayip)
 
 	if router != nil {
@@ -160,7 +173,7 @@ func (driver *driver) deleteNetwork(w http.ResponseWriter, r *http.Request) {
 	}
 	Log.Infof("Delete network request: %+v", &delete)
 
-	domainid := FindDomainFromNetwork(delete.NetworkID)
+	domainid, _ := FindDomainFromNetwork(delete.NetworkID)
 	if domainid == "" {
 		domainid = default_vd
 	}
@@ -229,7 +242,7 @@ func (driver *driver) joinEndpoint(w http.ResponseWriter, r *http.Request) {
 
 	netID := j.NetworkID
 	endID := j.EndpointID
-	domainid := FindDomainFromNetwork(netID)
+	domainid, bridgeID := FindDomainFromNetwork(netID)
 	if domainid == "" {
 		domainid = default_vd
 	}
@@ -270,7 +283,7 @@ func (driver *driver) joinEndpoint(w http.ResponseWriter, r *http.Request) {
 	Log.Infof("output of cmd: %+v\n", out1.String())
 
 	//second command {up the port on plumgrid}
-	cmdStr2 := "sudo /opt/pg/bin/ifc_ctl gateway ifup " + if_local_name + " access_container cont_" + endID[:2] + " " + mac[:17] + " pgtag2=bridge-" + netID[:10] + " pgtag1=" + domainid
+	cmdStr2 := "sudo /opt/pg/bin/ifc_ctl gateway ifup " + if_local_name + " access_container cont_" + endID[:2] + " " + mac[:17] + " pgtag2=" + bridgeID + " pgtag1=" + domainid
 	Log.Infof("third cmd: %s", cmdStr2)
 	cmd2 := exec.Command("/bin/sh", "-c", cmdStr2)
 	var out2 bytes.Buffer

plugin/driver/pg_helper.go

@@ -27,6 +27,7 @@ func BridgeCreate(ID string, domainid string, gatewayip string) {
 					"action_text": "create_and_link_ifc(DYN_1)"}
 				},
 				"ifc": {},
+				"metadata": "` + ID + `",
 				"mobility": "true",
 				"ne_description": "PLUMgrid Bridge",
 				"ne_dname": "net-` + ID[:10] + `",
@@ -45,7 +46,7 @@ func BridgeCreate(ID string, domainid string, gatewayip string) {
 						"rules` + ID + `": {
 							"add_context": "",
 							"criteria": "pgtag2",
-							"match": "bridge-` + ID[:10] + `"
+							"match": "bri` + ID + `"
 						}
 					}
 	}`)
@@ -57,6 +58,13 @@ func BridgeCreate(ID string, domainid string, gatewayip string) {
 	RestCall("PUT", url, data)
 }
 
+func AddGatewayInfo(ID string, domainid string, gatewayip string) {
+
+	url := "/0/connectivity/domain_prop/" + domainid + "/ne/brii" + ID
+	data := []byte(`{"ne_metadata": "` + gatewayip + `"}`)
+	RestCall("PUT", url, data)
+}
+
 func BridgeDelete(ID string, domainid string) {
 
 	url := "/0/connectivity/domain_prop/" + domainid + "/ne/brii" + ID
@@ -69,7 +77,7 @@ func BridgeDelete(ID string, domainid string) {
 	RestCall("DELETE", url, nil)
 }
 
-func FindDomainFromNetwork(ID string) (domainid string) {
+func AddNetworkInfo(dNetwork string, neID string) {
 
 	url := "/0/connectivity/domain?configonly=true&level=3"
 	body, _ := RestCall("GET", url, nil)
@@ -80,12 +88,36 @@ func FindDomainFromNetwork(ID string) (domainid string) {
 	}
 	for domains, domain_val := range domain_data {
 		if nes, ok := domain_val.(map[string]interface{})["ne"]; ok {
-			if _, ok := nes.(map[string]interface{})["bri"+ID]; ok {
-				domainid = domains
+			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 FindDomainFromNetwork(ID string) (domainid string, netid 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 {
+			for ne, data := range nes.(map[string]interface{}) {
+				if data.(map[string]interface{})["metadata"] == ID {
+					domainid = domains
+					netid = ne
+					break
+				}
+			}
+		}
+	}
 	return
 }