Commit c0b00af5 authored by bradburyr's avatar bradburyr
Browse files

Resolved merged conflicts.

parents c6e0e9cc 8f03b139

TS26113_Maf_Provisioning.yaml

+3 −3
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: Maf_Provisioning (Real-Time media Communication)

  version: 1.0.0

  version: 1.1.0

  description: |

    RTC AF Provisioning API

    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.



tags:
@@ -12,7 +12,7 @@ tags: 
    description: 'Real-Time media Communication: AF Provisioning APIs'



externalDocs:

  description: 'TS 26.113 V18.0.0; Real-Time Media Communication; Protocols and APIs'

  description: 'TS 26.113 V19.0.0; Real-Time Media Communication; Protocols and APIs'

  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/'



servers:

TS26113_Maf_SessionHandling.yaml

+3 −3
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: Maf_SessionHandling (Real-Time media Communication)

  version: 1.0.0

  version: 1.1.0

  description: |

    RTC AF Provisioning API

    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.



tags:
@@ -12,7 +12,7 @@ tags: 
    description: 'Real-Time media Communication: Media Session Handling APIs'



externalDocs:

  description: 'TS 26.113 V18.0.0; Real-Time Media Communication; Protocols and APIs'

  description: 'TS 26.113 V19.0.0; Real-Time Media Communication; Protocols and APIs'

  url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.113/'



servers:

TS26510_CommonData.yaml

+12 −0
Original line number Diff line number Diff line
@@ -151,6 +151,15 @@ components: 
        pduSetMarking:

          type: boolean

          default: false

        downlinkDataBurstSizeMarkingRequired:

          type: boolean

          default: false

        downlinkTimeToNextBurstMarkingRequired:

          type: boolean

          default: false

        downlinkExpeditedTransferIndicationMarkingRequired:

          type: boolean

          default: false



    UnidirectionalBitRateSpecification:

      type: object
@@ -184,6 +193,9 @@ components: 
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSetQosPara'

        desiredUplinkPduSetQosParameters:

          $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSetQosPara'

        downlinkExpeditedTransferIndication:

          type: boolean

          default: false

        l4SRequired:

          type: boolean

        qoSMonitoringRequired:

TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml

+9 −0
Original line number Diff line number Diff line
@@ -199,6 +199,15 @@ components: 
                  pduSetMarking:

                    type: boolean

                    default: false

                  downlinkDataBurstSizeMarkingRequired:

                    type: boolean

                    default: false

                  downlinkTimeToNextBurstMarkingRequired:

                    type: boolean

                    default: false

                  downlinkExpeditedTransferIndicationMarkingRequired:

                    type: boolean

                    default: false

                  bdtWindows:

                    type: array

                    minItems: 1