Commit 0dd654fc authored by bradburyr's avatar bradburyr
Browse files

Resolved merge conflict.

parents f2b4511f 433272f9

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

+20 −4
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: 'Media Delivery: Common Data Types'

  version: 1.0.2

  version: 1.1.0

  description: |

    Media Delivery: Common Data Types

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags: 
    description: 'Media Delivery: Common Data Types'



externalDocs:

  description: 'TS 26.510 V18.4.0; Media Delivery; Interactions and APIs for media session handling'

  description: 'TS 26.510 V19.0.0; Media Delivery; Interactions and APIs for media session handling'

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



paths: {}
@@ -130,7 +130,7 @@ components: 
        pduSetQosLimits:

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



    QosRange:

    PolicyConstraints:

      type: object

      required:

        - componentReference
@@ -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
@@ -166,7 +175,7 @@ components: 
        minimumRequestedBitRate:

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



    ClientQosSpecification:

    ClientPolicySpecification:

      type: object

      required:

        - downlinkBitRates
@@ -184,6 +193,13 @@ 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:

          type: boolean



    ChargingSpecification:

      type: object

TS26510_Maf_Provisioning_PolicyTemplates.yaml

+8 −4
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: Maf_Provisioning_PolicyTemplates

  version: 1.0.2

  version: 1.1.0

  description: |

    Media Delivery: Policy Templates Provisioning API

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags: 
    description: 'Media Delivery: Policy Templates Provisioning API'



externalDocs:

  description: 'TS 26.510 V18.4.0; Media Delivery; Interactions and APIs for media session handling'

  description: 'TS 26.510 V19.0.0; Media Delivery; Interactions and APIs for media session handling'

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



servers:
@@ -303,7 +303,6 @@ components: 
        applicationSessionContexts:

          type: array

          minItems: 1

          maxItems: 1

          items:

            type: object

            anyOf:
@@ -318,13 +317,18 @@ components: 
          type: array

          minItems: 1

          items:

            $ref: 'TS26510_CommonData.yaml#/components/schemas/QosRange'

            $ref: 'TS26510_CommonData.yaml#/components/schemas/PolicyConstraints'

        chargingSpecification:

          $ref: 'TS26510_CommonData.yaml#/components/schemas/ChargingSpecification'

        bdtPolicyId:

          $ref: 'TS29122_CommonData.yaml#/components/schemas/BdtReferenceId'

        bdtSpecification:

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

        l4SEnablementPreference:

          type: boolean

          default: false

        qoSMonitoringConfiguration:

          $ref: 'TS29122_AsSessionWithQoS.yaml#/components/schemas/QosMonitoringInformation'



    BdtPolicySchedule:

      type: object

TS26510_Maf_SessionHandling_DynamicPolicy.yaml

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

info:

  title: Maf_SessionHandling_DynamicPolicy

  version: 1.0.2

  version: 1.1.0

  description: |

    Media Delivery: Dynamic Policy API

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags: 
    description: 'Media Delivery: Dynamic Policy API'



externalDocs:

  description: 'TS 26.510 V18.4.0; Media Delivery; Interactions and APIs for media session handling'

  description: 'TS 26.510 V19.0.0; Media Delivery; Interactions and APIs for media session handling'

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



servers:
@@ -312,6 +312,15 @@ components: 
        qosEnforcement:

          readOnly: true

          type: boolean

        l4SEnabled:

          readOnly: true

          type: boolean

        qoSMonitoringEnabled:

          readOnly: true

          type: boolean

        qoSMonitoringResults:

          readOnly: true

          $ref: 'TS29122_AsSessionWithQoS.yaml#/components/schemas/QosMonitoringReport'



    ApplicationFlowBinding:

      description: "A binding between an Application Flow and its QoS requirements provided by the Media Client."
@@ -325,7 +334,7 @@ components: 
        applicationFlowDescription:

          $ref: 'TS26510_CommonData.yaml#/components/schemas/ApplicationFlowDescription'

        qosSpecification:

          $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification'

          $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification'



    ClientBdtSpecification:

      description: "A client-facing set of Background Data Transfer bids/grants."