Commit bb611c17 authored by Simon Pastor's avatar Simon Pastor
Browse files

new app-enablement and loc-serv and wais api updates

parent f0b8f5f7

config/.meepctl-repocfg.yaml

+54 −12
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-auth-svc/api/swagger.yaml

        api:

          meep-auth-svc: go-apps/meep-auth-svc/api/swagger.yaml

        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of REST API permissions file
@@ -214,7 +215,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-mon-engine/api/swagger.yaml

        api:

          meep-mon-engine: go-apps/meep-mon-engine/api/swagger.yaml

        # list of dependencies pods to monitor

        dependency-pods:

          - meep-cert-manager
@@ -243,6 +245,7 @@ repo: 
          - meep-rnis

          - meep-wais

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

      meep-platform-ctrl:

        # location of source code
@@ -264,7 +267,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-platform-ctrl/api/swagger.yaml

        api:

          meep-platform-ctrl: go-apps/meep-platform-ctrl/api/swagger.yaml

        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of AdvantEDGE swagger files
@@ -304,6 +308,7 @@ repo: 
          meep-sandbox-ctrl: charts/meep-sandbox-ctrl

          meep-tc-engine: charts/meep-tc-engine

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

          meep-app-enablement: charts/meep-app-enablement

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -313,6 +318,7 @@ repo: 
          - meep-rnis

          - meep-wais

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

      meep-webhook:

        # location of source code
@@ -401,6 +407,7 @@ repo: 
          - sandbox.go-apps.meep-wais

          - sandbox.go-apps.meep-metrics-engine

          - packages.go-packages.meep-metrics-engine-notification-client

          - sandbox.go-apps.meep-app-enablement

          # - sandbox.go-apps.meep-mg-manager

          # - packages.go-packages.meep-mg-app-client
@@ -431,7 +438,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-gis-engine/api/swagger.yaml

        api:

          meep-gis-engine: go-apps/meep-gis-engine/api/swagger.yaml

      meep-loc-serv:

        # location of source code

        src: go-apps/meep-loc-serv
@@ -455,7 +463,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-loc-serv/api/swagger.yaml

        api:

          meep-loc-serv: go-apps/meep-loc-serv/api/swagger.yaml

      meep-metrics-engine:

        # location of source code

        src: go-apps/meep-metrics-engine
@@ -479,7 +488,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-metrics-engine/api/v2/swagger.yaml

        api:

          meep-metrics-engine: go-apps/meep-metrics-engine/api/v2/swagger.yaml

      meep-mg-manager:

        # location of source code

        src: go-apps/meep-mg-manager
@@ -500,7 +510,8 @@ repo: 
        # supports linting

        lint: false

        # location of API specification

        api: go-apps/meep-mg-manager/api/swagger.yaml

        api:

          meep-mg-manager: go-apps/meep-mg-manager/api/swagger.yaml

      meep-rnis:

        # location of source code

        src: go-apps/meep-rnis
@@ -524,7 +535,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-rnis/api/swagger.yaml

        api:

          meep-rnis: go-apps/meep-rnis/api/swagger.yaml

      meep-wais:

        # location of source code

        src: go-apps/meep-wais
@@ -548,7 +560,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

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

        api:

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

      meep-sandbox-ctrl:

        # location of source code

        src: go-apps/meep-sandbox-ctrl
@@ -569,7 +582,8 @@ repo: 
        # supports linting

        lint: true

        # location of API specification

        api: go-apps/meep-sandbox-ctrl/api/swagger.yaml

        api:

          meep-sandbox-ctrl: go-apps/meep-sandbox-ctrl/api/swagger.yaml

        docker-data:

          'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh

          swagger: bin/meep-sandbox-swagger-ui
@@ -607,6 +621,32 @@ repo: 
        codecov: false

        # supports linting

        lint: false

      meep-app-enablement:

        # location of source code

        src: go-apps/meep-app-enablement

        # location of binary

        bin: bin/meep-app-enablement

        # location of deployment chart

        chart: charts/meep-app-enablement

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

        chart-user-values: meep-app-enablement.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: false

        # supports linting

        lint: true

        # location of API specification

        api:

          meep-app-support: go-apps/meep-app-enablement/api/app-support/swagger.yaml

          meep-service-mgmt: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml



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

  #  Dependencies
