Commit 53fe2322 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'STF678_Task1_2_3_4' into 'master' 

Closing STF 678

See merge request !8
parents c4f1878b 20c27c45

.gitmodules

0 → 100644
+4 −0
Original line number Diff line number Diff line 
[submodule "etsi-mec-sandbox-frontend"]

	path = etsi-mec-sandbox-frontend

	url = https://labs.etsi.org/rep/mec/etsi-mec-sandbox-frontend.git

	branch = STF678_Task4

.meepctl-repocfg.yaml

+225 −92
Original line number Diff line number Diff line 
# Copyright (c) 2022  The AdvantEDGE Authors

# Copyright (c) 2024  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.
@@ -12,9 +12,9 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.9.0

version: 1.10.0

repo:

  name: AdvantEDGE

  name: etsi-mec-sandbox



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

  #  Deployment
@@ -23,24 +23,24 @@ repo: 
    # permissions

    permissions:

      # user id

      uid: 1000

      uid: 1001

      # group id

      gid: 1000

      gid: 1001



    # user supplied resources

    user:

      # user supplied frontend UI located @ .meep/user/frontend

      frontend: false

      frontend: true

      # user supplied platform swagger UI located @ .meep/user/swagger

      # user supplied sandbox swagger UI located @ .meep/user/sandbox-swagger

      swagger: false

      swagger: true



    # platform ingress configuration

    ingress:

      # host name

      host: mec-platform.etsi.org

      host: try-mec.etsi.org

      # enable https only (redirect http requests to https port)

      https-only: false

      https-only: true

      # bind to host ports (true) or node ports (false)

      host-ports: true

      # http port number
@@ -67,27 +67,33 @@ repo: 
      # GitHub OAuth provider config

      github:

        # enable GitHub OAuth

        enabled: false

        enabled: true

        # device authorization url for mec-sandbox-api

        device-auth-url: https://github.com/login/device/code

        # authorization url for mec-sandbox-api

        device-poll-url: https://github.com/login/oauth/access_token

        # device polling url

        poll-url: https://github.com/login/oauth/access_token

        # authorization url

        auth-url: https://github.com/login/oauth/authorize

        # access token url

        token-url: https://github.com/login/oauth/access_token

        # OAuth redirect URI

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

      gitlab:

        # enable GitLab OAuth

        enabled: false

        enabled: true

        # authorization url

        auth-url: https://gitlab.com/oauth/authorize

        auth-url: https://forge.etsi.org/rep/oauth/authorize

        # access token url

        token-url: https://gitlab.com/oauth/token

        token-url: https://forge.etsi.org/rep/oauth/token

        # OAuth redirect URI

        redirect-uri: https://mec-platform.etsi.org/auth/v1/authorize

        redirect-uri: https://try-mec.etsi.org/platform-ctrl/v1/authorize

        # GitLab api url

        # api-url: https://gitlab.com

        api-url: https://forge.etsi.org/rep/api/v4

        # OAuth k8s secret (data: client-id, secret)

        secret: meep-oauth-gitlab
@@ -96,9 +102,9 @@ repo: 
      # Influx configuration

      influx:

        # enable influx data backups

        enabled: false

        enabled: true

        # object store url

        url: my-object-store-fqdn

        url: https://metrics.mec-platform.etsi.org/

        # object store configuration secret

        secret: meep-influx-objstore-config

        # Number of days to retain daily data backups
@@ -108,17 +114,17 @@ repo: 
        # external labels added to prometheus metrics

        external-labels:

          # deployment region (geographic or logical)

          region: idcc

          region: etsi

          # function being monitored

          monitor: advantedge

          # prometheus environment (dev|prod)

          promenv: prod

          # unique deployment identifier

          replica: platform-ip

          replica: 172.29.10.56

      # Thanos long-term storage

      thanos:

        # enable Thanos

        enabled: false

        enabled: true

        # object store configuration secret

        secret: meep-thanos-objstore-config

        # query component
@@ -148,7 +154,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
@@ -167,7 +173,7 @@ repo: 
      # Influx configuration

      influx:

        # enable influx garbage collection

        enabled: false

        enabled: true

        # list of databases that must not be removed

        exceptions:

        #   - my_db_to_keep
