Bugs fixed in demo1-simu5g (cecc25eb) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

examples/demo1_simu5g/README.md→examples/demo1-simu5g/README.md

+4 −4

Changes for examples/demo1-simu5g/README.md: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		# demo1_simu5g
		# demo1-simu5g

		Simu5G companion of the stock Demo1 application scenario (`examples/demo1`).
		Import `demo1_simu5g-scenario.yaml` (name: `demo1_simu5g`).
		Import `demo1-simu5g-scenario.yaml` (name: `demo1-simu5g` — hyphen, Helm-safe).

		Same platform capabilities as Demo1, with:
		- `userMeta` `connectivityModel: simu5g`
		- `ue1-iperf` pinned to the `zone1-edge1-iperf` PodIP (`EDGE_IPERF_POD_IP`)
		- App image `meep-docker-registry:30001/demo_sim5g-server` (does not overwrite stock `demo-server`)
		- App image `meep-docker-registry:30001/demo1-simu5g-server` (does not overwrite stock `demo-server`)
		- Host-B mappings in `integration-config.json` (`ue1` → `Demo1.ue_car[0]`, `zone1-edge1` → `router`)

		Build / dockerize from this folder:

		```
		./build-demo1_simu5g.sh
		./build-demo1-simu5g.sh
		./dockerize.sh
		```

examples/demo1_simu5g/build-demo1_simu5g.sh→examples/demo1-simu5g/build-demo1-simu5g.sh

+6 −6

Changes for examples/demo1-simu5g/build-demo1-simu5g.sh: 6 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ set -euo pipefail
		SCRIPT=$(readlink -f "$0")
		BASEDIR=$(dirname "$SCRIPT")

		DEMOBIN=$BASEDIR/bin/demo_sim5g-server
		DEMOBIN=$BASEDIR/bin/demo1-simu5g-server
		PROXYBIN=$BASEDIR/bin/iperf-proxy

		echo ""
		@@ -24,27 +24,27 @@ $BASEDIR/src/iperf-proxy/build.sh $PROXYBIN

		echo ""
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ">>> Building demo1_simu5g JS Client"
		echo ">>> Building demo1-simu5g JS Client"
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ""
		$BASEDIR/src/demo-client/js/build.sh

		echo ""
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ">>> Building demo1_simu5g Frontend"
		echo ">>> Building demo1-simu5g Frontend"
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ""
		$BASEDIR/src/demo-frontend/build.sh

		echo ""
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ">>> Building demo1_simu5g Go Server"
		echo ">>> Building demo1-simu5g Go Server"
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ""
		$BASEDIR/src/demo_sim5g-server/build.sh $DEMOBIN
		$BASEDIR/src/demo1-simu5g-server/build.sh $DEMOBIN

		echo ""
		echo ">>> demo1_simu5g build completed"
		echo ">>> demo1-simu5g build completed"

examples/demo1_simu5g/demo1_simu5g-scenario.yaml→examples/demo1-simu5g/demo1-simu5g-scenario.yaml

+79 −12

