Commit d606228f authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents 1ce14752 fd9f1102
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
version: 1.7.1
version: 1.8.0
name: 4g-5g-wifi-macro
deployment:
    netChar:
@@ -205,11 +205,11 @@ deployment:
                                            type: EDGE-APP
                                            image: 'meep-docker-registry:30001/meep-app-enablement'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -239,11 +239,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-rnis'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -272,11 +272,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-loc-serv'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -305,11 +305,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-wais'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -332,11 +332,11 @@ deployment:
                                            appPacketLoss: null
                                            placementId: null
                                    netChar:
                                        latencyDistribution: Normal
                                        throughputDl: 1000
                                        throughputUl: 1000
                                        latency: null
                                        latencyVariation: null
                                        latencyDistribution: null
                                        throughput: null
                                        packetLoss: null
                                    isExternal: null
@@ -5626,4 +5626,3 @@ deployment:
id: null
description: null
config: null
+6 −7
Original line number Diff line number Diff line
version: 1.7.1
version: 1.8.0
name: 4g-macro
deployment:
    netChar:
@@ -205,11 +205,11 @@ deployment:
                                            type: EDGE-APP
                                            image: 'meep-docker-registry:30001/meep-app-enablement'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -239,11 +239,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-rnis'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -272,11 +272,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-loc-serv'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -305,11 +305,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-wais'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -332,11 +332,11 @@ deployment:
                                            appPacketLoss: null
                                            placementId: null
                                    netChar:
                                        latencyDistribution: Normal
                                        throughputDl: 1000
                                        throughputUl: 1000
                                        latency: null
                                        latencyVariation: null
                                        latencyDistribution: null
                                        throughput: null
                                        packetLoss: null
                                    isExternal: null
@@ -4572,4 +4572,3 @@ deployment:
id: null
description: null
config: null
+6 −7
Original line number Diff line number Diff line
version: 1.7.1
version: 1.8.0
name: 4g-wifi-macro
deployment:
    netChar:
@@ -205,11 +205,11 @@ deployment:
                                            type: EDGE-APP
                                            image: 'meep-docker-registry:30001/meep-app-enablement'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -239,11 +239,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-rnis'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -272,11 +272,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-loc-serv'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -305,11 +305,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-wais'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -332,11 +332,11 @@ deployment:
                                            appPacketLoss: null
                                            placementId: null
                                    netChar:
                                        latencyDistribution: Normal
                                        throughputDl: 1000
                                        throughputUl: 1000
                                        latency: null
                                        latencyVariation: null
                                        latencyDistribution: null
                                        throughput: null
                                        packetLoss: null
                                    isExternal: null
@@ -4946,4 +4946,3 @@ deployment:
id: null
description: null
config: null
+10 −11
Original line number Diff line number Diff line
version: 1.7.1
version: 1.8.0
name: dual-mep-4g-5g-wifi-macro
deployment:
    netChar:
@@ -205,11 +205,11 @@ deployment:
                                            type: EDGE-APP
                                            image: 'meep-docker-registry:30001/meep-app-enablement'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -239,11 +239,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-rnis'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -272,11 +272,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-loc-serv'
                                            environment: 'MEEP_LOCALITY=zone01:zone02:zone03,MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=true'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -305,11 +305,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-ams'
                                            environment: 'MEEP_MEP_COVERAGE=mep1:zone01:zone02:zone03/mep2:zone04,MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -338,11 +338,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-wais'
                                            environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -365,11 +365,11 @@ deployment:
                                            appPacketLoss: null
                                            placementId: null
                                    netChar:
                                        latencyDistribution: Normal
                                        throughputDl: 1000
                                        throughputUl: 1000
                                        latency: null
                                        latencyVariation: null
                                        latencyDistribution: null
                                        throughput: null
                                        packetLoss: null
                                    isExternal: null
@@ -4671,11 +4671,11 @@ deployment:
                                            type: EDGE-APP
                                            image: 'meep-docker-registry:30001/meep-app-enablement'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -4705,11 +4705,11 @@ deployment:
                                            image: 'meep-docker-registry:30001/meep-loc-serv'
                                            environment: 'MEEP_LOCALITY=zone04,MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=true'
                                            netChar:
                                                latencyDistribution: Normal
                                                throughputDl: 1000
                                                throughputUl: 1000
                                                latency: null
                                                latencyVariation: null
                                                latencyDistribution: null
                                                throughput: null
                                                packetLoss: null
                                            isExternal: null
@@ -4732,11 +4732,11 @@ deployment:
                                            appPacketLoss: null
                                            placementId: null
                                    netChar:
                                        latencyDistribution: Normal
                                        throughputDl: 1000
                                        throughputUl: 1000
                                        latency: null
                                        latencyVariation: null
                                        latencyDistribution: null
                                        throughput: null
                                        packetLoss: null
                                    isExternal: null
@@ -5761,4 +5761,3 @@ deployment:
id: null
description: null
config: null