diff --git a/README.md b/README.md index 9b3638a6b65fba0e10a76c7633c08a712c0bfb9a..efc3e5a5f208b5725b83264e443904b20da252ad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,9 @@ presented via OpenAPI compliant descriptions. MEC Sandbox provides the user with a choice of scenarios combining different network technologies (4G, 5G, Wi-Fi) and terminal types. Combining these assets in a geolocated environment, a user can gain hands-on experience on the behaviour -and capabilities of the Location (MEC013), Radio Network Information (MEC012), Traffic Management APIs (MEC015), Device Application Interface (MEC016), WLAN Information (MEC028), Edge Platform +and capabilities of the Location (MEC013), Radio Network Information (MEC012), Traffic Management APIs (MEC015), Device Application Interface (MEC016), +WLAN Information (MEC028), Edge Platform Application Enablement (MEC011) and Application Mobility (MEC021) service APIs. Such contextual information can offer +significant differential performance for edge based MEC applications. Application Enablement (MEC011) and Application Mobility (MEC021) service APIs. Such contextual information can offer significant differential performance for edge based MEC applications. diff --git a/config/.meepctl-repocfg.yaml b/config/.meepctl-repocfg.yaml index 5b56b17dbfdcd05f0a4cbd7c612f30f8742c7f85..250319024d1ccce1206a93759485c81e8bdb3be4 100644 --- a/config/.meepctl-repocfg.yaml +++ b/config/.meepctl-repocfg.yaml @@ -24,7 +24,7 @@ repo: # platform ingress configuration ingress: # host name - host: sandbox-mec.etsi.org + host: try-mec.etsi.org # enable https only (redirect http requests to https port) https-only: true # bind to host ports (true) or node ports (false) @@ -59,7 +59,7 @@ repo: # access token url token-url: https://github.com/login/oauth/access_token # OAuth redirect URI - redirect-uri: https://sandbox-mec.etsi.org/platform-ctrl/v1/authorize + redirect-uri: https://try-mec.etsi.org/platform-ctrl/v1/authorize # OAuth k8s secret (data: client-id, secret) secret: meep-oauth-github # GitLab OAuth provider config @@ -71,7 +71,7 @@ repo: # access token url token-url: https://forge.etsi.org/rep/oauth/token # OAuth redirect URI - redirect-uri: https://sandbox-mec.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) @@ -84,7 +84,7 @@ repo: # enable influx data backups enabled: true # object store url - url: https://metrics.sandbox-mec.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 @@ -104,7 +104,7 @@ repo: # Thanos long-term storage thanos: # enable Thanos - enabled: false + enabled: true # object store configuration secret secret: meep-thanos-objstore-config # query component @@ -134,7 +134,7 @@ repo: # Thanos long-term storage archive thanos-archive: # enable Thanos archive - enabled: false + enabled: true # archive object store configuration secret secret: meep-thanos-archive-objstore-config @@ -280,6 +280,7 @@ repo: # - meep-mg-manager # - meep-rnis # - meep-dai + # - meep-tm # - meep-wais # - meep-ams - meep-sandbox-ctrl @@ -359,6 +360,7 @@ repo: meep-mg-manager: charts/meep-mg-manager meep-rnis: charts/meep-rnis meep-dai: charts/meep-dai + meep-tm: charts/meep-tm meep-wais: charts/meep-wais meep-ams: charts/meep-ams meep-sandbox-ctrl: charts/meep-sandbox-ctrl @@ -374,6 +376,7 @@ repo: # - meep-mg-manager # - meep-rnis # - meep-dai + # - meep-tm # - meep-wais # - meep-ams - meep-sandbox-ctrl @@ -767,6 +770,44 @@ repo: docker-data: # location of entry script 'entrypoint.sh': go-apps/meep-wais/entrypoint.sh + meep-tm: + # location of source code + src: go-apps/meep-tm + # location of binary + bin: bin/meep-tm + # location of deployment chart + chart: charts/meep-tm + # user supplied value file located @ .meep/user/values (use below file name) + chart-user-values: meep-tm.yaml + # extra build flags + build-flags: + - -mod=vendor + # 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 MEC Bandwidth Management REST API' + file: go-apps/meep-tm/api/bwm/swagger.yaml + - name: 'AdvantEDGE MEC Multi-access Traffic Steering REST API' + file: go-apps/meep-tm/api/mts/swagger.yaml + # location of user supplied API specifications + user-api: + # resources available to docker container image + - name: 'Bandwidth Management REST API' + file: config/api/bwm-api.yaml + - name: 'Multi-access Traffic Steering REST API' + file: config/api/mts-api.yaml + docker-data: + # location of entry script + 'entrypoint.sh': go-apps/meep-tm/entrypoint.sh meep-dai: # location of source code src: go-apps/meep-dai @@ -793,11 +834,11 @@ repo: lint: true # location of API specifications api: - - name: 'AdvantEDGE Device application interface REST API' + - name: 'AdvantEDGE Device Application Interface REST API' file: go-apps/meep-dai/api/swagger.yaml # location of user supplied API specifications user-api: - - name: 'Device application interface REST API' + - name: 'Device Application Interface REST API' file: config/api/dai-api.yaml # resources available to docker container image docker-data: @@ -982,7 +1023,7 @@ repo: # enable meepctl dockerize -> deps are never dockerized dockerize: false # enable meepctl deploy/delete - deploy: false + deploy: true # location of deployment chart chart: charts/thanos # user supplied value file located @ .meep/user/values (use below file name) @@ -993,7 +1034,7 @@ repo: # enable meepctl dockerize -> deps are never dockerized dockerize: false # enable meepctl deploy/delete - deploy: false + deploy: true # location of deployment chart chart: charts/thanos # user supplied value file located @ .meep/user/values (use below file name) @@ -1020,6 +1061,11 @@ repo: src: go-packages/meep-applications # supports linting lint: true + meep-bwm-client: + # location of source code + src: go-packages/meep-bwm-client + # supports linting + lint: false meep-couch: # location of source code src: go-packages/meep-couch @@ -1100,6 +1146,11 @@ repo: src: go-packages/meep-model # supports linting lint: true + meep-mts-client: + # location of source code + src: go-packages/meep-mts-client + # supports linting + lint: false meep-mq: # location of source code src: go-packages/meep-mq diff --git a/js-apps/frontend/src/js/app-constants.js b/js-apps/frontend/src/js/app-constants.js index b730716dbe52d2564103988705a0c79a5cec448a..c935e14ec2e6b26cf387cb8b0397d5eccdd9de30 100644 --- a/js-apps/frontend/src/js/app-constants.js +++ b/js-apps/frontend/src/js/app-constants.js @@ -3,7 +3,7 @@ */ // Version -export const MEC_SANDBOX_VERSION = 'v1.7'; +export const MEC_SANDBOX_VERSION = 'v1.8'; // Host export const HOST_PATH = location.origin; diff --git a/js-apps/frontend/src/js/components/dialogs/version-dialog.js b/js-apps/frontend/src/js/components/dialogs/version-dialog.js index 05336e95de56826bd606beea7009a791e25fbedb..dd3bb07bd06157f5e8afe6e9b383788e6c66c0a9 100644 --- a/js-apps/frontend/src/js/components/dialogs/version-dialog.js +++ b/js-apps/frontend/src/js/components/dialogs/version-dialog.js @@ -22,6 +22,16 @@ class VersionDialog extends Component { >
+

