Commit f0dad44a authored by Jason Cloud's avatar Jason Cloud
Browse files

Resolve merge conflict

parent a3be7536

TS26510_Maf_Provisioning_ContentHosting.yaml

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

info:

  title: Maf_Provisioning_ContentHosting

  version: 1.0.3

  version: 1.1.0

  description: |

    Media Delivery: Content Hosting Provisioning API

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



externalDocs:

  description: 'TS 26.510 V18.5.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:
@@ -333,7 +333,22 @@ components: 
    BaseDistributionConfiguration:

      type: object

      description: 'Base data type for content distribution configurations.'

      required:

        - distributionId

        - baseURL

      properties:

        distributionId:

          type: string

          description: 'A label that can be referenced by other resources in the Provisioning Session.'

        mode:

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

        affinityGroup:

          type: string

          description: >

            A label used to indicate how physical endpoint(s) of 

            the M4 service location exposed by this and other 

            distribution configurations are deployed across 

            resilience zones.

        supplementaryDistributionNetworks:

          type: array

          items:
@@ -355,6 +370,8 @@ components: 
          $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'

        domainNameAlias:

          type: string

        baseURL:

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

        entryPoint:

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

        pathRewriteRules:
@@ -412,18 +429,11 @@ components: 
      allOf:

        - $ref: '#/components/schemas/BaseDistributionConfiguration'

        - type: object

          required:

            - canonicalDomainName

            - baseURL

          properties:

            canonicalDomainName:

              readOnly: true

              type: string

              description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.'

            baseURL:

              readOnly: true

              allOf:

                - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'

              description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4 and M10.'



    # Schema for the resource itself

    ContentHostingConfiguration: