diff --git a/config/.meepctl-repocfg.yaml b/config/.meepctl-repocfg.yaml index 8bde14e3268c2383b2116b70458b99859fe4b39a..d037d083ee5fa46f771e8be6fa1bf8a1f84eb051 100644 --- a/config/.meepctl-repocfg.yaml +++ b/config/.meepctl-repocfg.yaml @@ -1,4 +1,4 @@ -# 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-platform.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 @@ -87,7 +87,7 @@ repo: # access token url token-url: https://forge.etsi.org/rep/oauth/token # OAuth redirect URI - redirect-uri: https://mec-platform.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) @@ -98,9 +98,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 @@ -116,7 +116,7 @@ repo: # prometheus environment (dev|prod) promenv: prod # unique deployment identifier - replica: 172.29.10.52 + replica: platform-ip # Thanos long-term storage thanos: # enable Thanos @@ -148,11 +148,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: @@ -286,7 +286,6 @@ repo: core-pods: - meep-mon-engine - meep-platform-ctrl - - meep-sandbox-api - meep-virt-engine - meep-webhook # list of sandbox pods to monitor @@ -347,39 +346,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 @@ -550,12 +516,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 @@ -1074,7 +1044,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) @@ -1085,7 +1055,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) @@ -1247,6 +1217,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 @@ -1325,11 +1300,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 diff --git a/config/permissions.yaml b/config/permissions.yaml index 59731f7f0bd68ee156f33287d85dee6f6b4045dd..0a9e411227a96b19792328b6d1d93af6627d85e2 100644 --- a/config/permissions.yaml +++ b/config/permissions.yaml @@ -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' diff --git a/js-apps/frontend/src/js/util/scenario-utils.js b/js-apps/frontend/src/js/util/scenario-utils.js index 769e565a2e5a115402e5e35f808ffb8bafd66d9a..ec0daa0dd5cf63c55abf24597318d355dfbe07bf 100644 --- a/js-apps/frontend/src/js/util/scenario-utils.js +++ b/js-apps/frontend/src/js/util/scenario-utils.js @@ -641,6 +641,21 @@ export function parseEdgeApps(scenario) { enableInProgressCount: -1, disableInProgressCount: -1 }); + edgeApps.push({ + id: proc.id, + name: proc.name+'-capif-mgmt', + instance: '', + img: proc.image, + mepName: pl.name, + env: proc.environment, + url: 'api/?urls.primaryName='+pl.name+'%20-%20MEC%20Capif%20Management%20API', + path: pl.name+'/service-apis/v1', + pseudoName: 'MEC-CAPIF Service Management (011) on ' + pl.name, + dropDownName: 'MEC-CAPIF Service Management (011)', + enabled: true, // always running + enableInProgressCount: -1, + disableInProgressCount: -1 + }); } } }