Merge pull request #60 from plumgrid/sagheer-dev

checks added for router & bridge options

Author: msagheer

plugin/driver/driver.go

@@ -15,18 +15,19 @@
 package driver
 
 import (
+	"bytes"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
+	"os/exec"
 
 	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/plumgrid/cli/helpers/plumgrid/ifc_ctl"
 
 	"github.com/gorilla/mux"
 	"github.com/vishvananda/netlink"
@@ -138,7 +139,12 @@ func (driver *driver) createNetwork(w http.ResponseWriter, r *http.Request) {
 	neName := create.Options[netlabel.GenericData].(map[string]interface{})["bridge"]
 
 	if neName != nil {
-		AddNetworkInfo(create.NetworkID, neName.(string), domainid.(string))
+		if err := AddNetworkInfo(create.NetworkID, neName.(string), domainid.(string)); err != nil {
+			Log.Error(err)
+			DomainDelete(domainid.(string))
+			errorResponse(w, fmt.Sprintf("Bridge (%s) doesnot exist in doamin (%s).", neName.(string), domainid.(string)))
+			return
+		}
 		AddGatewayInfo(create.NetworkID, domainid.(string), gatewayip)
 		emptyResponse(w)
 
@@ -154,7 +160,13 @@ func (driver *driver) createNetwork(w http.ResponseWriter, r *http.Request) {
 		tm, _ := hex.DecodeString(ipnet.Mask.String())
 		netmask := fmt.Sprintf("%v.%v.%v.%v", tm[0], tm[1], tm[2], tm[3])
 		Log.Infof("Adding router interface for : ", router, gatewayip, netmask)
-		CreateNetworkLink(router.(string), domainid.(string), create.NetworkID, gatewayip, netmask)
+		if err := CreateNetworkLink(router.(string), domainid.(string), create.NetworkID, gatewayip, netmask); err != nil {
+			Log.Error(err)
+			BridgeDelete(create.NetworkID, domainid.(string))
+			DomainDelete(domainid.(string))
+			errorResponse(w, fmt.Sprintf("Router (%s) doesnot exist in doamin (%s).", router.(string), domainid.(string)))
+			return
+		}
 	}
 
 	emptyResponse(w)
@@ -272,14 +284,36 @@ func (driver *driver) joinEndpoint(w http.ResponseWriter, r *http.Request) {
 	mac := link.Attrs().HardwareAddr.String()
 	Log.Infof("mac address: %s\n", mac)
 
-	// ifc_ctl interface up {Interface Name, Container ID, Domain ID, Bridge ID, MAC address, SE name}
-	if err := ifc_ctl.PgIfUp(if_local_name, "cont_"+endID[:8], domainid, bridgeID, mac, "gateway"); err != nil {
-		Log.Error(err)
+	cmdStr := "sudo /opt/pg/bin/ifc_ctl gateway add_port " + if_local_name
+	Log.Infof("addport cmd: %s", cmdStr)
+	cmd := exec.Command("/bin/sh", "-c", cmdStr)
+	var addport bytes.Buffer
+	cmd.Stdout = &addport
+	if err := cmd.Run(); err != nil {
+		Log.Error("Error thrown: ", err)
+	}
+	if addport.String() != "" {
+		Log.Error(fmt.Errorf(addport.String()))
+		errorResponse(w, "Unable to on-board container onto PLUMgrid")
+		return
+	}
+
+	cmdStr = "sudo /opt/pg/bin/ifc_ctl gateway ifup " + if_local_name + " access_container cont_" + endID[:8] + " " + mac + " pgtag2=" + bridgeID + " pgtag1=" + domainid
+	Log.Infof("ifup cmd: %s", cmdStr)
+	cmd = exec.Command("/bin/sh", "-c", cmdStr)
+	var ifup bytes.Buffer
+	cmd.Stdout = &ifup
+	if err := cmd.Run(); err != nil {
+		Log.Error("Error thrown: ", err)
+	}
+	if ifup.String() != "" {
+		Log.Error(fmt.Errorf(ifup.String()))
 		errorResponse(w, "Unable to on-board container onto PLUMgrid")
+		return
 	}
 
 	if netlink.LinkSetUp(local) != nil {
-		errorResponse(w, `unable to bring veth up`)
+		errorResponse(w, "unable to bring veth up")
 		return
 	}
 
@@ -312,9 +346,30 @@ func (driver *driver) leaveEndpoint(w http.ResponseWriter, r *http.Request) {
 
 	if_local_name := "tap" + l.EndpointID[:5]
 
-	// ifc_ctl interface down {Interface name, SE name}
-	if err := ifc_ctl.PgIfDown(if_local_name, "gateway"); err != nil {
-		Log.Error(err)
+	cmdStr := "sudo /opt/pg/bin/ifc_ctl gateway ifdown " + if_local_name
+	Log.Infof("ifdown cmd: %s", cmdStr)
+	cmd := exec.Command("/bin/sh", "-c", cmdStr)
+	var ifdown bytes.Buffer
+	cmd.Stdout = &ifdown
+	if err := cmd.Run(); err != nil {
+		Log.Error("Error thrown: ", err)
+	}
+	if ifdown.String() != "" {
+		Log.Error(fmt.Errorf(ifdown.String()))
+		errorResponse(w, "Unable to off-board container from PLUMgrid")
+	}
+
+	cmdStr = "sudo /opt/pg/bin/ifc_ctl gateway del_port " + if_local_name
+	Log.Infof("delport cmd: %s", cmdStr)
+	cmd = exec.Command("/bin/sh", "-c", cmdStr)
+	var delport bytes.Buffer
+	cmd.Stdout = &delport
+	if err := cmd.Run(); err != nil {
+		Log.Error("Error thrown: ", err)
+	}
+	Log.Infof("output: %+v\n", delport.String())
+	if delport.String() != "" {
+		Log.Error(fmt.Errorf(delport.String()))
 		errorResponse(w, "Unable to off-board container from PLUMgrid")
 	}
 

plugin/driver/pg_helper.go

@@ -16,6 +16,7 @@ package driver
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 )
 
@@ -77,14 +78,19 @@ func BridgeDelete(ID string, domainid string) {
 	RestCall("DELETE", url, nil)
 }
 
-func AddNetworkInfo(dNetwork string, neName string, domain string) {
+func AddNetworkInfo(dNetwork string, neName string, domain string) error {
+
 	id := GetNeId(neName, domain)
 	var neId string
 	if id == "" {
 		neId = neName
 	} else {
 		neId = id
 	}
+	if !CheckNeExists(neId, domain) {
+		return fmt.Errorf("Bridge (%s) doesnot exist in doamin (%s).", neName, domain)
+	}
+
 	url := "/0/connectivity/domain/" + domain + "/ne/" + neId
 	body, _ := RestCall("GET", url+"?configonly=true", nil)
 	var netData map[string]interface{}
@@ -95,6 +101,8 @@ func AddNetworkInfo(dNetwork string, neName string, domain string) {
 	netData["metadata"] = dNetwork
 	finalData, _ := json.Marshal(netData)
 	RestCall("PUT", url, finalData)
+
+	return nil
 }
 
 func FindDomainFromNetwork(ID string) (domainid string, netid string) {
@@ -238,9 +246,13 @@ func GetNeId(NeName string, DomainID string) (NeID string) {
 	return ""
 }
 
-func CreateNetworkLink(NeName string, DomainID string, NetworkID string, IP string, Netmask string) {
+func CreateNetworkLink(NeName string, DomainID string, NetworkID string, IP string, Netmask string) error {
 
 	ne_ID := GetNeId(NeName, DomainID)
+	if !CheckNeExists(ne_ID, DomainID) {
+		return fmt.Errorf("Router (%s) doesnot exist in doamin (%s).", NeName, DomainID)
+	}
+
 	CheckNeChildList(ne_ID, DomainID, "ifc")
 	CheckNeChildList(NetworkName(NetworkID), DomainID, "ifc")
 	ne_ifc := NetworkID
@@ -271,6 +283,8 @@ func CreateNetworkLink(NeName string, DomainID string, NetworkID string, IP stri
                          "attachment1": "/ne/` + ne_ID + `/ifc/` + ne_ifc + `",
                          "attachment2": "/ne/` + NetworkName(NetworkID) + `/ifc/` + net_ifc + `"}`)
 	RestCall("PUT", url, data)
+
+	return nil
 }
 
 func DeleteNetworkLinks(DomainID string, NetworkID string) {
@@ -409,3 +423,23 @@ func DeleteAttachedLB(DomainID string, NetworkID string) {
 		}
 	}
 }
+
+func CheckNeExists(ne_name, domain string) bool {
+
+	url := "/0/connectivity/domain/" + domain + "/ne?configonly=true"
+
+	body, _ := RestCall("GET", url+"?configonly=true", nil)
+	var domain_data map[string]interface{}
+	err := json.Unmarshal([]byte(body), &domain_data)
+	if err != nil {
+		panic(err)
+	}
+
+	for ne, _ := range domain_data {
+		if ne_name == ne {
+			return true
+		}
+	}
+
+	return false
+}