Merging to master before to start STF 685/STF 707 developments

Merging to master before to start STF 685/STF 707 developments

Merge request reports

Loading
+40 −78
Changes for config/api/capif-mgmt.yaml: 40 added lines, 78 removed lines.
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ paths:
              aefProfiles:
                - aefId: "sandboxTransport"
                  versions:
                    - "3.1.1"
                    - apiVersion: "3.1.1"
                  interfaceDescriptions:
                    uris:
                      - "http://my.callback.com/sbx2cmq8bn/mep1/vis/v2/"
@@ -440,13 +440,11 @@ paths:
              aefProfiles:
                - aefId: "sandboxTransport"
                  versions:
                    - "3.1.1"
                    - apiVersion: "3.1.1"
                  interfaceDescriptions:
                    uris:
                      - "http://my.callback.com/sbx2cmq8bn/mep1/vis/v2/"
                    fqdn: null
                    addresses: null
                    alternative: null
                  - fqdn: "my.callback.com"
                    port: 80
                    apiPrefix: "/sbx2cmq8bn/mep1/vis/v2"
                  vendorSpecific-urn:etsi:mec:capifext:transport-info:
                    name: "REST"
                    type: "REST_HTTP"
@@ -631,13 +629,11 @@ paths:
              aefProfiles:
                - aefId: "sandboxTransport"
                  versions:
                    - "3.1.1"
                    - apiVersion: "3.1.1"
                  interfaceDescriptions:
                    uris:
                      - "http://my.callback.com/sbx2cmq8bn/mep1/vis/v2/"
                    fqdn: null
                    addresses: null
                    alternative: null
                  - fqdn: "my.callback.com"
                    port: 80
                    apiPrefix: "/sbx2cmq8bn/mep1/vis/v2"
                  vendorSpecific-urn:etsi:mec:capifext:transport-info:
                    name: "REST"
                    type: "REST_HTTP"
@@ -1323,18 +1319,21 @@ components:
          description: "AEF identifier. Shall be set to the value of the 'id' attribute as defined in clause 8.1.2.3."
        versions:
          type: array
          items:
            type: string
            description: "API version. This array shall contain a single entry."
          minItems: 1
          maxItems: 1
          items:
            type: object
            properties:
              apiVersion:
                type: string
                description: "The version of the API as per clause 8.1.2.2"
            required:
              - apiVersion
        interfaceDescriptions:
          description: This type represents information about a transport endpoint
          oneOf:
          - $ref: '#/components/schemas/EndPointInfo.Uris'
          - $ref: '#/components/schemas/EndPointInfo.Fqdn'
          - $ref: '#/components/schemas/EndPointInfo.Addresses'
          - $ref: '#/components/schemas/EndPointInfo.Alternative'
          type: array
          items:
            $ref: '#/components/schemas/InterfaceDescription'
          x-etsi-notes: "NOTE:\tExactly one of \"uris\", \"fqdn\", \"addresses\" or\
            \ \"alternative\" shall be present."
        vendorSpecific-urn:etsi:mec:capifext:transport-info :
@@ -1434,69 +1433,32 @@ components:
      - RPC
      - RPC_STREAMING
      - WEBSOCKET
    EndPointInfo.Alternative:
      title: EndPointInfo.Alternative
      required:
      - alternative
    InterfaceDescription:
      type: object
      description: 3GPP-compliant InterfaceDescription (TS 29.222 Table 8.2.4.2.3-1)
      properties:
        alternative:
          type: object
          description: "Entry point information of the service in a format defined\
            \ by an implementation, or in an external specification. See note."
      description: This type represents information about a transport endpoint.
    EndPointInfo.Address:
      title: EndPointInfo.Address
      required:
      - host
      - port
      type: object
      properties:
        host:
        ipv4Addr:
          type: string
          description: Host portion of the address
          example: "[\"192.0.2.0\"]"
        port:
          type: integer
          description: Port portion of the address
      description: A IP address and port pair
    EndPointInfo.Addresses:
      title: EndPointInfo.Addresses
      required:
      - addresses
      type: object
      properties:
        addresses:
          type: array
          description: Entry point information of the service as one or more pairs
            of IP address and port. See note.
          items:
            $ref: '#/components/schemas/EndPointInfo.Address'
    EndPointInfo.Fqdn:
      title: EndPointInfo.Fqdn
      required:
      - fqdn
      type: object
      properties:
          format: ipv4
          description: IPv4 address
        ipv6Addr:
          type: string
          format: ipv6
          description: IPv6 address
        fqdn:
          type: array
          description: Fully Qualified Domain Name of the service. See note.
          items:
          type: string
      description: 'This type represents information about a transport endpoint. '
    EndPointInfo.Uris:
      title: EndPointInfo.Uris
      required:
      - uris
      type: object
      properties:
        uris:
          type: array
          description: "Entry point information of the service as string, formatted\
            \ according to URI syntax"
          items:
          description: Fully Qualified Domain Name
        port:
          type: integer
          description: TCP port number
        apiPrefix:
          type: string
      description: This type represents information about a transport endpoint.
          description: Optional API prefix path (starts with '/')
      oneOf:
        - required: [ipv4Addr]
        - required: [ipv6Addr]
        - required: [fqdn]
      additionalProperties: false
  responses:
    "400":
      description: Bad Request. It is used to indicate that incorrect parameters were