@@ -825,14 +865,16 @@ repo: 
        # supports linting

        lint: false

        # location of API specification

        api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

        api:

          meep-metrics-engine-notification-client: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

      meep-mg-app-client:

        # location of source code

        src: go-packages/meep-mg-app-client

        # supports linting

        lint: false

        # location of API specification

        api: go-packages/meep-mg-app-client/api/swagger.yaml

        api:

          meep-mg-app-client: go-packages/meep-mg-app-client/api/swagger.yaml

      meep-mg-manager-client:

        # location of source code

        src: go-packages/meep-mg-manager-client

config/permissions.yaml

+42 −1
Original line number Diff line number Diff line
@@ -188,6 +188,13 @@ services: 
        roles:

          admin: 'allow'

          user: 'allow'

      - name: 'GetDistanceGeoDataByName'

        path: '/geodata/{assetName}/distanceTo'

        method: 'POST'

        mode: 'verify'

        roles:

          admin: 'allow'

          user: 'allow'

      - name: 'GetGeoDataByName'

        path: '/geodata/{assetName}'

        method: 'GET'
@@ -195,6 +202,13 @@ services: 
        roles:

          admin: 'allow'

          user: 'allow'

      - name: 'GetWithinRangeByName'

        path: '/geodata/{assetName}/withinRange'

        method: 'POST'

        mode: 'verify'

        roles:

          admin: 'allow'

          user: 'allow'

      - name: 'UpdateGeoDataByName'

        path: '/geodata/{assetName}'

        method: 'POST'
@@ -572,3 +586,30 @@ services: 
        path: '/'

        method: 'GET'

        mode: 'block'

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

  #  MEC Application Support (Sbox)

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

  - name: 'meep-app-enablement-app-supp'

    path: '/mec_app_support/v1'

    sbox: true

    default:

      mode: 'allow'

    endpoints:

      - name: 'Index'

        path: '/'

        method: 'GET'

        mode: 'block'

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

  #  MEC Service Management (Sbox)

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

  - name: 'meep-app-enablement-srv-mgmt'

    path: '/mec_service_mgmt/v1'

    sbox: true

    default:

      mode: 'allow'

    endpoints:

      - name: 'Index'

        path: '/'

        method: 'GET'

        mode: 'block'

js-apps/swagger-ui/loc-serv-api.yaml

+79 −28
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ paths: 
  /queries/distance:

    get:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'UE Distance Lookup of a specific UE'

      description: 'UE Distance Lookup between terminals or a terminal and a location'

      operationId: distanceGET
@@ -215,11 +215,10 @@ paths: 
        '429':

          $ref: '#/components/responses/429'

      x-swagger-router-controller: 'queries'



  /subscriptions/area/circle:

    get:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Retrieves all active subscriptions to area change notifications'

      description: 'This operation is used for retrieving all active subscriptions to area change notifications.'

      operationId: areaCircleSubListGET
@@ -237,7 +236,7 @@ paths: 
                    $ref: '#/components/schemas/NotificationSubscriptionList'

    post:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Creates a subscription for area change notification'

      description: 'Creates a subscription to the Location Service for an area change notification.'

      operationId: areaCircleSubPOST
@@ -247,10 +246,22 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                circleNotificationSubscription:

              $ref: '#/components/schemas/CircleNotificationSubscription'

            example:

              circleNotificationSubscription:

                clientCorrelator: '0123'

                callbackReference:

                  callbackData: '1234'

                  notifyURL: 'http://my.callback.com/location-area-circle/some-id'

                address:

                - '10.100.0.4'

                checkImmediate: true

                enteringLeavingCriteria: 'Entering'

                frequency: 1

                latitude: 43.748993

                longitude: 7.437573

                radius: 200

                trackingAccuracy: 10

      responses:

        '201':

          description: 'Successful subscription'
@@ -297,7 +308,7 @@ paths: 
  /subscriptions/area/circle/{subscriptionId}:

    get:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Retrieve subscription information'

      description: 'Get subscription information.'

      operationId: areaCircleSubGET
@@ -330,7 +341,7 @@ paths: 
      x-swagger-router-controller: 'subscriptions'

    put:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Updates a subscription information'

      description: 'Updates a subscription.'

      operationId: areaCircleSubPUT