@@ -179,14 +185,8 @@ repo: 


    # Default monitoring dashboards

    dashboards:

      network-metrics-point-to-point: dashboards/network-metrics-point-to-point.json

      network-metrics-aggregation: dashboards/network-metrics-aggregation.json

      wireless-metrics-point-to-point: dashboards/wireless-metrics-point-to-point.json

      wireless-metrics-aggregation: dashboards/wireless-metrics-aggregation.json

      http-single-log: dashboards/http-log-byId.json

      http-logs-aggregation: dashboards/http-loggers.json

      mec-sandbox: dashboards/mec-sandbox.json

      platform-advantedge: dashboards/platform-advantedge.json

      # platform-advantedge: dashboards/platform-advantedge-thanos.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
@@ -237,7 +237,7 @@ repo: 
          # location of entry script

          'entrypoint.sh': go-apps/meep-auth-svc/entrypoint.sh

          # location of REST API permissions file

          'permissions.yaml': config/permissions-open.yaml

          'permissions.yaml': config/permissions.yaml

      meep-ingress-certs:

        # enable meepctl build

        build: false
@@ -275,7 +275,7 @@ repo: 
        lint: true

        # list of dependencies pods to monitor

        dependency-pods:

          # - meep-cert-manager

          - meep-cert-manager

          - meep-couchdb

          - meep-docker-registry

          - meep-grafana
@@ -290,23 +290,25 @@ repo: 
        core-pods:

          - meep-mon-engine

          - meep-platform-ctrl

          - meep-sandbox-api

          - meep-virt-engine

          - meep-webhook

        # list of sandbox pods to monitor

        sandbox-pods:

          - meep-gis-engine

          - meep-loc-serv

          # - meep-loc-serv

          - meep-metrics-engine

          - meep-mg-manager

          - meep-rnis

          - meep-dai

          - meep-tm

          - meep-wais

          - meep-ams

          # - meep-mg-manager

          # - meep-rnis

          # - meep-dai

          # - meep-tm

          # - meep-wais

          # - meep-ams

          - meep-sandbox-ctrl

          - meep-tc-engine

          - meep-app-enablement

          - meep-vis

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-federation

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -350,6 +352,39 @@ 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
@@ -388,21 +423,23 @@ repo: 
          meep-app-enablement: charts/meep-app-enablement

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

          meep-vis: charts/meep-vis

          meep-federation: charts/meep-federation

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine

          - meep-loc-serv

          # - meep-loc-serv

          - meep-metrics-engine

          - meep-mg-manager

          - meep-rnis

          - meep-dai

          - meep-tm

          - meep-wais

          - meep-ams

          # - meep-mg-manager

          # - meep-rnis

          # - meep-dai

          # - meep-tm

          # - meep-wais

          # - meep-ams

          - meep-sandbox-ctrl

          - meep-tc-engine

          - meep-app-enablement

          - meep-vis

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-federation

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -486,6 +523,8 @@ repo: 
            file: go-apps/meep-ams/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'Application Mobility Service REST API'

            file: config/api/ams-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script
@@ -518,8 +557,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
@@ -581,6 +628,8 @@ repo: 
            file: go-apps/meep-loc-serv/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'Location Service REST API'

            file: config/api/loc-serv-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script
@@ -629,15 +678,15 @@ repo: 
        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-mg-manager.yaml

        # enable meepctl build

        build: true

        build: false

        # enable meepctl dockerize

        dockerize: true

        dockerize: false

        # enable meepctl deploy/delete

        deploy: true

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        lint: false

        # location of API specifications

        api:

          - name: 'AdvantEDGE Mobility Group Service REST API'
@@ -678,6 +727,8 @@ repo: 
            file: go-apps/meep-rnis/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'Radio Network Information Service REST API'

            file: config/api/rnis-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script
@@ -723,15 +774,15 @@ repo: 
        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-tc-engine.yaml

        # enable meepctl build

        build: true

        build: false

        # enable meepctl dockerize

        dockerize: true

        dockerize: false

        # enable meepctl deploy/delete

        deploy: true

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        lint: false

      meep-tc-sidecar:

        # location of source code

        src: go-apps/meep-tc-sidecar
@@ -747,6 +798,40 @@ repo: 
        codecov: false

        # supports linting

        lint: true

      meep-wais:

        # location of source code

        src: go-apps/meep-wais

        # location of binary

        bin: bin/meep-wais

        # location of deployment chart

        chart: charts/meep-wais

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-wais.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 WLAN Access Information REST API'

            file: go-apps/meep-wais/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'WLAN Access Information Service REST API'

            file: config/api/wais-api.yaml

        # resources available to docker container image

        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
