Merge remote-tracking branch 'origin/master' into sagheer-dev

Conflicts:
	plugin/driver/driver.go

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"
@@ -212,7 +213,7 @@ func (driver *driver) createEndpoint(w http.ResponseWriter, r *http.Request) {
 	local := vethPair(endID[:5])
 	if err := netlink.LinkAdd(local); err != nil {
 		Log.Error(err)
-		errorResponse(w, "could not create veth pair")
+		errorResponsef(w, "could not create veth pair")
 		return
 	}
 	link, _ := netlink.LinkByName(local.PeerName)
@@ -283,15 +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`)
+		errorResponsef(w, `unable to bring veth up`)
 		return
 	}
 
@@ -324,11 +346,31 @@ 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")
-		return
 	}
 
 	RemoveMetaconfig(domainid, bridgeID, l.EndpointID)

plugin/driver/utils.go

@@ -36,7 +36,7 @@ func sendError(w http.ResponseWriter, msg string, code int) {
 	http.Error(w, msg, code)
 }
 
-func errorResponse(w http.ResponseWriter, fmtString string, item ...interface{}) {
+func errorResponsef(w http.ResponseWriter, fmtString string, item ...interface{}) {
 	json.NewEncoder(w).Encode(map[string]string{
 		"Err": fmt.Sprintf(fmtString, item...),
 	})