Commit a0b98bec authored by Jesus de Gregorio's avatar Jesus de Gregorio
Browse files

SA#104

parent 102dd0a6
Loading
Loading
Loading
Loading
Loading
+12 −6
Original line number Diff line number Diff line
openapi: 3.0.0
info:
  title: M1_MetricsReportingProvisioning
  version: 2.1.1
  version: 2.2.0
  description: |
    5GMS AF M1 Metrics Reporting Provisioning API
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -10,7 +10,7 @@ tags:
  - name: M1_MetricsReportingProvisioning
    description: '5G Media Streaming: Provisioning (M1) APIs: Metrics Reporting Provisioning'
externalDocs:
  description: 'TS 26.512 V17.8.0; 5G Media Streaming (5GMS); Protocols'
  description: 'TS 26.512 V17.9.0; 5G Media Streaming (5GMS); Protocols'
  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/'
servers:
  - url: '{apiRoot}/3gpp-m1/v2'
@@ -136,7 +136,10 @@ components:
        dataNetworkName:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
        reportingInterval:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
          minimum: 0
          exclusiveMinimum: true
          allOf:
            - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        samplePercentage:
          $ref: 'TS26512_CommonData.yaml#/components/schemas/Percentage'
        urlFilters:
@@ -145,9 +148,12 @@ components:
            type: string
          minItems: 1
        samplingPeriod:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
          minimum: 0
          exclusiveMinimum: true
          allOf:
            - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        metrics:
          type: array
          items:
            type: string
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
          minItems: 1
+6 −3
Original line number Diff line number Diff line
openapi: 3.0.0
info:
  title: M5_ServiceAccessInformation
  version: 2.4.1
  version: 2.5.0
  description: |
    5GMS AF M5 Service Access Information API
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -10,7 +10,7 @@ tags:
  - name: M5_ServiceAccessInformation
    description: '5G Media Streaming: Media Session Handling (M5) APIs: Service Access Information'
externalDocs:
  description: 'TS 26.512 V17.8.0; 5G Media Streaming (5GMS); Protocols'
  description: 'TS 26.512 V17.9.0; 5G Media Streaming (5GMS); Protocols'
  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/'
servers:
  - url: '{apiRoot}/3gpp-m5/v2'
@@ -136,6 +136,7 @@ components:
          items:
            type: object
            required:
            - metricsReportingConfigurationId
            - serverAddresses
            - scheme
            - samplePercentage
@@ -143,6 +144,8 @@ components:
            - samplingPeriod
            - metrics
            properties:
              metricsReportingConfigurationId:
                $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
              serverAddresses:
                $ref: '#/components/schemas/ServerAddresses'
              sliceScope:
@@ -168,7 +171,7 @@ components:
              metrics:
                type: array
                items:
                  type: string
                  $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
        networkAssistanceConfiguration:
          type: object
          required: 
+16 −6
Original line number Diff line number Diff line
@@ -2,14 +2,14 @@ openapi: 3.0.0

info:
  title: 'MBS User Service Announcement'
  version: 1.3.1
  version: 1.4.0
  description: |
    MBS User Service Announcement Element units.
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.

externalDocs:
  description: 3GPP TS 26.517 V17.5.1; 5G Multicast-Broadcast User Services; Protocols and Formats
  description: 3GPP TS 26.517 V17.6.0; 5G Multicast-Broadcast User Services; Protocols and Formats
  url: http://www.3gpp.org/ftp/Specs/archive/26_series/26.517/
paths:
  /user-service-descriptions:
@@ -211,21 +211,31 @@ components:
    AvailabilityInformation:
      type: object
      properties:
        mbsServiceArea:
        mbsServiceAreas:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/MbsServiceArea'
          minItems: 1
        mbsFSAId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/MbsFsaId'
        radioFrequency:
        nrParameters:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
            $ref: '#/components/schemas/NrParameterSet'
          minItems: 1
      required:
        - radioFrequency
        - nrParameters

    NrParameterSet:
      type: object
      properties:
        freqBandIndicator:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        aRFCNValue:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
      required:
        - freqBandIndicator
        - aRFCNValue

    ObjectRepairParameters:
      type: object
+61 −6
Original line number Diff line number Diff line
openapi: 3.0.0
info:
  title: Data Collection and Reporting Common Data Types
  version: 1.0.1
  version: 1.0.2
  description: |
    Data Collection and Reporting Common Data Types
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.
tags:
  - name: Data Collection and Reporting Common Data Types
    description: 'Data Collection and Reporting: Common Data Types'
externalDocs:
  description: 'TS 26.532 V17.2.0; Data Collection and Reporting; Protocols and Formats'
  description: 'TS 26.532 V17.3.0; Data Collection and Reporting; Protocols and Formats'
  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.532/'
paths: {}
components:
@@ -32,6 +32,33 @@ components:
        locationFilter:
          $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G'

    DataReportingCondition:
      description: "A condition that triggers data reporting by a data collection client to the Data Collection AF."
      type: object
      properties:
        type:
          $ref: '#/components/schemas/DataReportingConditionType'
        period:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        parameter:
          type: string
        threshold:
          anyOf:
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Double'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Int32'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Int64'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint16'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint64'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        reportWhenBelow:
          type: boolean
        eventTrigger:
          $ref: '#/components/schemas/DataReportingEventTrigger'
      required:
        - type

    DataReportingRule:
      description: "Instructions on how collected UE data is to be reported by the data collection client to the Data Collection AF."
      type: object
@@ -42,8 +69,6 @@ components:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
        dataPackagingStrategy:
          type: string
      required:
        - reportingFormat

    #####################################
    # Clause 5.4.3: Enumerated data types
@@ -53,7 +78,37 @@ components:
      description: "Indicating a type of data collection client that reports UE data to the Data Collection AF."
      anyOf:
        - type: string
          enum: [DIRECT, INDIRECT, APPLICATION_SERVER]
          enum:
            - DIRECT
            - INDIRECT
            - APPLICATION_SERVER
        - type: string
          description: >
            This string provides forward-compatibility with future
            extensions to the enumeration but is not used to encode
            content defined in the present version of this API.

    DataReportingConditionType:
      description: "The type of condition that triggers reporting by a data collection client to the Data Collection AF."
      anyOf:
      - type: string
        enum:
          - INTERVAL
          - THRESHOLD
          - EVENT
      - type: string
        description: >
            This string provides forward-compatibility with future
            extensions to the enumeration but is not used to encode
            content defined in the present version of this API.

    DataReportingEventTrigger:
      description: "The type of event that triggers reporting by a data collection client to the Data Collection AF."
      anyOf:
      - type: string
        enum:
          - LOCATION
          - DESTINATION
      - type: string
        description: >
            This string provides forward-compatibility with future
+42 −97
Original line number Diff line number Diff line
openapi: 3.0.0
info:
  title: Ndcaf_DataReporting
  version: 1.2.0
  version: 1.2.1
  description: |
    Data Collection AF: Data Collection and Reporting Configuration API and Data Reporting API
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
    All rights reserved.

tags:
@@ -12,7 +12,7 @@ tags:
    description: 'Data Collection and Reporting: Client Configuration and Data Reporting (R2/R3/R4) APIs'

externalDocs:
  description: 'TS 26.532 V17.2.0; Data Collection and Reporting; Protocols and Formats'
  description: 'TS 26.532 V17.3.0; Data Collection and Reporting; Protocols and Formats'
  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.532/'

servers:
@@ -213,9 +213,13 @@ components:
      type: object
      properties:
        sessionId:
          $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
          readOnly: true
          allOf:
            - $ref: 'TS26512_CommonData.yaml#/components/schemas/ResourceId'
        validUntil:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DateTime'
          readOnly: true
          allOf:
            - $ref: 'TS29571_CommonData.yaml#/components/schemas/DateTime'
        externalApplicationId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/ApplicationId'
        supportedDomains:
@@ -224,81 +228,37 @@ components:
            $ref: '#/components/schemas/DataDomain'
          minItems: 0
        samplingRules:
          type: array
          items:
          readOnly: true
          type: object
            required:
              - dataDomain
              - rules
            properties:
              dataDomain:
                $ref: '#/components/schemas/DataDomain'
              rules:
          additionalProperties:
            type: array
            items:
              $ref: 'TS26532_CommonData.yaml#/components/schemas/DataSamplingRule'
            minItems: 0
        reportingConditions:
          type: array
          items:
          readOnly: true
          type: object
            required:
              - dataDomain
              - conditions
            properties:
              dataDomain:
                $ref: '#/components/schemas/DataDomain'
              conditions:
          additionalProperties:
            type: array
            items:
                  $ref: '#/components/schemas/ReportingCondition'
              $ref: 'TS26532_CommonData.yaml#/components/schemas/DataReportingCondition'
            minItems: 0
        reportingRules:
          type: array
          items:
          readOnly: true
          type: object
            required:
              - dataDomain
              - rules
            properties:
              dataDomain:
                $ref: '#/components/schemas/DataDomain'
              rules:
          additionalProperties:
            type: array
            items:
              $ref: 'TS26532_CommonData.yaml#/components/schemas/DataReportingRule'
            minItems: 0
      required:
        - sessionId
        - validUntil
        - externalApplicationId
        - supportedDomains
        - samplingRules
        - reportingConditions

    ReportingCondition:
      description: "A condition that triggers data reporting by a data collection client to the Data Collection AF."
      type: object
      properties:
        type:
          $ref: '#/components/schemas/ReportingConditionType'
        period:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        parameter:
          type: string
        threshold:
          anyOf:
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Double'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Int32'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Int64'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint16'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint64'
          - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        reportWhenBelow:
          type: boolean
        eventTrigger:
          $ref: '#/components/schemas/ReportingEventTrigger'
      required:
        - type
        - reportingRules

    DataReport:
      description: "A data report sent by a data collection client to the Data Collection AF."
@@ -348,29 +308,14 @@ components:
      description: "A data reporting domain."
      anyOf:
      - type: string
        enum: [SERVICE_EXPERIENCE, LOCATION, COMMUNICATION, PERFORMANCE, APPLICATION_SPECIFIC, MS_ACCESS_ACTIVITY, PLANNED_TRIPS]
      - type: string
        description: >
            This string provides forward-compatibility with future
            extensions to the enumeration but is not used to encode
            content defined in the present version of this API.

    ReportingConditionType:
      description: "The type of condition that triggers reporting by a data collection client to the Data Collection AF."
      anyOf:
      - type: string
        enum: [INTERVAL, THRESHOLD, EVENT]
      - type: string
        description: >
            This string provides forward-compatibility with future
            extensions to the enumeration but is not used to encode
            content defined in the present version of this API.

    ReportingEventTrigger:
      description: "The type of event that triggers reporting by a data collection client to the Data Collection AF."
      anyOf:
      - type: string
        enum: [LOCATION, DESTINATION]
        enum:
          - SERVICE_EXPERIENCE
          - LOCATION
          - COMMUNICATION
          - PERFORMANCE
          - APPLICATION_SPECIFIC
          - MS_ACCESS_ACTIVITY
          - PLANNED_TRIPS
      - type: string
        description: >
            This string provides forward-compatibility with future
Loading