Commit 0bbbe300 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF625_MEC016' of https://forge.etsi.org/rep/mec/mec-sandbox into STF625_MEC016

parents a8ed39ef b9f5ea0c

README.md

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

config/.meepctl-repocfg.yaml

+11 −62
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ repo: 
    # permissions

    permissions:

      # user id

      uid: 1001

      uid: 1000

      # group id

      gid: 1001

      gid: 1000



    # user supplied resources

    user:
@@ -24,7 +24,7 @@ repo: 
    # platform ingress configuration

    ingress:

      # host name

      host: try-mec.etsi.org

      host: sandbox-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://try-mec.etsi.org/platform-ctrl/v1/authorize

        redirect-uri: https://sandbox-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://try-mec.etsi.org/platform-ctrl/v1/authorize

        redirect-uri: https://sandbox-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.try-mec.etsi.org/

        url: https://metrics.sandbox-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: true

        enabled: false

        # 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: true

        enabled: false

        # archive object store configuration secret

        secret: meep-thanos-archive-objstore-config
@@ -166,7 +166,7 @@ repo: 
    # Default monitoring dashboards

    dashboards:

      mec-sandbox: dashboards/mec-sandbox.json

      platform-advantedge: dashboards/platform-advantedge-thanos.json

      platform-advantedge: dashboards/platform-advantedge.json

      platform-k8s: dashboards/platform-k8s.json

      runtime-environment-node: dashboards/runtime-environment-node.json

      runtime-environment-k8s-cluster: dashboards/runtime-environment-k8s-cluster.json
@@ -286,7 +286,6 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-tm

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -367,7 +366,6 @@ repo: 
          meep-app-enablement: charts/meep-app-enablement

          meep-virt-chart-templates: charts/meep-virt-chart-templates

          meep-vis: charts/meep-vis

          meep-tm: charts/meep-tm

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -382,7 +380,6 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-tm

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -842,44 +839,6 @@ repo: 
          'entrypoint.sh': go-apps/meep-vis/entrypoint.sh

          # location of grid map file

          'grid_map.yaml': go-packages/meep-vis-traffic-mgr/grid_map.yaml

      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 Bandwidth Management REST API'

            file: go-apps/meep-tm/api/bwm/swagger.yaml

          - name: 'AdvantEDGE Multi-access Traffic Steering REST API'

            file: go-apps/meep-tm/api/mts/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'Bandwidth Management REST API'

            file: config/api/bwm-api.yaml

          - name: 'Multi-access Traffic Steering REST API'

            file: config/api/mts-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-tm/entrypoint.sh



  #------------------------------

  #  Dependencies
@@ -1023,7 +982,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)
@@ -1034,7 +993,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)
@@ -1061,11 +1020,6 @@ 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
@@ -1146,11 +1100,6 @@ 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

config/objstore-thanos-archive.yaml

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ config: 
    idle_conn_timeout: 1m30s

    response_header_timeout: 2m

    insecure_skip_verify: false

deploy.sh

+8 −0
Original line number Diff line number Diff line
@@ -63,5 +63,13 @@ mkdir -p $VALUESDIR-bak 
cp -r  $VALUESDIR/* $VALUESDIR-bak

cp -r config/values/* $VALUESDIR



echo ""

echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"

echo ">> Updating demo4-UE entrypoint.sh script"

echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"

echo ""



sed --in-place 's/advantedge/sandbox/' $MEEPDIR/examples/demo4-ue/src/demo-server/entrypoint.sh



echo ""

echo ">>> MEC Sandbox deployment completed"

js-apps/frontend/src/js/containers/home/home-page-container.js

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class HomePageContainer extends Component { 
                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), WLAN Information (MEC028), Edge Platform Application Enablement (MEC011) and

                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.

              </p>