Commit d9090cdd authored by Yann Garcia's avatar Yann Garcia
Browse files

Update meep-vis server test scenarios

parent fca5681a

go-apps/meep-vis/sbi/vis-sbi.go

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ func Init(cfg SbiCfg) (err error) { 


	if predictionModelSupported {

		// Connect to VIS Traffic Manager

		sbi.trafficMgr, err = tm.NewTrafficMgr(sbi.moduleName, sbi.sandboxName, postgisUser, postgisPwd, "", "")

		sbi.trafficMgr, err = tm.NewTrafficMgr(sbi.moduleName, sbi.sandboxName, postgisUser, postgisPwd, cfg.PostgisHost, cfg.PostgisPort)

		if sbi.trafficMgr.GridFileExists {

			if err != nil {

				log.Error("Failed connection to VIS Traffic Manager: ", err)

go-apps/meep-vis/server/vis.go

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ var baseKey string 


var gisAppClient *gisClient.APIClient

var gisAppClientUrl string = "http://meep-gis-engine"

var postgisHost string = ""

var postgisPort string = ""



const serviceAppVersion = "2.1.1"
@@ -380,6 +382,8 @@ func Init() (err error) { 
		ModuleName:     moduleName,

		SandboxName:    sandboxName,

		RedisAddr:      redisAddr,

		PostgisHost:    postgisHost,

		PostgisPort:    postgisPort,

		Locality:       locality,

		ScenarioNameCb: updateStoreName,

		CleanUpCb:      cleanUp,

go-apps/meep-vis/server/vis_test.go

+53 −6
Original line number Diff line number Diff line 
package server



import (

    "os"

	"bytes"

	"encoding/json"

	"errors"
@@ -472,6 +473,8 @@ const testScenario string = ` 


const redisTestAddr = "localhost:30380"

const influxTestAddr = "http://localhost:30986"

const postgisTestHost = "localhost"

const postgisTestPort = "30432"

const testScenarioName = "testScenario"



var m *mod.Model
@@ -481,10 +484,51 @@ func TestNotImplemented(t *testing.T) { 
	fmt.Println("--- ", t.Name())

	log.MeepTextLogInit(t.Name())



	_, err := sendRequest(http.MethodGet, "/queries/uu_unicast_provisioning_info", nil, nil, nil, http.StatusNotImplemented, ProvInfoUuUnicastGET)

	_, err := sendRequest(http.MethodDelete, "/subscriptions/1", nil, nil, nil, http.StatusNotImplemented, IndividualSubscriptionDELETE)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodGet, "/subscriptions/1", nil, nil, nil, http.StatusNotImplemented, IndividualSubscriptionGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodPut, "/subscriptions/1", nil, nil, nil, http.StatusNotImplemented, IndividualSubscriptionPUT)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodGet, "/queries/pc5_provisioning_info", nil, nil, nil, http.StatusNotImplemented, ProvInfoGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodGet, "/queries/uu_mbms_provisioning_info", nil, nil, nil, http.StatusNotImplemented, ProvInfoUuMbmsGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodGet, "/queries/uu_unicast_provisioning_info", nil, nil, nil, http.StatusNotImplemented, ProvInfoUuUnicastGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodGet, "/subscriptions", nil, nil, nil, http.StatusNotImplemented, SubGET)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodPost, "/subscriptions", nil, nil, nil, http.StatusNotImplemented, SubPOST)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



	_, err = sendRequest(http.MethodPost, "/publish_v2x_message", nil, nil, nil, http.StatusNotImplemented, V2xMessagePOST)

	if err != nil {

		t.Fatalf("Failed to get expected response")

	}



}



func TestPredictedQosPost(t *testing.T) {
@@ -542,14 +586,14 @@ func TestPredictedQosPost(t *testing.T) { 
	// MEC-030 Clause 7.6.3.4

	pointA := LocationInfoGeoArea{43.733505, 7.413917}

	locationInfoA := LocationInfo{nil, &pointA}

	tsA := TimeStamp{0, 45}

	//tsA := TimeStamp{0, 45}

	pointB := LocationInfoGeoArea{43.733515, 7.413916}

	locationInfoB := LocationInfo{nil, &pointB}

	tsB := TimeStamp{0, 45}

	//tsB := TimeStamp{0, 45}

	// Fill PredictedQosRoutesRouteInfo with LocationInfo list

	routeInfo := make([]PredictedQosRoutesRouteInfo, 2)

	routeInfo[0] = PredictedQosRoutesRouteInfo{&locationInfoA, 0, 0, &tsA}

	routeInfo[1] = PredictedQosRoutesRouteInfo{&locationInfoB, 0, 0, &tsB}

	routeInfo[0] = PredictedQosRoutesRouteInfo{&locationInfoA, 0, 0, nil/*&tsA*/} // FIXME routeInfo.Time Not Supported yet

	routeInfo[1] = PredictedQosRoutesRouteInfo{&locationInfoB, 0, 0, nil/*&tsB*/} // FIXME routeInfo.Time Not Supported yet

	// PredictedQosRoutes with PredictedQosRoutesRouteInfo list

	predictedQosRoutes := PredictedQosRoutes{routeInfo}

	// Fill PredictedQos with PredictedQosRoutes list
@@ -594,7 +638,10 @@ func initializeVars() { 
	redisAddr = redisTestAddr

	influxAddr = influxTestAddr

	sandboxName = testScenarioName

}

    os.Setenv("MEEP_PREDICT_MODEL_SUPPORTED", "true")

	postgisHost = postgisTestHost

	postgisPort = postgisTestPort

	os.Setenv("MEEP_SANDBOX_NAME", testScenarioName)}



func initialiseScenario(testScenario string) {

	log.Info(">>> initialiseScenario")