Commit 89a93281 authored by Ikram Haq's avatar Ikram Haq
Browse files

Merge branch 'STF678_Task1_MEC021' into 'STF625_TASK4' 

merge MEC021 APi into STF625_TASK4

See merge request !4
parents 3d6e805d c016b7f1

build.sh

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
SCRIPT=$(readlink -f "$0")

BASEDIR=$(dirname "$SCRIPT")



MEEPDIR=~/AdvantEDGE

MEEPDIR=~/etsi-mec-sandbox



install_package() {

    echo ""

config/.meepctl-repocfg.yaml

+105 −43
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.8.2

version: 1.10.0

repo:

  name: AdvantEDGE
@@ -38,9 +38,9 @@ repo: 
    # platform ingress configuration

    ingress:

      # host name

      host: try-mec.etsi.org

      host: 172.30.225.7

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

      https-only: true

      https-only: false

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

      host-ports: true

      # http port number
@@ -48,7 +48,7 @@ repo: 
      # https config

      https-port: 443

      # certificate authority (none|self-signed|lets-encrypt) default: none

      ca: lets-encrypt

      ca: self-signed

      # lets-encrypt production server (true) or staging server (false)

      le-server-prod: true
@@ -68,12 +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/oauth/authorize

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

        # 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://mec-platform2.etsi.org/platform-ctrl/v1/authorize

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

        secret: meep-oauth-github

      # GitLab OAuth provider config
@@ -96,7 +102,7 @@ repo: 
      # Influx configuration

      influx:

        # enable influx data backups

        enabled: true

        enabled: false

        # object store url

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

        # object store configuration secret
@@ -118,7 +124,7 @@ repo: 
      # Thanos long-term storage

      thanos:

        # enable Thanos

        enabled: true

        enabled: false

        # object store configuration secret

        secret: meep-thanos-objstore-config

        # query component
@@ -146,11 +152,11 @@ repo: 
            # 1h downsampled data retention

            resolution-1h: 10y

      # Thanos long-term storage archive

      thanos-archive:

      #thanos-archive:

        # enable Thanos archive

        enabled: true

        # enabled: true

        # archive object store configuration secret

        secret: meep-thanos-archive-objstore-config

        #secret: meep-thanos-archive-objstore-config



    # Garbage Collection configuration

    gc:
@@ -301,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'
@@ -373,7 +380,7 @@ repo: 
          meep-metrics-engine: charts/meep-metrics-engine

          meep-mg-manager: charts/meep-mg-manager

          meep-rnis: charts/meep-rnis

          meep-dai: charts/meep-dai

#          meep-dai: charts/meep-dai

          meep-tm: charts/meep-tm

          meep-wais: charts/meep-wais

          meep-ams: charts/meep-ams
@@ -382,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
@@ -397,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
@@ -514,12 +523,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
@@ -823,15 +836,51 @@ repo: 
        docker-data:

          # location of entry script

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

      meep-dai:

#      meep-dai:

#        # location of source code

#        src: go-apps/meep-dai

#        # location of binary

#        bin: bin/meep-dai

#        # location of deployment chart

#        chart: charts/meep-dai

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

#        chart-user-values: meep-dai.yaml

#        # extra build flags

#        build-flags:

#          - -mod=vendor

#        # enable meepctl build

#        build: false #true

#        # enable meepctl dockerize

#        dockerize: false #true

#        # enable meepctl deploy/delete

#        deploy: false #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 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-dai/entrypoint.sh

      meep-vis:

        # location of source code

        src: go-apps/meep-dai

        src: go-apps/meep-vis

        # location of binary

        bin: bin/meep-dai

        bin: bin/meep-vis

        # location of deployment chart

        chart: charts/meep-dai

        chart: charts/meep-vis

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

        chart-user-values: meep-dai.yaml

        chart-user-values: meep-vis.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -843,31 +892,31 @@ 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 REST API'

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

          - name: 'AdvantEDGE V2X Information REST API'

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

        # location of user supplied API specifications

        user-api:

          - name: 'Device Application Interface REST API'

            file: config/api/dai-api.yaml

          - 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-dai/entrypoint.sh

      meep-vis:

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

        src: go-apps/meep-federation

        # location of binary

        bin: bin/meep-vis

        bin: bin/meep-federation

        # location of deployment chart

        chart: charts/meep-vis

        chart: charts/meep-federation

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

        chart-user-values: meep-vis.yaml

        chart-user-values: meep-federation.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -883,18 +932,16 @@ repo: 
        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE V2X Information REST API'

            file: go-apps/meep-vis/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: 'V2X Information Service REST API'

            file: config/api/vis-api.yaml

          - 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-vis/entrypoint.sh

          # location of grid map file

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

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



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

  #  Dependencies
@@ -1038,7 +1085,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)
@@ -1049,7 +1096,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)
@@ -1196,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
@@ -1211,6 +1263,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
@@ -1231,11 +1288,11 @@ repo: 
        src: go-packages/meep-users

        # supports linting

        lint: true

      meep-dai-client:

        # location of source code

        src: go-packages/meep-dai-client

        # supports linting

        lint: false

