Commit 5e89e9ab authored by Laurent Velez's avatar Laurent Velez
Browse files

Merge branch 'STF625' into 'master' 

Stf625ToMaster

See merge request mec/mec-sandbox!2
parents 5e0d69e8 0780bf94

README.md

+4 −2
Changes for README.md: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ MEC Sandbox has the following prerequisites: 
   - **NOTE:** Once the kubernetes secrets have been created, it is recommended to remove the config files containing the clear-text secrets

1. Build & Deploy AdvantEDGE:

   - For more details see [AdvantEDGE Deployment Workflow](https://interdigitalinc.github.io/AdvantEDGE/docs/platform-mgmt/mgmt-workflow/)

   - Build meepctl:

   - Build and Configure meepctl:

     - `~/AdvantEDGE/go-apps/meepctl/install.sh`

     - `meepctl config ip <VM private IP address>`

     - `meepctl config gitdir <full path to ~/AdvantEDGE>`

   - Deploy dependency pods:

     - `meepctl deploy dep`

   - Build & Dockerize:
@@ -213,7 +215,7 @@ Manage MEC Sandbox admin user accounts as follows: 
1. SSH into _meep-postgis-0_ pod

1. Login & connect to PostgreSQL user role database:

   - `psql -U postgres`

   - `\c meep_platform_ctrl`

   - `\c meep_auth_svc`

1. Add entry to give _admin_ rights to a specific username from a specific provider. Examples:

   - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('github', 'user1', '', 'sbx-user1','admin');`

   - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('gitlab', 'user2', '', 'sbx-user2','admin');`

config/.meepctl-repocfg.yaml

+49 −3
Changes for config/.meepctl-repocfg.yaml: 49 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ repo: 
  #  Core Subsystem

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

  core:



    # Go Applications

    go-apps:

      meep-auth-svc:
@@ -285,6 +284,7 @@ repo: 
          - meep-sandbox-ctrl

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -363,6 +363,7 @@ repo: 
          meep-tc-engine: charts/meep-tc-engine

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

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

          meep-vis: charts/meep-vis

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -375,6 +376,7 @@ repo: 
          - meep-sandbox-ctrl

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -427,7 +429,6 @@ repo: 
  #  Sandbox Subsystem

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

  sandbox:



    # Go Applications

    go-apps:

      meep-ams:
@@ -763,6 +764,42 @@ repo: 
        docker-data:

          # location of entry script

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

      meep-vis:

        # location of source code

        src: go-apps/meep-vis

        # location of binary

        bin: bin/meep-vis

        # location of deployment chart

        chart: charts/meep-vis

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

        chart-user-values: meep-vis.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 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

          # location of grid map file

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



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

  #  Dependencies
@@ -927,7 +964,6 @@ repo: 
  #  Packages

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

  packages:



    # Go Packages

    go-packages:

      meep-ams-client:
@@ -1095,6 +1131,16 @@ repo: 
        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-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

config/api/ams-api.yaml

+1290 −697

File changed.

Preview size limit exceeded, changes collapsed.

config/api/app-support.yaml

+1553 −831

File changed.

Preview size limit exceeded, changes collapsed.

config/api/loc-serv-api.yaml

+23 −51
Changes for config/api/loc-serv-api.yaml: 23 added lines, 51 removed lines.
Original line number Diff line number Diff line
@@ -3,15 +3,16 @@ info: 
  contact:

    url: https://forge.etsi.org/rep/mec/gs013-location-api

  title: ETSI GS MEC 013 - Location API

  version: 2.1.1

  description: 'The ETSI MEC ISG MEC013 Location API described using OpenAPI.

<p>**Note**<br>MEC Sandbox supports all Location API endpoints; complete details on Location API can be found on [ETSI Forge](http://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.01.01_60/gs_mec013v020101p.pdf)'

  version: 2.2.1

  description: |

    'The ETSI MEC ISG MEC013 Location API described using OpenAPI.

    <p>**Note**<br>MEC Sandbox supports all Location API endpoints; complete details on Location API can be found on [ETSI Forge](https://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.02.01_60/gs_mec013v020201p.pdf)'

  license:

    name: BSD-3-Clause

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

externalDocs:

  description: ETSI MEC013 V2.1.1 Location API

  url: 'http://www.etsi.org/deliver/etsi_gs/MEC/001_099/013/02.01.01_60/gs_mec013v020101p.pdf'

  description: ETSI MEC013 V2.2.1 Location API

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

servers:

  - url: 'https://localhost/sandboxname/location/v2'

tags:
@@ -1924,17 +1925,17 @@ components: 
    LocationInfo:

      properties:

        accuracy:

          description: Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if "shape" equals 4, 5 or 6

          description: Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if "shape" equals 4, 5 or 6

          type: integer

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt

        accuracyAltitude:

          description: Altitude accuracy / uncertainty of location provided in meters, as defined in [14]. Present only if "shape" equals 3 or 4

          description: Altitude accuracy / uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if "shape" equals 3 or 4

          type: integer

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt

        accuracySemiMinor:

          description: Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in [14]. Present only if "shape" equals 4, 5 or 6

          description: Horizontal accuracy / (semi-major) uncertainty of location provided in meters, as defined in ETSI TS 123 032 [14]. Present only if "shape" equals 4, 5 or 6

          type: integer

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt
@@ -1945,7 +1946,7 @@ components: 
          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: Float

        confidence:

          description: Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in [14]. Present only if "shape" equals 1, 4 or 6

          description: Confidence by which the position of a target entity is known to be within the shape description, expressed as a percentage and defined in ETSI TS 123 032 [14]. Present only if "shape" equals 1, 4 or 6

          type: integer

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt
@@ -1983,12 +1984,12 @@ components: 
          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt

        orientationMajorAxis:

          description: "Angle of orientation of the major axis, expressed in the range 0\xB0 to 180\xB0, as defined in [14]. Present only if \"shape\" equals 4 or 6"

          description: "Angle of orientation of the major axis, expressed in the range 0\xB0 to 180\xB0, as defined in ETSI TS 123 032 [14]. Present only if \"shape\" equals 4 or 6"

          type: integer

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt

        shape:

          description: 'Shape information, as detailed in [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON'

          description: 'Shape information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate: <p>1 = ELLIPSOID_ARC <p>2 = ELLIPSOID_POINT <p>3 = ELLIPSOID_POINT_ALTITUDE <p>4 = ELLIPSOID_POINT_ALTITUDE_UNCERT_ELLIPSOID <p>5 = ELLIPSOID_POINT_UNCERT_CIRCLE <p>6 = ELLIPSOID_POINT_UNCERT_ELLIPSE <p>7 = POLYGON'

          type: integer

          x-etsi-mec-cardinality: '1'

          x-etsi-mec-origin-type: Enum_inlined
@@ -2000,35 +2001,35 @@ components: 
          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: UnsignedInt

        velocity:

          description: "Structure with attributes relating to the target entity\u2019s velocity, as defined in [14]."

          description: "Structure with attributes relating to the target entity\u2019s velocity, as defined in ETSI TS 123 032 [14]."

          properties:

            bearing:

              description: "Bearing, expressed in the range 0\xB0 to 360\xB0, as defined in [14]."

              description: "Bearing, expressed in the range 0\xB0 to 360\xB0, as defined in ETSI TS 123 032 [14]."

              type: integer

              x-etsi-mec-cardinality: '1'

              x-etsi-mec-origin-type: UnsignedInt

            horizontalSpeed:

              description: Horizontal speed, expressed in km/h and defined in [14].

              description: Horizontal speed, expressed in km/h and defined in ETSI TS 123 032 [14].

              type: integer

              x-etsi-mec-cardinality: '1'

              x-etsi-mec-origin-type: UnsignedInt

            uncertainty:

              description: Horizontal uncertainty, as defined in [14]. Present only if "velocityType" equals 3 or 4

              description: Horizontal uncertainty, as defined in ETSI TS 123 032 [14]. Present only if "velocityType" equals 3 or 4

              type: integer

              x-etsi-mec-cardinality: 0..1

              x-etsi-mec-origin-type: UnsignedInt

            velocityType:

              description: 'Velocity information, as detailed in [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT'

              description: 'Velocity information, as detailed in ETSI TS 123 032 [14], associated with the reported location coordinate: <p>1 = HORIZONTAL <p>2 = HORIZONTAL_VERTICAL <p>3 = HORIZONTAL_UNCERT <p>4 = HORIZONTAL_VERTICAL_UNCERT'

              type: integer

              x-etsi-mec-cardinality: '1'

              x-etsi-mec-origin-type: Enum_inlined

            verticalSpeed:

              description: Vertical speed, expressed in km/h and defined in [14]. Present only if "velocityType" equals 2 or 4

              description: Vertical speed, expressed in km/h and defined in ETSI TS 123 032 [14]. Present only if "velocityType" equals 2 or 4

              type: integer

              x-etsi-mec-cardinality: 0..1

              x-etsi-mec-origin-type: Int

            verticalUncertainty:

              description: Vertical uncertainty, as defined in [14]. Present only if "velocityType" equals 4

              description: Vertical uncertainty, as defined in ETSI TS 123 032 [14]. Present only if "velocityType" equals 4

              type: integer

              x-etsi-mec-cardinality: 0..1

              x-etsi-mec-origin-type: UnsignedInt
@@ -2203,6 +2204,9 @@ components: 
          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: URI

      type: object

      required:

      - detail

      - status

    RetrievalStatus:

      enum:

      - Retrieved
@@ -2233,31 +2237,6 @@ components: 
      - messageId

      - text

      type: object

    SubscriptionCancellationNotification:

      description: A type containing the subscription cancellation notification.

      properties:

        address:

          description: Address of terminal if the error applies to an individual terminal.

          type: string

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: anyURI

        callbackData:

          description: CallbackData if passed by the application in the receiptRequest element during the associated subscription operation

          type: string

          x-etsi-mec-cardinality: 0..1

          x-etsi-mec-origin-type: string

        link:

          description: Link to other resources that are in relationship with the resource.

          items:

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

          type: array

          x-etsi-mec-cardinality: 0..N

          x-etsi-mec-origin-type: Link

        reason:

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

      required:

      - terminalLocation

      type: object

    SubscriptionNotification:

      description: A type containing the notification subscription.

      properties:
@@ -2328,13 +2307,6 @@ components: 
      - address

      - locationRetrievalStatus

      type: object

    TerminalLocationList:

      description: Collection of the terminal locations.

      items:

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

      type: array

      x-etsi-mec-cardinality: 1..N

      x-etsi-mec-origin-type: TerminalLocation

    TimeStamp:

      properties:

        nanoSeconds:
@@ -2391,7 +2363,7 @@ components: 
          description: Self-referring URL, see note 1.

          type: string

          x-etsi-mec-cardinality: '1'

          x-etsi-mec-origin-type: String

          x-etsi-mec-origin-type: AnyURI

        timestamp:

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

        zoneId: