code cleanup

Author: pfandzelter

Makefile

@@ -1,6 +1,7 @@
 PROJECT_NAME := "tinyFaaS"
 PKG := "github.com/OpenFogStack/$(PROJECT_NAME)"
 GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v /ext/ | grep -v _test.go)
+TEST_DIR := ./test
 
 .PHONY: all build start clean
 
@@ -11,9 +12,12 @@ build: manager rproxy
 manager rproxy: $(GO_FILES)
 	@go build -o $@ -v $(PKG)/cmd/$@
 
-start:
+start: manager rproxy
 	./manager
 
+test: build ${TEST_DIR}/test_all.py
+	@python3 ${TEST_DIR}/test_all.py
+
 clean:
 	@docker rm -f $$(docker ps -a -q --filter label=tinyFaaS) > /dev/null || true
 	@docker network rm $$(docker network ls -q --filter label=tinyFaaS) > /dev/null || true

cmd/manager/main.go

@@ -11,6 +11,7 @@ import (
 	"os/signal"
 	"strconv"
 
+	"github.com/OpenFogStack/tinyFaaS/pkg/docker"
 	"github.com/OpenFogStack/tinyFaaS/pkg/manager"
 	"github.com/google/uuid"
 )
@@ -62,21 +63,32 @@ func main() {
 		ports[p] = port
 	}
 
-	// create rproxy
-	// log.Println("starting rproxy")
-	// ms.startRProxy(RProxyListenAddress, RProxyConfigPort, rproxyPorts)
+	// setting backend to docker
+	id := uuid.New().String()
 
-	// start rproxy
-	log.Println("starting manager")
+	// find backend
+	backend, ok := os.LookupEnv("TF_BACKEND")
+
+	if !ok {
+		backend = "docker"
+		log.Println("using default backend docker")
+	}
+
+	var tfBackend manager.Backend
+	switch backend {
+	case "docker":
+		log.Println("using docker backend")
+		tfBackend = docker.New(id)
+	default:
+		log.Fatalf("invalid backend %s", backend)
+	}
 
-	// setting backend to docker
-	backend := "docker"
 	ms := manager.New(
-		uuid.New().String(),
+		id,
 		RProxyListenAddress,
 		ports,
 		RProxyConfigPort,
-		backend,
+		tfBackend,
 	)
 
 	rproxyArgs := []string{fmt.Sprintf("%s:%d", RProxyListenAddress, RProxyConfigPort)}
@@ -151,8 +163,8 @@ func main() {
 		}
 
 		// stop handlers
-		log.Println("stopping handlers")
-		err = ms.Wipe()
+		log.Println("stopping management service")
+		err = ms.Stop()
 
 		if err != nil {
 			log.Println(err)