#      meep-dai-client:

#        # location of source code

#        src: go-packages/meep-dai-client

#        # supports linting

#        lint: false

      meep-wais-client:

        # location of source code

        src: go-packages/meep-wais-client
@@ -1246,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/ams-api.yaml

+18 −20
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: 'ETSI GS MEC 021 Application Mobility Service API'

  version: 2.2.1

  version: 3.1.1

  description:

    'ETSI GS MEC 021 Application Mobility Service API described using OpenAPI.

    <p>**Note**<br>MEC Sandbox supports a subset of AMS API endpoints; complete details on AMS API can be found on [ETSI Forge](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_mec021v020201p.pdf)'

    <p>**Note**<br>MEC Sandbox supports a subset of AMS API endpoints; complete details on AMS API can be found on [ETSI Forge](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/03.01.01_60/gs_mec021v030101p.pdf)'

  license:

    name: BSD-3-Clause

    url: 'https://forge.etsi.org/legal-matters'
@@ -13,8 +13,8 @@ info: 
    email: cti_support@etsi.org

    url: https://forge.etsi.org/rep/mec/gs021-amsi-api

externalDocs:

  description: 'ETSI GS MEC 021 Application Mobility Service API, v2.2.1'

  url: 'https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/02.02.01_60/gs_mec021v020201p.pdf'

  description: 'ETSI GS MEC 021 Application Mobility Service API, v3.1.1'

  url: 'https://www.etsi.org/deliver/etsi_gs/MEC/001_099/021/03.01.01_60/gs_mec021v030101p.pdf'

servers:

  - url: 'https://localhost/sandboxname/amsi/v1'

tags:
@@ -39,7 +39,7 @@ paths: 
          explode: true

          schema:

            type: string

        - name: all_fields

        - name: All_fields

          in: query

          description: Include all complex attributes in the response.

          required: false
@@ -47,7 +47,7 @@ paths: 
          explode: true

          schema:

            type: string

        - name: fields

        - name: Fields

          in: query

          description:

            Complex attributes to be included into the response. See clause
@@ -57,7 +57,7 @@ paths: 
          explode: true

          schema:

            type: string

        - name: exclude_fields

        - name: Exclude_fields

          in: query

          description:

            Complex attributes to be excluded from the response.See clause
@@ -67,7 +67,7 @@ paths: 
          explode: true

          schema:

            type: string

        - name: exclude_default

        - name: Exclude_default

          in: query

          description:

            Indicates to exclude the following complex attributes from the
@@ -147,46 +147,44 @@ paths: 
        - name: filter

          in: query

          description:

            Attribute-based filtering parameters according to ETSI GS MEC

            011

            Attribute-based filtering parameters, according to ETSI GS MEC 009, use the format (op,attr,value), 

              e.g., (eq, appMobilityServiceId, value) or (gt, serviceConsumerId/appInstanceId, value)

          required: false

          style: form

          explode: true

          schema:

            type: string

        - name: all_fields

        - name: All_fields

          in: query

          description: Include all complex attributes in the response.

          description: Include all complex attributes in the response.e.g., All_Fields. 

          required: false

          style: form

          explode: true

          schema:

            type: string

        - name: fields

        - name: Fields

          in: query

          description:

            Complex attributes to be included into the response. See clause

            6.18 in ETSI GS MEC 011

            Complex attributes to be included in the response (see Clause 6.18 in ETSI GS MEC 009), e.g., att or att/subatt.

          required: false

          style: form

          explode: true

          schema:

            type: string

        - name: exclude_fields

        - name: Exclude_fields

          in: query

          description:

            Complex attributes to be excluded from the response.See clause

            6.18 in ETSI GS MEC 011

            Complex attributes to be excluded in the response (see Clause 6.18 in ETSI GS MEC 009), e.g., att or att/subatt.

          required: false

          style: form

          explode: true

          schema:

            type: string

        - name: exclude_default

        - name: Exclude_default

          in: query

          description:

            Indicates to exclude the following complex attributes from the

            response  See clause 6.18 in ETSI GS MEC 011 for details.

            response (See clause 6.18 in ETSI GS MEC 009 for details). 

          required: false

          style: form

          explode: true

config/api/app-support.yaml

+1538 −802

File changed.

Preview size limit exceeded, changes collapsed.

config/api/capif-mgmt.yaml

0 → 100644
+1692 −0

File added.

Preview size limit exceeded, changes collapsed.