Merge pull request #18 from nokia/dev-remove-ovs-python-script

Use go functions to control OVS via cmdline

Author: Billy99

Diff for: Makefile

@@ -24,7 +24,7 @@ endif
 
 # Building the cnivpp subfolder requires VPP to be installed, or at least a
 # handful of files in the proper installed location. VPPINSTALLED indicates
-# if required VPP files are installed. 
+# if required VPP files are installed.
 # For 'make clean', VPPLCLINSTALLED indicates if 'make install' installed
 # the minimum set of files or if VPP is actually installed.
 ifeq ($(shell test -e $(VPPLIBDIR)/libvppapiclient.so && echo -n yes),yes)
@@ -39,15 +39,6 @@ else
 	VPPLCLINSTALLED=0
 endif
 
-#
-# OVS Variables
-#
-ifeq ($(shell test -e /usr/share/openvswitch/scripts/ovs-config.py && echo -n yes),yes)
-        OVS_PY_INSTALLED=1
-else
-        OVS_PY_INSTALLED=0
-endif
-
 
 # Default to build
 default: build
@@ -147,11 +138,6 @@ endif
 	@echo   Installed /usr/share/vpp/api/*.json
 	@rm -rf tmpvpp
 endif
-ifeq ($(OVS_PY_INSTALLED),0)
-	@echo OVS Python Script not installed. Installing now.
-	@$(SUDO) -E mkdir -p /usr/share/openvswitch/scripts/
-	@$(SUDO) -E cp ./cniovs/scripts/ovs-config.py /usr/share/openvswitch/scripts/.
-endif
 
 
 extras:
@@ -166,7 +152,7 @@ clean:
 	@rm -f cnivpp/test/memifAddDel/memifAddDel
 	@rm -f cnivpp/test/vhostUserAddDel/vhostUserAddDel
 	@rm -f cnivpp/test/ipAddDel/ipAddDel
-	@rm -f vendor/git.fd.io/govpp.git/cmd/binapi-generator/binapi-generator 
+	@rm -f vendor/git.fd.io/govpp.git/cmd/binapi-generator/binapi-generator
 	@rm -f userspace/userspace
 ifeq ($(VPPLCLINSTALLED),1)
 	@echo VPP was installed by *make install*, so cleaning up files.

Diff for: cniovs/cniovs/cniovs.go

@@ -29,7 +29,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -38,15 +37,14 @@ import (
 	"github.com/containernetworking/cni/pkg/types/current"
 
 	"github.com/intel/userspace-cni-network-plugin/cniovs/ovsdb"
-	"github.com/intel/userspace-cni-network-plugin/usrsptypes"
 	"github.com/intel/userspace-cni-network-plugin/logging"
+	"github.com/intel/userspace-cni-network-plugin/usrsptypes"
 )
 
 //
 // Constants
 //
 const defaultCNIDir = "/var/lib/cni/vhostuser"
-const defaultOvsScript = "/usr/share/openvswitch/scripts/ovs-config.py"
 
 //
 // Types
@@ -144,11 +142,6 @@ func (cniOvs CniOvs) DelFromContainer(conf *usrsptypes.NetConf, args *skel.CmdAr
 // Utility Functions
 //
 
-// execCommand Execute shell commands and return the output.
-func execCommand(cmd string, args []string) ([]byte, error) {
-	return exec.Command(cmd, args...).Output()
-}
-
 func generateRandomMacAddress() string {
 	buf := make([]byte, 6)
 	if _, err := rand.Read(buf); err != nil {
@@ -178,16 +171,10 @@ func addLocalDeviceVhost(conf *usrsptypes.NetConf, args *skel.CmdArgs, data *ovs
 		}
 	}
 
-	sockPath := filepath.Join(sockDir, sockRef)
-
 	// ovs-vsctl add-port
-	cmd_args := []string{"create", sockPath}
-	if output, err := execCommand(defaultOvsScript, cmd_args); err == nil {
-		vhostName := strings.Replace(string(output), "\n", "", -1)
-
-		cmd_args = []string{"getmac", vhostName}
-		if output, err := execCommand(defaultCNIDir, cmd_args); err == nil {
-			data.VhostMac = strings.Replace(string(output), "\n", "", -1)
+	if vhostName, err := createVhostPort(sockDir, sockRef); err == nil {
+		if vhostPortMac, err := getVhostPortMac(vhostName); err == nil {
+			data.VhostMac = vhostPortMac
 		}
 
 		data.Vhostname = vhostName
@@ -200,8 +187,7 @@ func addLocalDeviceVhost(conf *usrsptypes.NetConf, args *skel.CmdArgs, data *ovs
 func delLocalDeviceVhost(conf *usrsptypes.NetConf, args *skel.CmdArgs, data *ovsdb.OvsSavedData) error {
 
 	// ovs-vsctl --if-exists del-port
-	cmd_args := []string{"delete", data.Vhostname}
-	if _, err := execCommand(defaultOvsScript, cmd_args); err == nil {
+	if err := deleteVhostPort(data.Vhostname); err == nil {
 		path := filepath.Join(defaultCNIDir, args.ContainerID)
 
 		folder, err := os.Open(path)

Diff for: cniovs/cniovs/ovsctrl.go

@@ -0,0 +1,46 @@
+package cniovs
+
+import (
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func execCommand(cmd string, args []string) ([]byte, error) {
+	return exec.Command(cmd, args...).Output()
+}
+
+/*
+Functions to control OVS by using the ovs-vsctl cmdline client.
+*/
+
+func createVhostPort(sock_dir string, sock_name string) (string, error) {
+	// Create socket
+	cmd := "ovs-vsctl"
+	args := []string{"add-port", "br0", sock_name, "--", "set", "Interface", sock_name, "type=dpdkvhostuser"}
+	if _, err := execCommand(cmd, args); err != nil {
+		return "", err
+	}
+
+	// Move socket to defined dir for easier mounting
+	return sock_name, os.Rename(
+		"/usr/local/var/run/openvswitch/"+sock_name,
+		sock_dir+"/"+sock_name)
+}
+
+func deleteVhostPort(sock_name string) error {
+	cmd := "ovs-vsctl"
+	args := []string{"--if-exists", "del-port", "br0", sock_name}
+	_, err := execCommand(cmd, args)
+	return err
+}
+
+func getVhostPortMac(sock_name string) (string, error) {
+	cmd := "ovs-vsctl"
+	args := []string{"--bare", "--columns=mac", "find", "port", "name=" + sock_name}
+	if mac_b, err := execCommand(cmd, args); err != nil {
+		return "", err
+	} else {
+		return strings.Replace(string(mac_b), "\n", "", -1), nil
+	}
+}