Merge branch 'STF_685' into 'STF_707_TASK3' (3fa82504) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

charts/platform-core/meep-platform-ctrl/values.yaml

+3 −0

Changes for charts/platform-core/meep-platform-ctrl/values.yaml: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -31,6 +31,9 @@ image:
		pullPolicy: Always
		env:
		MEEP_SVC_PATH: /platform-ctrl/v1
		MEEP_NW_SIMULATOR_TYPE: internal
		MEEP_NEM_URL: ""
		MEEP_NEM_TIMEOUT_MS: "3000"
		envSecret:

		service:

charts/platform-core/meep-sandbox-api/values.yaml

+3 −0

Changes for charts/platform-core/meep-sandbox-api/values.yaml: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -34,6 +34,9 @@ image:
		MEEP_OAUTH_GITHUB_ENABLED: ""
		MEEP_OAUTH_GITHUB_AUTH_URL: ""
		MEEP_OAUTH_GITHUB_POLL_URL: ""
		MEEP_NW_SIMULATOR_TYPE: internal
		MEEP_NEM_URL: ""
		MEEP_NEM_TIMEOUT_MS: "3000"
		envSecret:
		MEEP_SESSION_KEY:
		name: meep-session

etsi-mec-sandbox.code-workspace

+2 −2

Changes for etsi-mec-sandbox.code-workspace: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,10 +7,10 @@
		"path": "../mec-sandbox-scenarios"
		},
		{
		"path": "../etsi-mec-sandbox.TTF_T043_BugFixes"
		"path": "../dev/stf_685"
		},
		{
		"path": "../dev/stf685"
		"path": "../dev/stf_707"
		}
		],
		"extensions": {

go-apps/meep-gis-engine/server/gis-automation.go

+10 −3

Changes for go-apps/meep-gis-engine/server/gis-automation.go: 10 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -73,7 +73,10 @@ func setAutomation(automationType string, state bool) (err error) {
		ge.updateTime = time.Time{}
		}
		} else if automationType == AutoTypeNetChar {
		if !state && ge.automation[AutoTypeNetChar] {
		if state && usesExternalNwSimulator() {
		log.Warn("NETWORK-CHARACTERISTICS-UPDATE not started: Simu5G/OAI network characteristics come from the Network Emulation Stack")
		state = false
		} else if !state && ge.automation[AutoTypeNetChar] && !usesExternalNwSimulator() {
		resetAutoNetChar()
		}
		}
		@@ -156,8 +159,9 @@ func runAutomation() {
		runAutoPoaInRange(ueMap)
		}

		// Network Characteristics
		if ge.automation[AutoTypeNetChar] {
		// Network Characteristics (distance-modulated throughput → sandbox-ctrl / TC).
		// Simu5G/OAI: the Network Emulation Stack owns latency/loss/throughput.
		if ge.automation[AutoTypeNetChar] && !usesExternalNwSimulator() {
		runAutoNetChar(ueMap, poaMap)
		}

		@@ -261,6 +265,9 @@ func runAutoPoaInRange(ueMap map[string]*am.Ue) {
		}

		func runAutoNetChar(ueMap map[string]am.Ue, poaMap map[string]am.Poa) {
		if usesExternalNwSimulator() {
		return
		}
		for _, ue := range ueMap {
		// Get stored UE info
		ueInfo := getUeInfo(ue.Name)

go-apps/meep-gis-engine/server/gis-engine.go

+16 −10

Changes for go-apps/meep-gis-engine/server/gis-engine.go: 16 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -941,25 +941,24 @@ func updateCache() {
		}

		// Update POA measurements if different from cached value
		externalRadio := usesExternalNwSimulator()
		for _, poaMeas := range ue.PoaMeasurements {
		updateRequired := false
		cachedPoaMeas, found := cachedPoaMeasMap[ue.Name]
		var cachedMeas *gc.PoaMeasurement
		if found {
		cachedMeas, found = cachedPoaMeas.Measurements[poaMeas.Poa]
		}
		if !found {
		updateRequired = true
		} else {
		cachedMeas, found := cachedPoaMeas.Measurements[poaMeas.Poa]
		if !found \|\| cachedMeas.Distance != poaMeas.Distance \|\| cachedMeas.Rssi != poaMeas.Rssi \|\| cachedMeas.Rsrp != poaMeas.Rsrp \|\| cachedMeas.Rsrq != poaMeas.Rsrq {
		} else if cachedMeas.Distance != poaMeas.Distance {
		updateRequired = true
		} else if !externalRadio && (cachedMeas.Rssi != poaMeas.Rssi \|\| cachedMeas.Rsrp != poaMeas.Rsrp \|\| cachedMeas.Rsrq != poaMeas.Rsrq) {
		updateRequired = true
		}
		}

		if updateRequired {
		measurement := &gc.PoaMeasurement{
		Rssi: poaMeas.Rssi,
		Rsrp: poaMeas.Rsrp,
		Rsrq: poaMeas.Rsrq,
		Distance: poaMeas.Distance,
		}
		measurement := mergePoaMeasurementForCache(externalRadio, poaMeas.Distance, poaMeas.Rssi, poaMeas.Rsrp, poaMeas.Rsrq, cachedMeas)
		_ = ge.gisCache.SetPoaMeasurement(ue.Name, AssetTypeUe, poaMeas.Poa, poaMeas.SubType, measurement)
		cacheUpdated = true
		}
		@@ -1737,6 +1736,13 @@ func geUpdateGeoDataByName(w http.ResponseWriter, r *http.Request) {
		}

		func geGetGeoDataPowerValues(w http.ResponseWriter, r *http.Request) {
		if usesExternalNwSimulator() {
		log.Info("cellularPower skipped: RSRP/RSRQ come from the Network Emulation Stack")
		w.Header().Set("Content-Type", "application/json; charset=UTF-8")
		w.WriteHeader(http.StatusOK)
		fmt.Fprint(w, `{"coordinatesPower":[]}`)
		return
		}
		// Retrieve coordinates to work with from request body
		var coordinates GeoCoordinateList
		if r.Body == nil {