v1.8 • 2022-09-29

 + + STF625 update 2: + + +

v1.7 • 2022-06-20

 STF625 update: diff --git a/js-apps/frontend/src/js/util/scenario-utils.js b/js-apps/frontend/src/js/util/scenario-utils.js index 479a317dc3685201a133e63355c9c0b1708956c1..474047afd714f152555e836e76678c6a565ccd72 100644 --- a/js-apps/frontend/src/js/util/scenario-utils.js +++ b/js-apps/frontend/src/js/util/scenario-utils.js @@ -515,8 +515,8 @@ export function parseEdgeApps(scenario) { env: proc.environment, url: 'api/?urls.primaryName='+pl.name+'%20-%20Device%20Application%20Interface%20REST%20API', path: pl.name+'/dev_app/v1', - pseudoName: 'Device application interface (016) on ' + pl.name, - dropDownName: 'Device application interface (016)', + pseudoName: 'Device Application Interface (016) on ' + pl.name, + dropDownName: 'Device Application Interface (016)', enabled: false, enableInProgressCount: -1, disableInProgressCount: -1 diff --git a/networks/4g-5g-macro-v2x.yaml b/networks/4g-5g-macro-v2x.yaml index 3fdad6663b05967d3ad2549ad03ffa3e6012775c..ba06960e4432004f789478365119a25be121db8d 100644 --- a/networks/4g-5g-macro-v2x.yaml +++ b/networks/4g-5g-macro-v2x.yaml @@ -305,11 +305,44 @@ deployment: image: 'meep-docker-registry:30001/meep-tm' environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false' netChar: + latencyDistribution: Normal throughputDl: 1000 throughputUl: 1000 latency: null latencyVariation: null + throughput: null + packetLoss: null + isExternal: null + commandArguments: null + commandExe: null + serviceConfig: 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 + - + id: fb4d3c6a-197e-4e3f-96ae-ab4d5ac663a9 + name: mec016-1 + type: EDGE-APP + image: 'meep-docker-registry:30001/meep-dai' + environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false' + netChar: latencyDistribution: Normal + throughputDl: 1000 + throughputUl: 1000 + latency: null + latencyVariation: null throughput: null packetLoss: null isExternal: null @@ -371,11 +404,11 @@ deployment: image: 'meep-docker-registry:30001/meep-vis' environment: 'MEEP_SCOPE_OF_LOCALITY=MEC_SYSTEM,MEEP_CONSUMED_LOCAL_ONLY=false,MEEP_PREDICT_MODEL_SUPPORTED=true' netChar: + latencyDistribution: Normal throughputDl: 1000 throughputUl: 1000 latency: null latencyVariation: null - latencyDistribution: Normal throughput: null packetLoss: null isExternal: null