Commit 3ddc3063 authored by Simon Pastor's avatar Simon Pastor
Browse files

PR review

parent 3b5a1c8b

go-apps/meep-wais/go.mod

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ require ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-mq v0.0.0

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

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

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client v0.0.0-20200703133018-94138d8210a3 // indirect

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

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

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

go-apps/meep-wais/go.sum

+0 −2
Original line number Diff line number Diff line 
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client v0.0.0-20200703133018-94138d8210a3 h1:f2k7eru8oRpTqJ/Bkpx0BlWydVSDcay2KI0YvhebSEE=

github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-rnis-notification-client v0.0.0-20200703133018-94138d8210a3/go.mod h1:y0cVpzoLZ4Sid+BCf9k/dcBWYSxriGlkdyio/1FVbZ4=

github.com/KromDaniel/jonson v0.0.0-20180630143114-d2f9c3c389db/go.mod h1:RU+6d0CNIRSp6yo1mXLIIrnFa/3LHhvcDVLVJyovptM=

github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351 h1:1u1XrfCBnY+GijnyU6O1k4odp5TnqZQTsp5v7+n/E4Y=

github.com/KromDaniel/rejonson v0.0.0-20180822072824-00b5bcf2b351/go.mod h1:HxwfbuElTuGf+/uKZfjJrCnv0BmmpkPJDI7gBwj1KkM=

go-apps/meep-wais/sbi/wais-sbi.go

+0 −26
Original line number Diff line number Diff line
@@ -137,9 +137,6 @@ func msgHandler(msg *mq.Msg, userData interface{}) { 
	case mq.MsgScenarioTerminate:

		log.Debug("RX MSG: ", mq.PrintMsg(msg))

		processActiveScenarioTerminate()

	case mq.MsgGeUpdate:

		log.Debug("RX MSG: ", mq.PrintMsg(msg))

		processGisEngineUpdate(msg.Payload)

	default:

		log.Trace("Ignoring unsupported message: ", mq.PrintMsg(msg))

	}
@@ -223,29 +220,6 @@ func processActiveScenarioUpdate() { 
	}

}



func processGisEngineUpdate(assetMap map[string]string) {

	for assetName, assetType := range assetMap {

		// Only process UE updates

		// NOTE: WAIS might requires distance measurements in the future.

		//       Not yet implemented, the distance measurements are simply logged here for now.

		if assetType == postgis.TypeUe {

			if assetName == postgis.AllAssets {

				ueMap, err := sbi.pc.GetAllUe()

				if err == nil {

					for _, ue := range ueMap {

						log.Trace("UE[", ue.Name, "] POA [", ue.Poa, "] distance[", ue.PoaDistance, "]")

					}

				}

			} else {

				ue, err := sbi.pc.GetUe(assetName)

				if err == nil {

					log.Trace("UE[", ue.Name, "] POA [", ue.Poa, "] distance[", ue.PoaDistance, "]")

				}

			}

		}

	}

}



func parsePosition(position string) (longitude *float32, latitude *float32) {

	var point dataModel.Point

	err := json.Unmarshal([]byte(position), &point)

go-apps/meep-wais/server/wais_test.go

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ const UPDATED = 1 
//json format using spacing to facilitate reading

const testScenario string = `

{

   "version": "1.5.1",

   "version": "1.5.3",

   "name": "4g-5g-wifi-macro",

   "deployment": {

      "netChar": {