@@ -778,18 +863,22 @@ repo: 
        # 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-wais:

      meep-dai:

        # location of source code

        src: go-apps/meep-wais

        src: go-apps/meep-dai

        # location of binary

        bin: bin/meep-wais

        bin: bin/meep-dai

        # location of deployment chart

        chart: charts/meep-wais

        chart: charts/meep-dai

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-wais.yaml

        chart-user-values: meep-dai.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -801,18 +890,22 @@ repo: 
        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports onboarded device application instantiation

        onboardedapp: true

        # supports linting

        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE WLAN Access Information REST API'

            file: go-apps/meep-wais/api/swagger.yaml

          - 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'

            file: config/api/dai-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

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

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

      meep-vis:

        # location of source code

        src: go-apps/meep-vis
@@ -837,23 +930,27 @@ repo: 
        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE V2X Information Service REST API'

          - name: 'AdvantEDGE V2X Information REST API'

            file: go-apps/meep-vis/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'V2X Information Service REST API'

            file: config/api/vis-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

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

      meep-dai:

          # location of grid map file

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

      meep-federation:

        # location of source code

        src: go-apps/meep-dai

        src: go-apps/meep-federation

        # location of binary

        bin: bin/meep-dai

        bin: bin/meep-federation

        # location of deployment chart

        chart: charts/meep-dai

        chart: charts/meep-federation

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-dai.yaml

        chart-user-values: meep-federation.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -865,20 +962,20 @@ repo: 
        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports onboarded device application instantiation

        onboardedapp: true

        # supports linting

        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE Device Application Interface Service REST API'

            file: go-apps/meep-dai/api/swagger.yaml

          - name: 'AdvantEDGE Federation Service REST API'

            file: go-apps/meep-federation/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'Federation Service REST API'

            file: config/api/fed-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

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

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



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

  #  Dependencies
@@ -961,6 +1058,17 @@ repo: 
      chart: charts/kube-state-metrics

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-kube-state-metrics.yaml

    meep-minio:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: false

      # location of deployment chart

      chart: charts/minio

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-minio.yaml

    meep-open-map-tiles:

      # enable meepctl build -> deps are never built

      build: false
@@ -1011,7 +1119,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)
@@ -1022,7 +1130,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)
@@ -1169,6 +1277,11 @@ repo: 
        src: go-packages/meep-rnis-client

        # supports linting

        lint: false

      meep-federation-client:

        # location of source code

        src: go-packages/meep-federation-client

        # supports linting

        lint: false

      meep-sandbox-ctrl-client:

        # location of source code

        src: go-packages/meep-sandbox-ctrl-client
@@ -1184,6 +1297,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
@@ -1204,21 +1322,36 @@ repo: 
        src: go-packages/meep-users

        # supports linting

        lint: true

      meep-vis-client:

      meep-dai-client:

        # location of source code

        src: go-packages/meep-vis-client

        src: go-packages/meep-dai-client

        # supports linting

        lint: false

      meep-vis-traffic-mgr:

      meep-dai-mgr:

        # location of source code

        src: go-packages/meep-vis-traffic-mgr

        src: go-packages/meep-dai-mgr

        # supports linting

        lint: true

        lint: false

      meep-wais-client:

        # location of source code

        src: go-packages/meep-wais-client

        # supports linting

        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        # supports linting

        lint: false

      meep-federation-mgr:

        # location of source code

        src: go-packages/meep-federation-mgr

        # supports linting

        lint: false

      meep-vis-traffic-mgr:

        # location of source code

        src: go-packages/meep-vis-traffic-mgr

        # supports linting

        lint: false

      meep-watchdog:

        # location of source code

        src: go-packages/meep-watchdog
@@ -1229,11 +1362,6 @@ repo: 
        src: go-packages/meep-websocket

        # supports linting

        lint: true

      meep-dai-client:

        # location of source code

        src: go-packages/meep-dai-client

        # supports linting

        lint: false



    # Javascript Packages

    js-packages:
@@ -1262,6 +1390,11 @@ 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

.vscode/settings.json

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
{

    "files.eol": "\n",

    "go.formatTool": "goimports",

    "go.lintTool": "golangci-lint",

    "go.lintFlags": [

        "--fast"

    ],

    // "go.useLanguageServer": false,

    "go.testOnSave": true,

    "[go]": {

        "editor.snippetSuggestions": "none",

        "editor.formatOnSave": true,

        "editor.codeActionsOnSave": {

            "source.organizeImports": true

        },

    },

    "[javascript]": {

        "editor.codeActionsOnSave": {

            "source.fixAll.eslint": true,

        },

    },

    "eslint.format.enable": true

}

AUTHORS

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ InterDigital Communications Inc 
InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM



[v1.10.0]

InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM