Commit 9b328499 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF625_MEC015_MEC016' of... 

Merge branch 'STF625_MEC015_MEC016' of https://forge.etsi.org/rep/mec/mec-sandbox into STF625_MEC015_MEC016
parents 999b9367 a0e673a3

README.md

+3 −1
Original line number Diff line number Diff line
@@ -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.

config/.meepctl-repocfg.yaml

+61 −10
Original line number Diff line number Diff line
@@ -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

js-apps/frontend/src/js/app-constants.js

+1 −1
Original line number Diff line number Diff line
@@ -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;

js-apps/frontend/src/js/components/dialogs/version-dialog.js

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,16 @@ class VersionDialog extends Component { 
      >

        <div style={styles.text}>



          <Typography theme="primary" use="subtitle1"><p><b>v1.8 &bull;</b> 2022-09-29</p></Typography>

          <Typography use="body1">

            STF625 update 2:

            <ul>

              <li>Addition of the BWM API (Bandwidth Management Service) v2.2.1</li>

              <li>Addition of the MTS API (Multi-access Traffic Steering Service) v2.2.1</li>

              <li>Addition of the DAI API (Device Application Interface Service) v2.2.1</li>

            </ul>

          </Typography>



          <Typography theme="primary" use="subtitle1"><p><b>v1.7 &bull;</b> 2022-06-20</p></Typography>

          <Typography use="body1">

            STF625 update:

js-apps/frontend/src/js/util/scenario-utils.js

+2 −2
Original line number Diff line number Diff line
@@ -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