+2858 −0

File added.

Preview size limit exceeded, changes collapsed.

+10 −10
Changes for config/api/loc-serv-api.yaml: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ paths:
                      example:
                        userAreaNotification:
                            notificationType: 'UserAreaNotification'
                            timestamp:
                            timeStamp:
                              seconds: 1673507343
                              nanoSeconds": 0
                            address: 'acr:10.0.0.1'
@@ -697,7 +697,7 @@ paths:
                      example:
                        userDistanceNotification:
                          notificationType: 'UserDistanceNotification'
                          timestamp:
                          timeStamp:
                            seconds: 1673507343
                            nanoSeconds": 0
                          monitoredUsers: 
@@ -705,7 +705,7 @@ paths:
                                address: 'acr:10.0.0.1'
                                accessPointId: '001010000000000000000000000000001'
                                zoneId: 'zone01'
                                timestamp:
                                timeStamp:
                                  seconds: 1673507343
                                  nanoSeconds": 0
                              resourceURL: 'http://meAppServer.example.com/location/v3/queries/users'
@@ -1033,7 +1033,7 @@ paths:
                      example:
                        userLocationEventNotification:
                          notificationType: 'UserLocationEventNotification'
                          timestamp:
                          timeStamp:
                            seconds: 1673507343
                            nanoseconds: 0
                          address: 'acr:10.0.0.1'
@@ -1335,7 +1335,7 @@ paths:
                      example:
                        - zoneLocationEventNotification:
                            notificationType: 'ZoneLocationEventNotification'
                            timestamp:
                            timeStamp:
                              seconds: 1673507343
                              nanoseconds: 0
                            address: 'acr:10.0.0.1'
@@ -2472,7 +2472,7 @@ components:
          type: integer
          x-etsi-mec-cardinality: '1'
          x-etsi-mec-origin-type: Enum_inlined
        timestamp:
        timeStamp:
          $ref: '#/components/schemas/TimeStamp'
        uncertaintyRadius:
          description: Present only if "shape" equals 6
@@ -2812,7 +2812,7 @@ components:
      type: object

    TerminalDistance:
      description: A type containing information about the distance from a terminal to a location or between two terminals, in addition the accuracy and a timestamp of the information are provided.
      description: A type containing information about the distance from a terminal to a location or between two terminals, in addition the accuracy and a timeStamp of the information are provided.
      properties:
        accuracy:
          description: Accuracy of the provided distance in meters
@@ -2824,7 +2824,7 @@ components:
          type: integer
          x-etsi-mec-cardinality: 1
          x-etsi-mec-origin-type: integer
        timestamp:
        timeStamp:
          $ref: '#/components/schemas/TimeStamp'
      required:
      - distance
@@ -3084,7 +3084,7 @@ components:
          type: string
          x-etsi-mec-cardinality: '1'
          x-etsi-mec-origin-type: AnyURI
        timestamp:
        timeStamp:
          $ref: '#/components/schemas/TimeStamp'
        zoneId:
          description: The identity of the zone the user is currently within, see note 1.
@@ -3096,7 +3096,7 @@ components:
      - accessPointId
      - zoneId
      - resourceURL
      - timestamp
      - timeStamp
      type: object
      x-etsi-notes: "NOTE 1:\tAs specified in [5], clause 5.2.2.7.\nNOTE 2: \tAs specified in [5], clause 5.2.2.5."
      x-etsi-ref: 6.2.2
+1174 −0

File added.

Preview size limit exceeded, changes collapsed.

+1259 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading
Loading