Commit c3796123 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF678_Task4' into 'STF678_Task3' 

# Conflicts:
#   config/.meepctl-repocfg.yaml
#   js-apps/frontend/src/js/util/scenario-utils.js
parents e7b2f7f7 bfefda15

config/.meepctl-repocfg.yaml

+55 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# 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
@@ -68,14 +68,18 @@ repo: 
      github:

        # enable GitHub OAuth

        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/device/code

        # polling url

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

        # access token url

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

        # OAuth redirect URI

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

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

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

        secret: meep-oauth-github

      # GitLab OAuth provider config
@@ -303,6 +307,7 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-federation

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -384,6 +389,7 @@ 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
@@ -399,6 +405,7 @@ repo: 
          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

          # - meep-federation

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -901,6 +908,40 @@ 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-federation:

        # location of source code

        src: go-apps/meep-federation

        # location of binary

        bin: bin/meep-federation

        # location of deployment chart

        chart: charts/meep-federation

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

        chart-user-values: meep-federation.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 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-federation/entrypoint.sh



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

  #  Dependencies
@@ -1202,6 +1243,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
@@ -1257,6 +1303,11 @@ repo: 
        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

config/api/fed-api.yaml

0 → 100644
+1464 −0

File added.

Preview size limit exceeded, changes collapsed.

config/api/vis-api.yaml

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ info: 
    url: https://forge.etsi.org/legal-matters

  version: 3.2.2

externalDocs:

  description: "ETSI GS MEC 030 V2X Information Services API, v3.1.1"

  description: "ETSI GS MEC 030 V2X Information Services API, v3.2.1"

  url: https://www.etsi.org/deliver/etsi_gs/MEC/001_099/030/03.02.01_60/

servers:

- url: https://localhost/sandboxname/vis/v2
@@ -2799,9 +2799,16 @@ components: 
    Stream:

      minItems: 1

      required:

      - streamId

      - qosKpi

      type: object

      properties:

        streamId:

          type: string

          description: "The identifier of a specific data stream. In case of 3GPP \

                        \ network, this is mapped to a QoS flow"

          x-etsi-mec-cardinality: "1"

          x-etsi-mec-origin-type: String

        qosKpi:

          type: array

          items:

config/grid_map/grid_map.kml

0 → 100644
+3113 −0

File added.

Preview size limit exceeded, changes collapsed.

config/permissions.yaml

+27 −0
Original line number Diff line number Diff line
@@ -758,6 +758,33 @@ services: 
        roles:

          admin: 'allow'

          user: 'allow'

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

  #  FED Service (Sbox)

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

  - name: 'meep-federation'

    path: '/fed_enablement/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'



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

  #  RNI Service (Sbox)

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