Merge branch 'STF678_Task3' into 'STF678_Task4' (77385a6d) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox Frontend

build.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		SCRIPT=$(readlink -f "$0")
		BASEDIR=$(dirname "$SCRIPT")

		MEEPDIR=~/AdvantEDGE
		MEEPDIR=~/etsi-mec-sandbox

		install_package() {
		echo ""

config/.meepctl-repocfg.yaml

+22 −52

Original line number	Diff line number	Diff line
		# Copyright (c) 2024 The AdvantEDGE Authors
		# Copyright (c) 2022 The AdvantEDGE Authors
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		@@ -38,9 +38,9 @@ repo:
		# platform ingress configuration
		ingress:
		# host name
		host: mec-platform2.etsi.org
		host: 172.30.225.7
		# enable https only (redirect http requests to https port)
		https-only: true
		https-only: false
		# bind to host ports (true) or node ports (false)
		host-ports: true
		# http port number
		@@ -48,7 +48,7 @@ repo:
		# https config
		https-port: 443
		# certificate authority (none\|self-signed\|lets-encrypt) default: none
		ca: lets-encrypt
		ca: self-signed
		# lets-encrypt production server (true) or staging server (false)
		le-server-prod: true

		@@ -91,7 +91,7 @@ repo:
		# access token url
		token-url: https://forge.etsi.org/rep/oauth/token
		# OAuth redirect URI
		redirect-uri: https://mec-platform2.etsi.org/platform-ctrl/v1/authorize
		redirect-uri: https://try-mec.etsi.org/platform-ctrl/v1/authorize
		# GitLab api url
		api-url: https://forge.etsi.org/rep/api/v4
		# OAuth k8s secret (data: client-id, secret)
		@@ -102,9 +102,9 @@ repo:
		# Influx configuration
		influx:
		# enable influx data backups
		enabled: true
		enabled: false
		# object store url
		url: https://metrics.mec-platform.etsi.org/
		url: https://metrics.try-mec.etsi.org/
		# object store configuration secret
		secret: meep-influx-objstore-config
		# Number of days to retain daily data backups
		@@ -120,7 +120,7 @@ repo:
		# prometheus environment (dev\|prod)
		promenv: prod
		# unique deployment identifier
		replica: 172.29.10.56
		replica: platform-ip
		# Thanos long-term storage
		thanos:
		# enable Thanos
		@@ -152,11 +152,11 @@ repo:
		# 1h downsampled data retention
		resolution-1h: 10y
		# Thanos long-term storage archive
		thanos-archive:
		#thanos-archive:
		# enable Thanos archive
		enabled: false
		# enabled: true
		# archive object store configuration secret
		secret: meep-thanos-archive-objstore-config
		#secret: meep-thanos-archive-objstore-config

		# Garbage Collection configuration
		gc:
		@@ -290,7 +290,6 @@ repo:
		core-pods:
		- meep-mon-engine
		- meep-platform-ctrl
		- meep-sandbox-api
		- meep-virt-engine
		- meep-webhook
		# list of sandbox pods to monitor
		@@ -352,39 +351,6 @@ repo:
		swagger: js-apps/meep-swagger-ui
		# location of AdvantEDGE frontend
		frontend: bin/meep-frontend
		meep-sandbox-api:
		# location of source code
		src: go-apps/meep-sandbox-api
		# location of binary
		bin: bin/meep-sandbox-api
		# location of deployment chart
		chart: charts/meep-sandbox-api
		# user supplied value file located @ .meep/user/values (use below file name)
		chart-user-values: meep-sandbox-api.yaml
		# enable meepctl build
		build: true
		# enable meepctl dockerize
		dockerize: true
		# enable meepctl deploy/delete
		deploy: true
		# supports code coverage measurement when built in codecov mode
		codecov: true
		# supports linting
		lint: true
		# location of API specifications
		api:
		- name: 'AdvantEDGE Platform Controller REST API'
		file: go-apps/meep-sandbox-api/api/swagger.yaml
		# location of user supplied API specifications
		user-api:
		# resources available to docker container image
		docker-data:
		# location of entry script
		'entrypoint.sh': go-apps/meep-sandbox-api/entrypoint.sh
		# location of Swagger UI
		#swagger: js-apps/meep-swagger-ui
		# location of AdvantEDGE frontend
		#frontend: bin/meep-frontend
		meep-virt-engine:
		# location of source code
		src: go-apps/meep-virt-engine
		@@ -557,12 +523,16 @@ repo:
		file: go-apps/meep-app-enablement/api/app-support/swagger.yaml
		- name: 'AdvantEDGE MEC Service Management REST API'
		file: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml
		- name: 'AdvantEDGE MEC service management realized by CAPIF APIs'
		file: go-apps/meep-app-enablement/api/capif-mgmt/swagger.yaml
		# location of user supplied API specifications
		user-api:
		- name: 'MEC Application Support API'
		file: config/api/app-support.yaml
		- name: 'MEC Service Management API'
		file: config/api/service-mgmt.yaml
		- name: 'MEC Capif Management API'
		file: config/api/capif-mgmt.yaml
		# resources available to docker container image
		docker-data:
		# location of entry script
		@@ -1115,7 +1085,7 @@ repo:
		# enable meepctl dockerize -> deps are never dockerized
		dockerize: false
		# enable meepctl deploy/delete
		deploy: true
		deploy: false
		# location of deployment chart
		chart: charts/thanos
		# user supplied value file located @ .meep/user/values (use below file name)
		@@ -1126,7 +1096,7 @@ repo:
		# enable meepctl dockerize -> deps are never dockerized
		dockerize: false
		# enable meepctl deploy/delete
		deploy: true
		deploy: false
		# location of deployment chart
		chart: charts/thanos
		# user supplied value file located @ .meep/user/values (use below file name)
		@@ -1293,6 +1263,11 @@ repo:
		src: go-packages/meep-service-mgmt-client
		# supports linting
		lint: false
		meep-capif-mgmt-client:
		# location of source code
		src: go-packages/meep-capif-mgmt-client
		# supports linting
		lint: false
		meep-sessions:
		# location of source code
		src: go-packages/meep-sessions
		@@ -1376,11 +1351,6 @@ repo:
		src: js-packages/meep-platform-ctrl-client
		# supports linting
		lint: false
		meep-sandbox-api-client:
		# location of source code
		src: go-packages/meep-sandbox-api-client
		# supports linting
		lint: false
		meep-sandbox-ctrl-client:
		# location of source code
		src: js-packages/meep-sandbox-ctrl-client

config/api/app-support.yaml

+183 −10

Original line number	Diff line number	Diff line
		@@ -1077,7 +1077,96 @@ paths:
		application/json:
		schema:
		$ref: '#/components/schemas/AppInfo'
		required: false
		example:
		appName: "appName"
		appProvider: "appProvider1"
		appCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		appDId: "TODO"
		appInstanceId: "ID1"
		endpoint:
		uris:
		- "mecAppSuptApi/example"
		appServiceRequired:
		- requestedPermissions: "string"
		serCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		serName: "string"
		serTransportDependencies:
		- labels:
		- "string"
		serializers:
		- "JSON"
		transport:
		protocol: "string"
		security:
		oAuth2Info:
		grantTypes:
		- "OAUTH2_CLIENT_CREDENTIALS"
		tokenEndpoint: "/mecSerMgmtApi/security/TokenEndPoint"
		type: "REST_HTTP"
		version: "string"
		version: "string"
		appServiceOptional:
		- requestedPermissions: "string"
		serCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		serName: "string"
		serTransportDependencies:
		- labels:
		- "string"
		serializers:
		- "JSON"
		transport:
		protocol: "string"
		security:
		oAuth2Info:
		grantTypes:
		- "OAUTH2_CLIENT_CREDENTIALS"
		tokenEndpoint: "/mecSerMgmtApi/security/TokenEndPoint"
		type: "REST_HTTP"
		version: "string"
		version: "string"
		appFeatureRequired:
		- featureName: "string"
		version: "string"
		appFeatureOptional:
		- featureName: "string"
		version: "string"
		isInsByMec: false
		appProfile:
		easId: "appName"
		endPt:
		uris:
		- "string"
		acIds:
		- "string"
		provId: "appProvider1"
		type: "string"
		scheds:
		- "string"
		svcArea: "string"
		svcKpi: "string"
		permLvl:
		- "string"
		easFeats:
		- "string"
		svcContSupp:
		- "string"
		appLocs:
		- "string"
		avlRep: 1577836800
		status: "string"
		required: true
		responses:
		'201':
		description: >-
		@@ -1097,7 +1186,6 @@ paths:
		'400':
		description: >-
		Bad Request. It is used to indicate that incorrect parameters were passed to the request.
		headers: {}
		content:
		application/problem+json:
		schema:
		@@ -1109,7 +1197,6 @@ paths:
		'401':
		description: >-
		Unauthorized. It is used when the client did not submit the appropriate credentials.
		headers: {}
		content:
		application/problem+json:
		schema:
		@@ -1121,7 +1208,6 @@ paths:
		'403':
		description: >-
		Forbidden. The operation is not allowed given the current status of the resource.
		headers: {}
		content:
		application/problem+json:
		schema:
		@@ -1129,7 +1215,6 @@ paths:
		'404':
		description: >-
		Not Found. It is used when a client provided a URI that cannot be mapped to a valid resource URI.
		headers: {}
		content:
		application/problem+json:
		schema:
		@@ -1139,7 +1224,6 @@ paths:
		type: object
		description: Empty schema
		deprecated: false
		parameters: []
		/registrations/{appInstanceId}:
		get:
		tags:
		@@ -1222,6 +1306,95 @@ paths:
		application/json:
		schema:
		$ref: '#/components/schemas/AppInfo'
		example:
		appName: "appName"
		appProvider: "appProvider1"
		appCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		appDId: "TODO"
		appInstanceId: "ID1"
		endpoint:
		uris:
		- "mecAppSuptApi/example"
		appServiceRequired:
		- requestedPermissions: "string"
		serCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		serName: "string"
		serTransportDependencies:
		- labels:
		- "string"
		serializers:
		- "JSON"
		transport:
		protocol: "string"
		security:
		oAuth2Info:
		grantTypes:
		- "OAUTH2_CLIENT_CREDENTIALS"
		tokenEndpoint: "/mecSerMgmtApi/security/TokenEndPoint"
		type: "REST_HTTP"
		version: "string"
		version: "string"
		appServiceOptional:
		- requestedPermissions: "string"
		serCategory:
		href: "/example/catalogue1"
		id: "id12345"
		name: "RNI"
		version: "version1"
		serName: "string"
		serTransportDependencies:
		- labels:
		- "string"
		serializers:
		- "JSON"
		transport:
		protocol: "string"
		security:
		oAuth2Info:
		grantTypes:
		- "OAUTH2_CLIENT_CREDENTIALS"
		tokenEndpoint: "/mecSerMgmtApi/security/TokenEndPoint"
		type: "REST_HTTP"
		version: "string"
		version: "string"
		appFeatureRequired:
		- featureName: "string"
		version: "string"
		appFeatureOptional:
		- featureName: "string"
		version: "string"
		isInsByMec: false
		appProfile:
		easId: "appName"
		endPt:
		uris:
		- "string"
		acIds:
		- "string"
		provId: "appProvider1"
		type: "string"
		scheds:
		- "string"
		svcArea: "string"
		svcKpi: "string"
		permLvl:
		- "string"
		easFeats:
		- "string"
		svcContSupp:
		- "string"
		appLocs:
		- "string"
		avlRep: 1577836800
		status: "string"
		required: true
		responses:
		'204':

config/api/capif-mgmt.yaml

0 → 100644

+1692 −0

File added.

Preview size limit exceeded, changes collapsed.

config/permissions.yaml

+55 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,61 @@ services:
		method: 'GET'
		mode: 'block'
		#------------------------------
		# MEC-CAPIF Service Management (Sbox)
		#------------------------------
		- name: 'meep-app-enablement'
		api: 'service-apis'
		path: '/service-apis/v1'
		sbox: true
		default:
		mode: 'allow'
		fileservers:
		- name: 'Api'
		path: '/api'
		mode: 'verify'
		roles:
		admin: 'allow'
		user: 'block'
		- name: 'UserApi'
		path: '/user-api'
		mode: 'verify'
		roles:
		admin: 'allow'
		user: 'allow'
		endpoints:
		- name: 'Index'
		path: '/'
		method: 'GET'
		mode: 'block'

		#------------------------------
		# MEC-CAPIF Service Management (Sbox)
		#------------------------------
		- name: 'meep-app-enablement'
		api: 'published-apis'
		path: '/published-apis/v1'
		sbox: true
		default:
		mode: 'allow'
		fileservers:
		- name: 'Api'
		path: '/api'
		mode: 'verify'
		roles:
		admin: 'allow'
		user: 'block'
		- name: 'UserApi'
		path: '/user-api'
		mode: 'verify'
		roles:
		admin: 'allow'
		user: 'allow'
		endpoints:
		- name: 'Index'
		path: '/'
		method: 'GET'
		mode: 'block'
		#------------------------------
		# GIS Engine (Sbox)
		#------------------------------
		- name: 'meep-gis-engine'

Admin message