Added the golang client to our e2e testing

.github/workflows/public-ci.yml

@@ -54,8 +54,6 @@ jobs:
           sudo apt install -y llvm
           sudo apt install -y gcc-multilib
 
-
-
     - name: Run build
       run: make build
 
@@ -69,6 +67,9 @@ jobs:
       with:
         go-version: 1.19
 
+    - name: Install go modules
+      run: go get github.com/intel/afxdp-plugins-for-kubernetes/pkg/goclient
+
     - name: Install libbpf and libxdp
       run: | 
           sudo apt update 

Makefile

@@ -130,7 +130,7 @@ e2efull: build
 e2edaemon: image
 	@echo "******   E2E Daemonset   ******"
 	@echo
-	cd test/e2e/ && ./e2e-test.sh --daemonset
+	cd test/e2e/ && ./e2e-test.sh --daemonset --uds && ./e2e-test.sh --daemonset --golang
 	@echo
 	@echo
 

test/e2e/e2e-test.sh

@@ -20,6 +20,8 @@ ciWorkdir="./../../.github/e2e"
 run_dp="./../../bin/afxdp-dp"
 full_run=false
 daemonset=false
+daemonsetGo=false
+daemonsetUDS=false
 soak=false
 ci_run=false
 pids=( )
@@ -148,9 +150,15 @@ run_local_pods() {
 	echo
 	kubectl exec -i afxdp-e2e-test -- env
 	echo
-	echo "***** UDS Test *****"
-	echo
-	kubectl exec -i afxdp-e2e-test --container afxdp -- udsTest
+	if [ "$daemonsetUDS" = true ]; then
+		echo "***** UDS Test *****"
+		echo
+		kubectl exec -i afxdp-e2e-test --container afxdp -- udsTest uds
+	elif [ "$daemonsetGo" = true ]; then
+		echo "***** GO Library Test *****" 
+		echo
+		kubectl exec -i afxdp-e2e-test --container afxdp -- udsTest golang
+	fi
 	echo "***** Delete Pod *****"
 	kubectl delete pod --grace-period 0 --ignore-not-found=true afxdp-e2e-test &> /dev/null
 	if [ "$full_run" = true ]; then
@@ -375,6 +383,12 @@ then
 			-d|--daemonset)
 				daemonset=true
 			;;
+			-g|--golang)
+				daemonsetGo=true
+			;;
+			-u|--uds)
+				daemonsetUDS=true
+			;;
 			-c|--ci)
 				ci_run=true
 				daemonset=true

test/e2e/udsTest.go

@@ -16,12 +16,15 @@
 package main
 
 import (
-	"github.com/intel/afxdp-plugins-for-kubernetes/constants"
-	"github.com/intel/afxdp-plugins-for-kubernetes/internal/uds"
+	"fmt"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/intel/afxdp-plugins-for-kubernetes/constants"
+	"github.com/intel/afxdp-plugins-for-kubernetes/internal/uds"
+	"github.com/intel/afxdp-plugins-for-kubernetes/pkg/goclient"
 )
 
 const (
@@ -33,6 +36,44 @@ const (
 var udsHandler uds.Handler
 
 func main() {
+	if os.Args[1] == "uds" {
+		udsTest()
+	} else if os.Args[1] == "golang" {
+		clientTest()
+	} else {
+		println("Unrecognized testing parameters.")
+	}
+}
+
+func timeout() {
+	println("Test App - Pausing for", timeoutDuration, "seconds to force timeout")
+	println("Test App - Expecting timeout error to occur")
+	time.Sleep(timeoutDuration * time.Second)
+	println("Test App - Exiting")
+	os.Exit(0)
+}
+
+func makeRequest(request string) {
+	println()
+	println("Test App - Request: " + request)
+
+	if err := udsHandler.Write(request, -1); err != nil {
+		println("Test App - Write error: ", err)
+	}
+
+	response, fd, err := udsHandler.Read()
+	if err != nil {
+		println("Test App - Read error: ", err)
+	}
+
+	println("Test App - Response: " + response)
+	if fd > 0 {
+		println("Test App - File Descriptor:", strconv.Itoa(fd))
+	}
+	println()
+}
+
+func udsTest() {
 	timeoutAfterConnect := false
 	timeoutBeforeConnect := false
 	// Command line argument to set timeout test
@@ -80,7 +121,6 @@ func main() {
 		cleanup()
 		os.Exit(1)
 	}
-	defer cleanup()
 
 	// connect and verify pod hostname
 	makeRequest("/connect, " + hostname)
@@ -114,32 +154,53 @@ func main() {
 	// finish
 	makeRequest("/fin")
 	time.Sleep(requestDelay)
+	cleanup()
 }
 
-func timeout() {
-	println("Test App - Pausing for", timeoutDuration, "seconds to force timeout")
-	println("Test App - Expecting timeout error to occur")
-	time.Sleep(timeoutDuration * time.Second)
-	println("Test App - Exiting")
-	os.Exit(0)
-}
+func clientTest() {
 
-func makeRequest(request string) {
-	println()
-	println("Test App - Request: " + request)
+	var clean2 uds.CleanupFunc
+	var fd int
 
-	if err := udsHandler.Write(request, -1); err != nil {
-		println("Test App - Write error: ", err)
+	//Get environment variable device values
+	devicesVar, exists := os.LookupEnv(constants.Devices.EnvVarList)
+	if !exists {
+		println("Test App Error: Devices env var does not exist")
+		os.Exit(1)
 	}
+	devices := strings.Split(devicesVar, " ")
 
-	response, fd, err := udsHandler.Read()
-	if err != nil {
-		println("Test App - Read error: ", err)
+	// Request Client Version
+	println("GO Library: Requesting client version from GO library")
+	ver := goclient.GetClientVersion()
+	fmt.Printf("GO Library: Client Version: %s \n \n", ver)
+	time.Sleep(requestDelay)
+
+	// Request Server Version
+	println("GO Library: Requesting server version from GO library")
+	ver, clean1, _ := goclient.GetServerVersion()
+	fmt.Printf("GO Library: Server Version: %s \n \n", ver)
+	time.Sleep(requestDelay)
+
+	// Request XSK map FD for all devices
+	println("GO Library: Requesting XSK map FD")
+	for _, dev := range devices {
+		fd, clean2, _ = goclient.RequestXSKmapFD(dev)
+		fmt.Printf("GO Library: XSK map FD request succeded for %s with fd %d \n \n", dev, fd)
+		// time.Sleep(requestDelay)
 	}
+	time.Sleep(requestDelay)
 
-	println("Test App - Response: " + response)
-	if fd > 0 {
-		println("Test App - File Descriptor:", strconv.Itoa(fd))
+	// Request XSK map FD for an unknown device
+	println("GO Library: Request XSk map FD for an unknown device")
+	fd, clean3, err := goclient.RequestXSKmapFD("bad-device")
+	if err != nil {
+		fmt.Printf("GO Library: Returned value from unknown device: %d \n \n", fd)
 	}
-	println()
+	time.Sleep(requestDelay)
+
+	println("Cleaning up... \n")
+	clean1()
+	clean2()
+	clean3()
 }