Commit 4bbdbe54 authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

fix: restrict MEC app service visibility to owning MEP instead of system-wide 

MEC apps (rnis, loc-serv, tm, dai, wais, vis, iot, sss) were all onboarded
with MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM. Per ETSI GS MEC 011, MEC_SYSTEM
means a service is discoverable by any app on any MEC host in the same
MEC system, so mec_service_mgmt correctly skipped its per-MEP filter for
every one of these services. The observable effect: querying
mep2/mec_service_mgmt/v1/services returned mep1's services too (and vice
versa) - the two MEPs were never actually isolated from each other's
service registries.

Switched these apps to MEEP_SCOPE_OF_LOCALITY=MEC_HOST across every
network scenario file, restoring per-MEP service isolation.

meep-federation (mec040) and meep-ams (mec021) are intentionally left at
MEC_SYSTEM: federation's whole purpose is cross-system service exchange,
and AMS's zone-to-MEP routing (MEEP_MEP_COVERAGE, parsed in
go-apps/meep-ams/sbi/ams-sbi.go) requires it to be reachable from apps on
either MEP to coordinate handover across MEP boundaries. Restricting
either of these to MEC_HOST would break their documented function.

Addresses rep/mec/etsi-mec-sandbox#17
parent c45eca88

networks/4g-5g-macro-v2x-fed.yaml

+9 −9
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ deployment: 
                                            name: mec012-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-rnis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -349,7 +349,7 @@ deployment: 
                                            name: mec013-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-loc-serv'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -382,7 +382,7 @@ deployment: 
                                            name: mec015-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-tm'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -415,7 +415,7 @@ deployment: 
                                            name: mec016-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-dai'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -448,7 +448,7 @@ deployment: 
                                            name: mec028-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-wais'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -481,7 +481,7 @@ deployment: 
                                            name: mec030-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-vis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false,MEEP_PREDICT_MODEL_SUPPORTED=true,MEEP_POA_LIST="5g-small-cell-1;5g-small-cell-2;5g-small-cell-3;5g-small-cell-4"'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false,MEEP_PREDICT_MODEL_SUPPORTED=true,MEEP_POA_LIST="5g-small-cell-1;5g-small-cell-2;5g-small-cell-3;5g-small-cell-4"'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -514,7 +514,7 @@ deployment: 
                                            name: mec040-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-federation'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false,WEBSOCK_ETPATH=/monaco-telecom/meep-cloud-mosquitto'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false,WEBSOCK_ETPATH=/monaco-telecom/meep-cloud-mosquitto'

                                            netChar:

                                                throughputDl: 1000

                                                throughputUl: 1000
@@ -4671,7 +4671,7 @@ deployment: 
                                            name: mec040-2

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-federation'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false,WEBSOCK_ETPATH=/monaco-telecom/meep-cloud-mosquitto'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false,WEBSOCK_ETPATH=/monaco-telecom/meep-cloud-mosquitto'

                                            netChar:

                                                throughputDl: 1000

                                                throughputUl: 1000
@@ -4737,7 +4737,7 @@ deployment: 
                                            name: mec013-2

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-loc-serv'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                throughputDl: 1000

                                                throughputUl: 1000

networks/4g-5g-macro-v2x.yaml

+6 −6
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ deployment: 
                                            name: mec012-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-rnis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -136,7 +136,7 @@ deployment: 
                                            name: mec013-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-loc-serv'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -146,7 +146,7 @@ deployment: 
                                            name: mec015-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-tm'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -156,7 +156,7 @@ deployment: 
                                            name: mec016-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-dai'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -166,7 +166,7 @@ deployment: 
                                            name: mec028-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-wais'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -176,7 +176,7 @@ deployment: 
                                            name: mec030-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-vis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false,MEEP_PREDICT_MODEL_SUPPORTED=true,MEEP_POA_LIST="5g-small-cell-1;5g-small-cell-2;5g-small-cell-3;5g-small-cell-4"'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false,MEEP_PREDICT_MODEL_SUPPORTED=true,MEEP_POA_LIST="5g-small-cell-1;5g-small-cell-2;5g-small-cell-3;5g-small-cell-4"'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000

networks/4g-5g-mc-v2x-fed-iot.yaml

+14 −113

File changed.

Preview size limit exceeded, changes collapsed.

networks/4g-5g-wifi-macro.yaml

+4 −37
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ deployment: 
                                            name: mec012-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-rnis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -136,50 +136,17 @@ deployment: 
                                            name: mec013-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-loc-serv'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000

                                                throughputUl: 1000

                                        -

                                            id: 81c51643-8c6f-4781-ad45-f8a457ca549b

                                            name: mec015-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-tm'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000

                                                throughputUl: 1000

                                            id: 411993a9-ceab-4b8b-8e6e-7dc1bedf9e66

                                            name: mec016-1

                                            type: EDGE-APP

                                            isExternal: false

                                            userChartLocation: null

                                            userChartAlternateValues: null

                                            userChartGroup: null

                                            image: 'meep-docker-registry:30001/meep-dai'

                                            environment: ""

                                            commandArguments: ""

                                            commandExe: ""

                                            serviceConfig: null

                                            gpuConfig: null

                                            cpuConfig: null

                                            memoryConfig: null

                                            externalConfig: null

                                            netChar:

                                                latency: 0

                                                latencyVariation: 0

                                                throughputDl: 1000

                                                throughputUl: 1000

                                                packetLoss: 0

                                            placementId: ""

                                        -

                                            id: b8ae165a-a1e3-4d6c-86d9-52c59ad314b6

                                            name: mec028-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-wais'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -193,7 +160,7 @@ deployment: 
                                            userChartAlternateValues: null

                                            userChartGroup: null

                                            image: 'meep-docker-registry:30001/meep-dai'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            commandArguments: ""

                                            commandExe: ""

                                            serviceConfig: null

networks/4g-macro.yaml

+4 −4
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ deployment: 
                                            name: mec012-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-rnis'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -136,7 +136,7 @@ deployment: 
                                            name: mec013-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-loc-serv'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -146,7 +146,7 @@ deployment: 
                                            name: mec015-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-tm'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000
@@ -180,7 +180,7 @@ deployment: 
                                            name: mec028-1

                                            type: EDGE-APP

                                            image: 'meep-docker-registry:30001/meep-wais'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'

                                            netChar:

                                                latencyDistribution: Normal

                                                throughputDl: 1000