@@ -340,10 +351,23 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                circleNotificationSubscription:

              $ref: '#/components/schemas/CircleNotificationSubscription'

            example:

              circleNotificationSubscription:

                clientCorrelator: '0123'

                callbackReference:

                  callbackData: '1234'

                  notifyURL: 'http://my.callback.com/location-area-circle/some-id'

                address:

                - '10.100.0.4'

                checkImmediate: true

                enteringLeavingCriteria: 'Entering'

                frequency: 1

                latitude: 43.748993

                longitude: 7.437573

                radius: 200

                resourceURL: "http://[hostIP]/sbox-xyz123/location/v2/subscriptions/area/circle/subscription123"

                trackingAccuracy: 10

      parameters:

        - $ref: '#/components/parameters/Path.SubscrId'

      responses:
@@ -375,7 +399,7 @@ paths: 
      x-swagger-router-controller: 'subscriptions'

    delete:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Cancel a subscription'

      description: 'Method to delete a subscription.'

      operationId: areaCircleSubDELETE
@@ -396,7 +420,7 @@ paths: 
  /subscriptions/distance:

    get:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Retrieves all active subscriptions to distance change notifications'

      description: 'This operation is used for retrieving all active subscriptions to a distance change notifications.'

      operationId: distanceSubListGET
@@ -414,7 +438,7 @@ paths: 
                    $ref: '#/components/schemas/NotificationSubscriptionList'

    post:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Creates a subscription for distance change notification'

      description: 'Creates a subscription to the Location Service for a distance change notification.'

      operationId: distanceSubPOST
@@ -424,10 +448,23 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                distanceNotificationSubscription:

              $ref: '#/components/schemas/DistanceNotificationSubscription'

            example:

              distanceNotificationSubscription:

                clientCorrelator: '0123'

                callbackReference:

                  callbackData: '1234'

                  notifyURL: 'http://my.callback.com/location-distance/some-id'

                monitoredAddress:

                - '10.10.0.1'

                - '10.1.0.1'

                checkImmediate: true

                criteria: 'AllWithinDistance'

                distance: 100

                frequency: 10

                referenceAddress:

                - '10.100.0.1'

                trackingAccuracy: 10

      responses:

        '201':

          description: 'Successful subscription'
@@ -474,7 +511,7 @@ paths: 
  /subscriptions/distance/{subscriptionId}:

    get:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Retrieve subscription information'

      description: 'Get subscription information.'

      operationId: distanceSubGET
@@ -507,7 +544,7 @@ paths: 
      x-swagger-router-controller: 'subscriptions'

    put:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Updates a subscription information'

      description: 'Updates a subscription.'

      operationId: distanceSubPUT
@@ -517,10 +554,24 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                distanceNotificationSubscription:

              $ref: '#/components/schemas/DistanceNotificationSubscription'

            example:

              distanceNotificationSubscription:

                clientCorrelator: '0123'

                callbackReference:

                  callbackData: '1234'

                  notifyURL: 'http://my.callback.com/location-distance/some-id'

                monitoredAddress:

                - '10.10.0.1'

                - '10.1.0.1'

                checkImmediate: true

                criteria: 'AllWithinDistance'

                distance: 100

                frequency: 10

                referenceAddress:

                - '10.100.0.1'

                resourceURL: "http://[hostIP]/sbox-xyz123/location/v2/subscriptions/distance/subscription123"

                trackingAccuracy: 10

      parameters:

        - $ref: '#/components/parameters/Path.SubscrId'

      responses:
@@ -552,7 +603,7 @@ paths: 
      x-swagger-router-controller: 'subscriptions'

    delete:

      tags:

      - 'unsupported'

      - 'location'

      summary: 'Cancel a subscription'

      description: 'Method to delete a subscription.'

      operationId: distanceSubDELETE

js-apps/swagger-ui/wais-api.yaml

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ info: 
  description: 'The ETSI MEC ISG MEC028 WLAN Access Information API described using OpenAPI

<p>**Note**<br>MEC Sandbox supports all WAI API endpoints and a limited set of subscrition types; complete details on the WAI API can be found on [ETSI Forge](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/028/02.01.01_60/gs_mec028v020101p.pdf).

<p>Supported subscriptions types:

<p> - AssocStaSubscription'

<p> - AssocStaSubscription

<p> - StaDataRateSubscription'

  license:

    name: BSD-3-Clause

    url: 'https://forge.etsi.org/legal-matters'