merge loc-sev done, systemTest proper cleanup (dd19eeff) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

test/system/loc-serv_test.go

+515 −407

File changed.

Preview size limit exceeded, changes collapsed.

test/system/loc-serv_test.go2

deleted100644 → 0

+0 −1455

File deleted.

Preview size limit exceeded, changes collapsed.

test/system/system-test.yaml

0 → 100644

+594 −0

File added.

Preview size limit exceeded, changes collapsed.

test/system/systemTest.go

+198 −183

Original line number	Diff line number	Diff line
		package main

		import (
		"context"
		"errors"
		"io/ioutil"
		"net/http"
		"net/url"
		"os"
		"os/signal"
		"strconv"
		"strings"
		"syscall"
		"time"
		"errors"
		"context"
		"net/url"
		"strings"
		"io/ioutil"

		gisClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client"
		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		platformCtrlClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-platform-ctrl-client"
		sandboxCtrlClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client"
		rnisClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client"
		sandboxCtrlClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client"
		waisClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client"
		gisClient "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client"

		)

		var httpReqBody []string
		@@ -30,18 +30,24 @@ var waisAppClient *waisClient.APIClient
		var gisAppClient *gisClient.APIClient

		var sandboxName = "sandbox-system-test"
		var scenarioName = "scenario-system-test"
		var hostUrlStr = ""
		var httpListenerPort = "3333"
		var run = false

		const PASS = true
		const FAIL = false

		func resetHttpReqBody() {
		httpReqBody = []string{}
		}

		func printHttpReqBody() {
		for index, body := range httpReqBody {
		log.Info("Notification received: (" + strconv.Itoa(index) + "):" + body)
		}
		}

		func printHttpReqBodyByIndex(index int) {
		log.Info("Notification received: (" + strconv.Itoa(index) + "):" + httpReqBody[index])
		}

		func initialiseVars() {

		hostUrl, _ := url.Parse(strings.TrimSpace(os.Getenv("MEEP_HOST_TEST_URL")))
		@@ -194,17 +200,27 @@ func terminateScenario() error {
		return nil
		}

		func createBasics() {
		func createBasics() error {
		initialiseVars()
		log.Info("creating Clients")
		createClients()
		err := createClients()
		if err != nil {
		return err
		}
		log.Info("creating Sandbox")
		err := createSandbox(sandboxName)
		if err == nil {
		err = createSandbox(sandboxName)
		if err != nil {
		return err
		} else {
		time.Sleep(20000 * time.Millisecond)
		}
		log.Info("creating Sandbox Clients")
		createSandboxClients(sandboxName)
		err = createSandboxClients(sandboxName)
		if err != nil {
		clearBasics()
		return err
		}
		return nil
		}

		func clearBasics() {
		@@ -212,16 +228,22 @@ func clearBasics() {
		deleteSandbox(sandboxName)
		}

		func startSystemTest() {
		func startSystemTest() error {
		if !run {
		go main()
		createBasics()
		err := createBasics()
		if err != nil {
		run = false
		return err
		}
		}
		return nil
		}

		func stopSystemTest() {
		if run {
		clearBasics()
		run = false
		}
		}

		@@ -240,6 +262,10 @@ func main() {
		log.Info("Starting System Test")

		run = true
		//creating a server for graceful shutdown
		listenerPort := ":" + httpListenerPort
		server := &http.Server{Addr: listenerPort}

		go func() {
		sigchan := make(chan os.Signal, 10)
		signal.Notify(sigchan, syscall.SIGINT, syscall.SIGTERM)
		@@ -247,33 +273,23 @@ func main() {
		log.Info("Program killed !")
		// do last actions and wait for all write operations to end
		run = false
		}()

		go func() {
		// Initialize RNIS
		/*err := server.Init()
		//graceful server shutdown
		err := server.Shutdown(context.Background())
		if err != nil {
		log.Error("Failed to initialize RNI Service")
		run = false
		return
		log.Info("Error shuting down the server: ", err)
		}
		}()

		// Start RNIS Event Handler thread
		err = server.Run()
		if err != nil {
		log.Error("Failed to start RNI Service")
		run = false
		return
		}
		*/

		go func() {
		//create default route handler
		log.Fatal(http.ListenAndServe(":" + httpListenerPort, nil))
		if err := server.ListenAndServe(); err != http.ErrServerClosed {
		// Error starting or closing listener
		log.Fatal("HTTP server ListenAndServe: ", err)
		}
		//log.Fatal(http.ListenAndServe(":" + httpListenerPort, nil))
		run = false
		}()

		//createBasics()

		count := 0
		for {
		if !run {
		@@ -291,23 +307,23 @@ func geAutomationUpdate(mobility bool, movement bool, poasInRange bool, netCharU

		_, err := gisAppClient.AutomationApi.SetAutomationStateByName(context.TODO(), "MOBILITY", mobility)
		if err != nil {
		log.Error("Failed to communicatie with gis engine: ", err)
		log.Error("Failed to communicate with gis engine: ", err)
		return err
		}
		_, err = gisAppClient.AutomationApi.SetAutomationStateByName(context.TODO(), "MOVEMENT", movement)
		if err != nil {
		log.Error("Failed to communicatie with gis engine: ", err)
		log.Error("Failed to communicate with gis engine: ", err)
		return err
		}
		_, err = gisAppClient.AutomationApi.SetAutomationStateByName(context.TODO(), "POAS-IN-RANGE", poasInRange)
		if err != nil {
		log.Error("Failed to communicatie with gis engine: ", err)
		log.Error("Failed to communicate with gis engine: ", err)
		return err
		}

		_, err = gisAppClient.AutomationApi.SetAutomationStateByName(context.TODO(), "NETWORK-CHARACTERISTICS-UPDATE", netCharUpd)
		if err != nil {
		log.Error("Failed to communicatie with gis engine: ", err)
		log.Error("Failed to communicate with gis engine: ", err)
		return err
		}

		@@ -335,10 +351,9 @@ func geMoveAsset(assetName string, geoData gisClient.GeoDataAsset) error {

		_, err := gisAppClient.GeospatialDataApi.UpdateGeoDataByName(context.TODO(), assetName, geoData)
		if err != nil {
		log.Error("Failed to communicatie with gis engine: ", err)
		log.Error("Failed to communicate with gis engine: ", err)
		return err
		}

		return nil
		}

test/system/systemTest_test.go2

deleted100644 → 0

+0 −7035

File deleted.

Preview size limit exceeded, changes collapsed.