Changes for examples/demo1-simu5g/demo1-simu5g-scenario.yaml: 79 added lines, 12 removed lines.
Original line number	Diff line number	Diff line
		version: 1.8.1
		name: demo1_simu5g
		name: demo1-simu5g
		deployment:
		netChar:
		latency: 50
		@@ -108,7 +108,7 @@ deployment:
		id: f73f055d-b0df-43b6-b9d2-e437ebb8404d
		name: cloud1-svc
		type: CLOUD-APP
		image: 'meep-docker-registry:30001/demo_sim5g-server'
		image: 'meep-docker-registry:30001/demo1-simu5g-server'
		environment: 'MGM_GROUP_NAME=cloud1-svc,MGM_APP_ID=cloud1-svc,MGM_APP_PORT=80'
		serviceConfig:
		name: cloud1-svc
		@@ -341,8 +341,8 @@ deployment:
		id: 87cf69af-6b3e-449c-8cc0-4fecd6d324c6
		name: zone1-edge1-svc
		type: EDGE-APP
		image: 'meep-docker-registry:30001/demo_sim5g-server'
		environment: 'MGM_GROUP_NAME=svc,MGM_APP_ID=zone1-edge1-svc,MGM_APP_PORT=80'
		image: 'meep-docker-registry:30001/demo1-simu5g-server'
		environment: 'MGM_GROUP_NAME=svc,MGM_APP_ID=zone1-edge1-svc,MGM_APP_PORT=80,LOC_SERV_HOST=zone1-edge1-meep-loc-serv'
		serviceConfig:
		name: zone1-edge1-svc
		meSvcName: svc
		@@ -377,6 +377,39 @@ deployment:
		appThroughput: null
		appPacketLoss: null
		placementId: null
		-
		id: 6c3e1a92-4d7b-4f18-9e2a-8b1c0d5e7f31
		name: meep-loc-serv
		type: EDGE-APP
		image: 'meep-docker-registry:30001/meep-loc-serv'
		environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_HOST,MEEP_CONSUMED_LOCAL_ONLY=false'
		commandArguments: ""
		commandExe: ""
		serviceConfig: null
		netChar:
		latencyDistribution: Normal
		throughputDl: 1000
		throughputUl: 1000
		latency: null
		latencyVariation: null
		throughput: null
		packetLoss: null
		isExternal: null
		gpuConfig: null
		memoryConfig: null
		cpuConfig: null
		externalConfig: null
		status: null
		userChartLocation: null
		userChartAlternateValues: null
		userChartGroup: null
		meta: null
		userMeta: null
		appLatency: null
		appLatencyVariation: null
		appThroughput: null
		appPacketLoss: null
		placementId: null
		netChar:
		latencyDistribution: Normal
		throughputDl: 1000
		@@ -476,7 +509,7 @@ deployment:
		id: 69a71c83-6411-472a-ac18-80f42c9353b2
		name: zone1-fog1-svc
		type: EDGE-APP
		image: 'meep-docker-registry:30001/demo_sim5g-server'
		image: 'meep-docker-registry:30001/demo1-simu5g-server'
		environment: 'MGM_GROUP_NAME=svc,MGM_APP_ID=zone1-fog1-svc,MGM_APP_PORT=80'
		serviceConfig:
		name: zone1-fog1-svc
		@@ -539,13 +572,22 @@ deployment:
		type: UE
		connected: true
		wireless: true
		geoData:
		location:
		type: Point
		coordinates:
		- 7.421
		- 43.7312
		velocity: 0
		path: null
		eopMode: ""
		processes:
		-
		id: b0ace81a-f113-4c3a-8414-956165cba4a5
		name: ue1-iperf
		type: UE-APP
		image: 'meep-docker-registry:30001/iperf3'
		commandArguments: '-c, DST=${EDGE_IPERF_POD_IP}; i=0; while [ -z "$DST" ] && [ $i -lt 180 ]; do sleep 5; DST=${EDGE_IPERF_POD_IP}; i=$((i+1)); done; while true; do iperf3 -u -c "$DST" -p 5201 -b 10M -t 60 -i 5 \|\| true; sleep 5; done'
		commandArguments: '-c, DST=${EDGE_IPERF_POD_IP}; i=0; while [ -z "$DST" ] && [ $i -lt 180 ]; do sleep 5; DST=${EDGE_IPERF_POD_IP}; i=$((i+1)); done; while true; do iperf3 -u -c "$DST" -p 5201 -b 10M -t 30 -i 5 -l 800 --connect-timeout 5 \|\| true; iperf3 -u -c "$DST" -p 5201 -R -b 10M -t 15 -i 5 -l 800 --connect-timeout 5 \|\| true; sleep 5; done'
		commandExe: /bin/sh
		netChar:
		throughputDl: 1000
		@@ -582,7 +624,6 @@ deployment:
		throughput: null
		packetLoss: null
		isExternal: null
		geoData: null
		networkLocationsInRange: null
		wirelessType: null
		dataNetwork: null
		@@ -664,7 +705,15 @@ deployment:
		throughput: null
		packetLoss: null
		isExternal: null
		geoData: null
		geoData:
		location:
		type: Point
		coordinates:
		- 7.4225
		- 43.7305
		velocity: 0
		path: null
		eopMode: ""
		networkLocationsInRange: null
		wirelessType: null
		dataNetwork: null
		@@ -685,7 +734,13 @@ deployment:
		poa4GConfig: null
		poa5GConfig: null
		poaWifiConfig: null
		geoData: null
		geoData:
		location:
		type: Point
		coordinates:
		- 7.419
		- 43.7315
		radius: 700
		-
		id: 956fd663-ef11-4992-8845-499a12ea969e
		name: zone1-poa2
		@@ -708,7 +763,13 @@ deployment:
		poa4GConfig: null
		poa5GConfig: null
		poaWifiConfig: null
		geoData: null
		geoData:
		location:
		type: Point
		coordinates:
		- 7.425
		- 43.728
		radius: 700
		physicalLocations: null
		interFogLatency: null
		interFogLatencyVariation: null
		@@ -804,7 +865,7 @@ deployment:
		id: 04e920e1-7c6b-4bce-8eb0-205356b69de9
		name: zone2-edge1-svc
		type: EDGE-APP
		image: 'meep-docker-registry:30001/demo_sim5g-server'
		image: 'meep-docker-registry:30001/demo1-simu5g-server'
		environment: 'MGM_GROUP_NAME=svc,MGM_APP_ID=zone2-edge1-svc,MGM_APP_PORT=80'
		serviceConfig:
		name: zone2-edge1-svc
		@@ -894,7 +955,13 @@ deployment:
		poa4GConfig: null
		poa5GConfig: null
		poaWifiConfig: null
		geoData: null
		geoData:
		location:
		type: Point
		coordinates:
		- 7.410
		- 43.735
		radius: 700
		physicalLocations: null
		interFogLatency: null
		interFogLatencyVariation: null

