Commit 1ce14752 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents 4b74b9cd 67c0271c

config/.meepctl-repocfg.yaml

+204 −125
Original line number Diff line number Diff line 
version: 1.7.4

version: 1.8.0

repo:

  name: AdvantEDGE
@@ -182,11 +182,16 @@ repo: 
        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

        # AdvantEDGE resources included in Docker container image

          - name: 'AdvantEDGE Auth Service REST API'

            file: go-apps/meep-auth-svc/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-auth-svc/entrypoint.sh

          # location of REST API permissions file

          'permissions.yaml': config/permissions.yaml

      meep-ingress-certs:
@@ -224,9 +229,6 @@ repo: 
        codecov: true

        # supports linting

        lint: true

        # location of API specification

        api:

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

        # list of dependencies pods to monitor

        dependency-pods:

          - meep-cert-manager
@@ -245,18 +247,29 @@ repo: 
          - meep-mon-engine

          - meep-platform-ctrl

          - meep-virt-engine

          # - meep-webhook

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

          # - meep-rnis

          # - meep-wais

          # - meep-ams

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

          # - meep-app-enablement

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'

            file: go-apps/meep-mon-engine/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-mon-engine/entrypoint.sh

      meep-platform-ctrl:

        # location of source code

        src: go-apps/meep-platform-ctrl
@@ -276,13 +289,18 @@ repo: 
        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

        # AdvantEDGE resources included in Docker container image

          - name: 'AdvantEDGE Platform Controller REST API'

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

        # location of user supplied API specifications

        user-api:

        # resources available to docker container image

        docker-data:

          # location of AdvantEDGE swagger files

          swagger: bin/meep-platform-swagger-ui

          # location of entry script

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

          # location of Swagger UI

          swagger: js-apps/meep-swagger-ui

          # location of AdvantEDGE frontend

          frontend: bin/meep-frontend

      meep-virt-engine:
@@ -315,21 +333,23 @@ repo: 
          meep-mg-manager: charts/meep-mg-manager

          meep-rnis: charts/meep-rnis

          meep-wais: charts/meep-wais

          meep-ams: charts/meep-ams

          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

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

        # 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-wais

          # - meep-rnis

          # - meep-wais

          # - meep-ams

          - meep-sandbox-ctrl

          - meep-app-enablement

          # - meep-tc-engine

          # - meep-app-enablement

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -343,15 +363,15 @@ repo: 
        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: false

        build: true

        # enable meepctl dockerize

        dockerize: false

        dockerize: true

        # enable meepctl deploy/delete

        deploy: false

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        # supports linting

        lint: false

        lint: true



    # Javascript Applications

    js-apps:
@@ -377,49 +397,6 @@ repo: 
          meep-mon-engine-api: js-packages/meep-mon-engine-client

          meep-gis-engine-api: js-packages/meep-gis-engine-client

          meep-auth-svc-client: js-packages/meep-auth-svc-client

      meep-platform-swagger-ui:

        # location of source code

        src: js-apps/meep-swagger-ui

        # location of binary

        bin: bin/meep-platform-swagger-ui

        # enable meepctl build

        build: true

        # enable meepctl dockerize -> bundled with meep-platform-ctrl

        dockerize: false

        # enable meepctl deploy/delete -> deployed via meep-platform-ctrl

        deploy: false

        # supports linting

        lint: false

        # list of platform level swagger specs

        api-bundle:

          - core.go-apps.meep-auth-svc

          - core.go-apps.meep-platform-ctrl

          - core.go-apps.meep-mon-engine

      meep-sandbox-swagger-ui:

        # location of source code

        src: js-apps/meep-swagger-ui

        # location of binary

        bin: bin/meep-sandbox-swagger-ui

        # enable meepctl build

        build: true

        # enable meepctl dockerize -> bundled with meep-sandbox-ctrl

        dockerize: false

        # enable meepctl deploy/delete -> deployed via meep-sandbox-ctrl

        deploy: false

        # supports linting

        lint: false

        # list of sandbox level swagger specs

        api-bundle:

          - sandbox.go-apps.meep-sandbox-ctrl

          - sandbox.go-apps.meep-gis-engine

          - sandbox.go-apps.meep-loc-serv

          - sandbox.go-apps.meep-rnis

          - 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



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

  #  Sandbox Subsystem
@@ -428,6 +405,44 @@ repo: 


    # Go Applications

    go-apps:

      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 specifications

        api:

          - name: 'AdvantEDGE MEC Application Support REST API'

            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

        # 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

        # resources available to docker container image

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-app-enablement/entrypoint.sh

      meep-gis-engine:

        # location of source code

        src: go-apps/meep-gis-engine
