Bug fixed in demo4-ue for Advantage mode (9705f1bc) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

examples/demo4-ue/src/demo-server/backend/server/demo4_service.go

+2 −3

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ var mecServicesMap = make(map[string]string)
		var instanceName string
		var serviceCategory string = "demo4"
		var mep string
		var serviceAppVersion string = "v2.1.1"
		var serviceAppVersion string = "v2.2.1"
		var scopeOfLocality string = defaultScopeOfLocality
		var consumedLocalOnly bool = defaultConsumedLocalOnly

		@@ -150,7 +150,7 @@ func Init(envPath string, envName string) (port string, err error) {
		localUrl = config.Localurl
		} else if config.Mode == "advantedge" {
		environment = "advantedge"
		localPort = config.Port
		localPort = ":80"
		localUrl = config.Localurl
		} else {
		log.Fatal("Missing field for mode, should be set to advantedge or sandbox")
		@@ -169,7 +169,6 @@ func Init(envPath string, envName string) (port string, err error) {

		// Retrieve UE application instance/node name
		instanceName = config.AppInstanceId
		//instanceName = uuid.New().String()
		nodeName = config.NodeName
		log.Info("Init: environment= ", environment, "- localPort= ", localPort, "- localUrl= ", localUrl)
		log.Info("Init: nodeName= ", nodeName, " - instanceName= ", instanceName)

+4 −5

Original line number	Diff line number	Diff line
		# This file defines the configuration of Demo4 edge application. All fields are required to run demo-3 on MEC Sandbox
		# This file defines the configuration of Demo4 edge application. All fields are required to run demo-4 on MEC Sandbox

		# Set where mec application is running either on MEC Sandbox or AdvantEDGE. Expected fields: sandbox \| advantedge
		mode: 'sandbox'
		# Set url of mec platform. Example field format: http://{MEC_IP_ADDRESS}/{SANDBOX_NAME}/{MEP_NAME}/
		sandbox: 'https://sandbox-mec.etsi.org/sbx7j3qk6y/mep1'

		# Set the sandbox name. Example field format: {SANDBOX_NAME}
		sandboxname: 'sbx7j3qk6y'

		# Set the Terminal Equipment the demo-4 should be attached to
		nodename: '10.100.0.01'

		# Set if sandbox url uses https. Expected fields: true \| false
		https: true
		# Set the mec platform name demo4-ue will run on. Example field: mep1
		@@ -19,5 +18,5 @@ appid: '45720620-7442-46cc-93c6-0c67aceb06a6'
		localurl: 'http://sandbox-mec.etsi.org'
		# Set host port number of demo4-ue. Example field: '8094'
		port: '31111'

		# Set the application name
		appname: 'demo4-ue'
		No newline at end of file

+32 −32

Original line number	Diff line number	Diff line
		@@ -107,6 +107,38 @@ deployment:
		connected: true
		dataNetwork:
		dnn: edn
		processes:
		-
		id: ce454f4c-16f8-4542-83d8-c8afd45bcfea
		name: demo4-ue1
		type: EDGE-APP
		isExternal: false
		userChartLocation: null
		userChartAlternateValues: null
		userChartGroup: null
		image: 'meep-docker-registry:30001/demo4-ue'
		environment: ""
		commandArguments: ""
		commandExe: ""
		serviceConfig:
		name: demo4-ue1
		meSvcName: demo4-ue
		ports:
		-
		protocol: TCP
		port: 80
		externalPort: 31111
		gpuConfig: null
		cpuConfig: null
		memoryConfig: null
		externalConfig: null
		netChar:
		latency: 0
		latencyVariation: 0
		throughputDl: 1000
		throughputUl: 1000
		packetLoss: 0
		placementId: ""
		netChar:
		latencyDistribution: Normal
		throughputDl: 1000
		@@ -144,38 +176,6 @@ deployment:
		wireless: true
		wirelessType: 'wifi,5g,4g,other'
		dataNetwork: {}
		processes:
		-
		id: efd6659c-a339-4025-915c-2908b258ed6f
		name: demo4-ue1
		type: UE-APP
		isExternal: false
		userChartLocation: null
		userChartAlternateValues: null
		userChartGroup: null
		image: 'meep-docker-registry:30001/demo4-ue'
		environment: 'MEEP_NODE_NAME="10.10.20.01",MEEP_HOST_PORT=:80,MEEP_EXTERNAL_HOST_PORT=:31111,MEEP_MEC_ADDRESS=mec-platform.etsi.org'
		commandArguments: ""
		commandExe: ""
		serviceConfig:
		name: demo4-ue1
		meSvcName: demo4-ue
		ports:
		-
		protocol: TCP
		port: 80
		externalPort: 31111
		gpuConfig: null
		cpuConfig: null
		memoryConfig: null
		externalConfig: null
		netChar:
		latency: 0
		latencyVariation: 0
		throughputDl: 1000
		throughputUl: 1000
		packetLoss: 0
		placementId: ""
		netChar:
		latencyDistribution: Normal
		throughputDl: 1000

+5 −9

Original line number	Diff line number	Diff line
		#!/bin/bash
		set -e

		echo "mode: sandbox" >app_instance.yaml
		echo "sandbox: ${MEEP_SANDBOX_NAME}" >>app_instance.yaml
		echo "https: false" >>app_instance.yaml
		echo "mode: advantedge" >app_instance.yaml
		echo "sandbox:" >>app_instance.yaml
		echo "mecplatform: ${MEEP_MEP_NAME}" >>app_instance.yaml
		echo "appid: ${MEEP_APP_ID}" >>app_instance.yaml
		echo "localurl: ${MEEP_MEC_ADDRESS}" >>app_instance.yaml
		echo "port: ${MEEP_HOST_PORT}" >>app_instance.yaml
		echo "externalport: ${MEEP_EXTERNAL_HOST_PORT}" >>app_instance.yaml
		echo "appname: ${MEEP_POD_NAME}" >>app_instance.yaml
		echo "nodename: ${MEEP_NODE_NAME}" >>app_instance.yaml
		echo "appid:" ${MEEP_APP_ID} >>app_instance.yaml
		echo "localurl: ${MEEP_POD_NAME}" >>app_instance.yaml
		echo "port:" >>app_instance.yaml

		# Start service
		exec /demo-server ./app_instance.yaml