examples/demo1_simu5g/dockerize.sh→examples/demo1-simu5g/dockerize.sh

+6 −6

Changes for examples/demo1-simu5g/dockerize.sh: 6 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,11 +4,11 @@
		SCRIPT=$(readlink -f "$0")
		BASEDIR=$(dirname "$SCRIPT")

		DEMOBIN=$BASEDIR/bin/demo_sim5g-server
		DEMOBIN=$BASEDIR/bin/demo1-simu5g-server

		echo ""
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ">>> Dockerizing demo1_simu5g Demo Server"
		echo ">>> Dockerizing demo1-simu5g Demo Server"
		echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
		echo ""

		@@ -18,12 +18,12 @@ mkdir -p $DEMOBIN/static
		cp -Rf $BASEDIR/bin/demo-frontend/* $DEMOBIN/static

		# Copy Dockerfile to bin folder
		cp $BASEDIR/src/demo_sim5g-server/Dockerfile $DEMOBIN
		cp $BASEDIR/src/demo1-simu5g-server/Dockerfile $DEMOBIN

		# Dockerize demo
		cd $DEMOBIN
		docker build --no-cache --rm -t meep-docker-registry:30001/demo_sim5g-server .
		docker push meep-docker-registry:30001/demo_sim5g-server
		docker build --no-cache --rm -t meep-docker-registry:30001/demo1-simu5g-server .
		docker push meep-docker-registry:30001/demo1-simu5g-server

		# Scenario pods use meep-docker-registry:30001/iperf3 only.
		docker pull networkstatic/iperf3
		@@ -31,7 +31,7 @@ docker tag networkstatic/iperf3 meep-docker-registry:30001/iperf3
		docker push meep-docker-registry:30001/iperf3

		echo ""
		echo ">>> demo1_simu5g dockerize completed"
		echo ">>> demo1-simu5g dockerize completed"

examples/demo1_simu5g/integration-config.json→examples/demo1-simu5g/integration-config.json

+2 −2

Changes for examples/demo1-simu5g/integration-config.json: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		{
		"deployment": {
		"scenarioId": "demo1_simu5g",
		"scenarioId": "demo1-simu5g",
		"sandboxHost": "172.29.10.53",
		"simHost": "172.29.10.20"
		},
		@@ -26,7 +26,7 @@
		"rni": {
		"simPort": 9201,
		"pollIntervalMs": 1000,
		"meAppInst": "demo1_simu5g"
		"meAppInst": "demo1-simu5g"
		},
		"ueMappings": [
		{