@@ -444,12 +459,19 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE GIS Engine REST API'

            file: go-apps/meep-gis-engine/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-gis-engine/entrypoint.sh

      meep-loc-serv:

        # location of source code

        src: go-apps/meep-loc-serv
@@ -469,12 +491,21 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE Location Service REST API'

            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

          'entrypoint.sh': go-apps/meep-loc-serv/entrypoint.sh

      meep-metrics-engine:

        # location of source code

        src: go-apps/meep-metrics-engine
@@ -494,12 +525,21 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE Metrics Service REST API'

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

          - name: 'AdvantEDGE Metrics Service Notification REST API'

            file: go-packages/meep-metrics-engine-notification-client/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-metrics-engine/entrypoint.sh

      meep-mg-manager:

        # location of source code

        src: go-apps/meep-mg-manager
@@ -516,12 +556,21 @@ repo: 
        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: false

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE Mobility Group Service REST API'

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

          - name: 'AdvantEDGE Mobility Group Application Client REST API'

            file: go-packages/meep-mg-app-client/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-mg-manager/entrypoint.sh

      meep-rnis:

        # location of source code

        src: go-apps/meep-rnis
@@ -541,12 +590,21 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE Radio Network Information Service REST API'

            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

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

      meep-wais:

        # location of source code

        src: go-apps/meep-wais
@@ -566,12 +624,55 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE WLAN Access Information Service 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-ams:

        # location of source code

        src: go-apps/meep-ams

        # location of binary

        bin: bin/meep-ams

        # location of deployment chart

        chart: charts/meep-ams

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

        chart-user-values: meep-ams.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 Application Mobility REST API'

            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

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

      meep-sandbox-ctrl:

        # location of source code

        src: go-apps/meep-sandbox-ctrl
@@ -588,15 +689,21 @@ repo: 
        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: true

        # location of API specification

        # location of API specifications

        api:

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

          - name: 'AdvantEDGE Sandbox Controller REST API'

            file: go-apps/meep-sandbox-ctrl/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-ctrl/entrypoint.sh

          swagger: bin/meep-sandbox-swagger-ui

          # location of Swagger UI

          swagger: js-apps/meep-swagger-ui

      meep-tc-engine:

        # location of source code

        src: go-apps/meep-tc-engine
@@ -613,7 +720,7 @@ repo: 
        # enable meepctl deploy/delete

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: false

        codecov: true

        # supports linting

        lint: false

      meep-tc-sidecar:
@@ -631,33 +738,6 @@ 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

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



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

  #  Dependencies
@@ -875,17 +955,11 @@ repo: 
        src: go-packages/meep-metrics-engine-notification-client

        # supports linting

        lint: false

        # location of API specification

        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:

          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
@@ -951,6 +1025,11 @@ repo: 
        src: go-packages/meep-wais-client

        # supports linting

        lint: false

      meep-ams-client:

        # location of source code

        src: go-packages/meep-ams-client

        # supports linting

        lint: false

      meep-watchdog:

        # location of source code

        src: go-packages/meep-watchdog

config/api/ams-api.yaml

0 → 100644
+1058 −0

File added.

Preview size limit exceeded, changes collapsed.

config/api/app-support.yaml

0 → 100644
+1194 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+18 −6
Original line number Diff line number Diff line
@@ -245,6 +245,9 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                circleNotificationSubscription:

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

            example:

              circleNotificationSubscription:
@@ -350,6 +353,9 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                circleNotificationSubscription:

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

            example:

              circleNotificationSubscription:
@@ -447,6 +453,9 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                distanceNotificationSubscription:

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

            example:

              distanceNotificationSubscription:
@@ -553,6 +562,9 @@ paths: 
        content:

          application/json:

            schema:

              type: object

              properties:

                distanceNotificationSubscription:

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

            example:

              distanceNotificationSubscription:
@@ -2328,14 +2340,14 @@ components: 
        nanoSeconds:

          description: 'The nanoseconds part of the time. Time is defined as

            Unix-time since January 1, 1970, 00:00:00 UTC.'

          format: int32

          format: uint32

          type: integer

          x-etsi-mec-cardinality: '1'

          x-etsi-mec-origin-type: Uint32

        seconds:

          description: 'The seconds part of the time. Time is defined as

            Unix-time since January 1, 1970, 00:00:00 UTC.'

          format: int32

          format: uint32

          type: integer

          x-etsi-mec-cardinality: '1'

          x-etsi-mec-origin-type: Uint32

js-apps/swagger-ui/rnis-api.yaml→config/api/rnis-api.yaml

+46 −46

File changed and moved.

Preview size limit exceeded, changes collapsed.