Added platform and backend constants

Signed-off-by: Tobias Stocker <tstocker@student.ethz.ch>

Author: tostocker

cmd/loader.go

@@ -28,7 +28,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/vhive-serverless/loader/pkg/generator"
@@ -92,17 +91,16 @@ func main() {
 	}
 
 	supportedPlatforms := []string{
-		"Knative",
-		"OpenWhisk",
-		"AWSLambda",
-		"Dirigent",
+		common.PlatformKnative,
+		common.PlatformOpenWhisk,
+		common.PlatformAWSLambda,
+		common.PlatformDirigent,
 	}
-
 	if !slices.Contains(supportedPlatforms, cfg.Platform) {
 		log.Fatal("Unsupported platform!")
 	}
 
-	if cfg.Platform == "Knative" {
+	if cfg.Platform == common.PlatformKnative {
 		common.CheckCPULimit(cfg.CPULimit)
 	}
 
@@ -151,7 +149,7 @@ func parseYAMLSpecification(cfg *config.LoaderConfiguration) string {
 	case "firecracker":
 		return "workloads/firecracker/trace_func_go.yaml"
 	default:
-		if strings.ToLower(cfg.Platform) != "dirigent" {
+		if cfg.Platform == common.PlatformDirigent {
 			log.Fatal("Invalid 'YAMLSelector' parameter.")
 		}
 	}

pkg/common/constants.go

@@ -105,3 +105,16 @@ const (
 )
 
 var ValidCPULimits = []string{CPULimit1vCPU, CPULimitGCP}
+
+// platform
+const (
+	PlatformKnative   string = "knative"
+	PlatformDirigent  string = "dirigent"
+	PlatformOpenWhisk string = "openwhisk"
+	PlatformAWSLambda string = "awslambda"
+)
+
+// dirigent backend
+const (
+	BackendDandelion string = "dandelion"
+)

pkg/config/parser.go

@@ -26,7 +26,9 @@ package config
 
 import (
 	"encoding/json"
+	"github.com/vhive-serverless/loader/pkg/common"
 	"os"
+	"strings"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -127,6 +129,9 @@ func ReadConfigurationFile(path string) LoaderConfiguration {
 		log.Fatal(err)
 	}
 
+	// set to lower in order to always match constants
+	config.Platform = strings.ToLower(config.Platform)
+
 	return config
 }
 
@@ -164,7 +169,7 @@ func ReadWorkflowConfig(path string) WorkflowConfig {
 }
 
 func ReadDirigentConfig(cfg *LoaderConfiguration) *DirigentConfig {
-	if cfg.Platform != "Dirigent" {
+	if cfg.Platform != common.PlatformDirigent {
 		return nil
 	}
 

pkg/config/parser_test.go

@@ -26,6 +26,7 @@ package config
 
 import (
 	"fmt"
+	"github.com/vhive-serverless/loader/pkg/common"
 	"os"
 	"strings"
 	"testing"
@@ -45,7 +46,7 @@ func TestConfigParser(t *testing.T) {
 	config := ReadConfigurationFile(pathToConfigFile)
 
 	if config.Seed != 42 ||
-		config.Platform != "Knative" ||
+		config.Platform != common.PlatformKnative ||
 		config.YAMLSelector != "container" ||
 		config.EndpointPort != 80 ||
 		!strings.HasPrefix(config.TracePath, "data/traces/example") ||

pkg/driver/clients/grpc_client.go

@@ -137,7 +137,7 @@ func (i *grpcInvoker) Invoke(function *common.Function, runtimeSpec *common.Runt
 
 	var dialOptions []grpc.DialOption
 	dialOptions = append(dialOptions, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	if strings.Contains(strings.ToLower(i.cfg.Platform), "dirigent") {
+	if strings.Contains(i.cfg.Platform, common.PlatformDirigent) {
 		dialOptions = append(dialOptions, grpc.WithAuthority(function.Name)) // Dirigent specific
 	}
 	if i.cfg.EnableZipkinTracing {

pkg/driver/clients/grpc_client_test.go

@@ -42,7 +42,7 @@ import (
 
 func createFakeLoaderConfiguration() *config.LoaderConfiguration {
 	return &config.LoaderConfiguration{
-		Platform:                     "Knative",
+		Platform:                     common.PlatformKnative,
 		InvokeProtocol:               "grpc",
 		OutputPathPrefix:             "test",
 		EnableZipkinTracing:          true,
@@ -52,7 +52,7 @@ func createFakeLoaderConfiguration() *config.LoaderConfiguration {
 }
 func createFakeVSwarmLoaderConfiguration() *config.LoaderConfiguration {
 	return &config.LoaderConfiguration{
-		Platform:                     "Knative",
+		Platform:                     common.PlatformKnative,
 		InvokeProtocol:               "grpc",
 		OutputPathPrefix:             "test",
 		EnableZipkinTracing:          true,

pkg/driver/clients/http_client.go

@@ -44,8 +44,8 @@ func newHTTPInvoker(cfg *config.Configuration) *httpInvoker {
 		loaderCfg:   lcfg,
 		dirigentCfg: dcfg,
 
-		isKnative:   strings.Contains(strings.ToLower(lcfg.Platform), "knative"),
-		isDandelion: strings.Contains(strings.ToLower(dcfg.Backend), "dandelion"),
+		isKnative:   strings.Contains(strings.ToLower(lcfg.Platform), common.PlatformKnative),
+		isDandelion: strings.Contains(strings.ToLower(dcfg.Backend), common.BackendDandelion),
 		isWorkflow:  dcfg.Workflow,
 	}
 }

pkg/driver/clients/invoker.go

@@ -15,19 +15,19 @@ type Invoker interface {
 }
 
 func CreateInvoker(cfg *config.Configuration, announceDoneExe *sync.WaitGroup, readOpenWhiskMetadata *sync.Mutex) Invoker {
-	switch cfg.LoaderConfiguration.Platform {
-	case "AWSLambda":
+	switch strings.ToLower(cfg.LoaderConfiguration.Platform) {
+	case common.PlatformAWSLambda:
 		return newAWSLambdaInvoker(announceDoneExe)
-	case "Dirigent":
+	case common.PlatformDirigent:
 		if cfg.DirigentConfiguration == nil {
 			logrus.Fatal("Failed to create invoker: dirigent configuration is required for platform 'dirigent'")
 		}
-		if strings.ToLower(cfg.DirigentConfiguration.Backend) == "dandelion" || cfg.LoaderConfiguration.InvokeProtocol != "grpc" {
+		if strings.ToLower(cfg.DirigentConfiguration.Backend) == common.BackendDandelion || cfg.LoaderConfiguration.InvokeProtocol != "grpc" {
 			return newHTTPInvoker(cfg)
 		} else {
 			return newGRPCInvoker(cfg.LoaderConfiguration, ExecutorRPC{})
 		}
-	case "Knative":
+	case common.PlatformKnative:
 		if cfg.LoaderConfiguration.InvokeProtocol == "grpc" {
 			if !cfg.LoaderConfiguration.VSwarm {
 				return newGRPCInvoker(cfg.LoaderConfiguration, ExecutorRPC{})
@@ -37,7 +37,7 @@ func CreateInvoker(cfg *config.Configuration, announceDoneExe *sync.WaitGroup, r
 		} else {
 			return newHTTPInvoker(cfg)
 		}
-	case "OpenWhisk":
+	case common.PlatformOpenWhisk:
 		return newOpenWhiskInvoker(announceDoneExe, readOpenWhiskMetadata)
 	default:
 		logrus.Fatal("Unsupported platform.")

pkg/driver/deployment/deployer.go

@@ -2,6 +2,7 @@ package deployment
 
 import (
 	"github.com/sirupsen/logrus"
+	"github.com/vhive-serverless/loader/pkg/common"
 	"github.com/vhive-serverless/loader/pkg/config"
 )
 
@@ -12,13 +13,13 @@ type FunctionDeployer interface {
 
 func CreateDeployer(cfg *config.Configuration) FunctionDeployer {
 	switch cfg.LoaderConfiguration.Platform {
-	case "AWSLambda":
+	case common.PlatformAWSLambda:
 		return newAWSLambdaDeployer()
-	case "Dirigent":
-		return newDirigentDeployer(cfg.DirigentConfiguration.Workflow)
-	case "Knative":
+	case common.PlatformDirigent:
+		return newDirigentDeployer()
+	case common.PlatformKnative:
 		return newKnativeDeployer()
-	case "OpenWhisk":
+	case common.PlatformOpenWhisk:
 		return newOpenWhiskDeployer()
 	default:
 		logrus.Fatal("Unsupported platform.")

pkg/driver/deployment/dirigent.go

@@ -18,23 +18,21 @@ import (
 	"time"
 )
 
-type dirigentDeployer struct {
-	deployWorkflow bool
-}
+type dirigentDeployer struct{}
 
 type dirigentDeploymentConfiguration struct {
 	RegistrationServer string
+	deployWorkflow     bool
 }
 
-func newDirigentDeployer(deployWorkflow bool) *dirigentDeployer {
-	return &dirigentDeployer{
-		deployWorkflow: deployWorkflow,
-	}
+func newDirigentDeployer() *dirigentDeployer {
+	return &dirigentDeployer{}
 }
 
 func newDirigentDeployerConfiguration(cfg *config.Configuration) dirigentDeploymentConfiguration {
 	return dirigentDeploymentConfiguration{
 		RegistrationServer: cfg.DirigentConfiguration.DirigentControlPlaneIP,
+		deployWorkflow:     cfg.DirigentConfiguration.Workflow,
 	}
 }
 
@@ -43,7 +41,7 @@ func (d *dirigentDeployer) Deploy(cfg *config.Configuration) {
 
 	endpoint := ""
 
-	if d.deployWorkflow {
+	if dirigentDeployerConfig.deployWorkflow {
 		wfConfigPath := cfg.DirigentConfiguration.WorkflowConfigPath
 		if wfConfigPath == "" {
 			log.Fatalf("Failed to deploy workflow: no workflow config path specified in config file.")