Commit fe001038 authored by M. Rehan Abbasi's avatar M. Rehan Abbasi
Browse files

modify VIS system tests

parent aeaed2e0

test/system/go.mod

+6 −10
Original line number Diff line number Diff line
@@ -3,32 +3,28 @@ module github.com/InterDigitalInc/AdvantEDGE/test/system 
go 1.12



require (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger v0.0.0-00010101000000-000000000000

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-platform-ctrl-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client v0.0.0

        github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client v0.0.0

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client v0.0.0

	github.com/ghodss/yaml v1.0.0

	github.com/gorilla/handlers v1.4.0

	github.com/gorilla/mux v1.7.4

	golang.org/x/sys v0.0.0-20190412213103-97732733099d // indirect

	gopkg.in/yaml.v2 v2.2.2

)



replace (

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client => ../../go-packages/meep-app-support-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-gis-engine-client => ../../go-packages/meep-gis-engine-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-loc-serv-client => ../../go-packages/meep-loc-serv-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger => ../../go-packages/meep-logger

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-platform-ctrl-client => ../../go-packages/meep-platform-ctrl-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-client => ../../go-packages/meep-rnis-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client => ../../go-packages/meep-vis-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client => ../../go-packages/meep-wais-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client

        github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-app-support-client => ../../go-packages/meep-app-support-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client => ../../go-packages/meep-vis-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client => ../../go-packages/meep-wais-client

)

test/system/go.sum

+358 −5

File changed.

Preview size limit exceeded, changes collapsed.

test/system/vis_test.go

+26 −19
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ var visAppClient *visClient.APIClient 
var visServerUrl string



// MEC-030 Clause 6.2.5	Type: PredictedQos, replaced by inteface{} in models

type PredictedQosRoutesRouteInfo struct {

	LocationInfo visClient.LocationInfoGeoArea

	time         *visClient.TimeStamp

	rsrp         *int32

	rsrq         *int32

}



func init() {
@@ -99,22 +93,35 @@ func Test_VIS_periodic_4g_5gNei(t *testing.T) { 
	// Initialize the data structure for the POST request

	// MEC-030 Clause 6.2.5

	// MEC-030 Clause 7.6.3.4

	pointA := LocationInfoGeoArea{7.413917, 43.733505}

	locationInfoA := LocationInfo{nil, &pointA}

	tsA := TimeStamp{0, 45}

	pointB := LocationInfoGeoArea{7.413916, 43.733515}

	locationInfoB := LocationInfo{nil, &pointB}

	tsB := TimeStamp{0, 45}

	pointA := visClient.LocationInfoGeoArea{Longitude: 7.413917, Latitude: 43.733505}

	locationInfoA := visClient.LocationInfo{GeoArea: &pointA}

	tsA := visClient.TimeStamp{NanoSeconds: 0, Seconds: 45}

	pointB := visClient.LocationInfoGeoArea{Longitude: 7.413916, Latitude: 43.733515}

	locationInfoB := visClient.LocationInfo{GeoArea: &pointB}

	tsB := visClient.TimeStamp{NanoSeconds: 0, Seconds: 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 := make([]visClient.PredictedQosRoutesRouteInfo, 2)

	routeInfo[0] = visClient.PredictedQosRoutesRouteInfo{

		Location: &locationInfoA,

		Rsrq:     0,

		Rsrp:     0,

		Time:     &tsA,

	}

	routeInfo[1] = visClient.PredictedQosRoutesRouteInfo{

		Location: &locationInfoB,

		Rsrq:     0,

		Rsrp:     0,

		Time:     &tsB,

	}

	// PredictedQosRoutes with PredictedQosRoutesRouteInfo list

	predictedQosRoutes := PredictedQosRoutes{routeInfo}

	predictedQosRoutes := visClient.PredictedQosRoutes{RouteInfo: routeInfo}

	// Fill PredictedQos with PredictedQosRoutes list

	routes := make([]PredictedQosRoutes, 1)

	routes := make([]visClient.PredictedQosRoutes, 1)

	routes[0] = predictedQosRoutes

	testPredictedQos := PredictedQos{"100", routes, nil}

	testPredictedQos := visClient.PredictedQos{

		LocationGranularity: "100",

		Routes:              routes,

	}

	fmt.Println("testPredictedQos: ", testPredictedQos)



	// Moving to initial position
@@ -152,7 +159,7 @@ func Test_VIS_periodic_4g_5gNei(t *testing.T) { 
func visPeriodicSubPOST(testPredictedQos visClient.PredictedQos) error {



	//PredictedQosPOST(ctx context.Context, body PredictedQos) (PredictedQos, *http.Response, error)

	_, _, err := visAppClient.QoSApi.PredictedQosPOST(context.TODO(), testPredictedQos)

	_, _, err := visAppClient.V2xiApi.PredictedQosPOST(context.TODO(), testPredictedQos)

	if err != nil {

		log.Error("Failed to send subscription: ", err)

		return err