Commit 5368340e authored by Jason Cloud's avatar Jason Cloud
Browse files

Resolve merge conflicts

parent f0dad44a

TS26510_Maf_Provisioning_ContentPublishing.yaml

+23 −15
Original line number Diff line number Diff line 
openapi: 3.0.0

info:

  title: Maf_Provisioning_ContentPublishing

  version: 1.0.3

  version: 1.1.0

  description: |

    Media Delivery: Content Publishing Provisioning API

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -13,6 +13,7 @@ tags: 


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:
@@ -265,7 +266,7 @@ paths: 
          content:

            application/json:

              schema:

                description: 'The aggregate number of cache entries purged in all 5GMSd AS instances distributing content for the requested Provisioning Session.'

                description: 'The aggregate number of cache entries purged in all 5GMSu AS instances distributing content for the requested Provisioning Session.'

                type: integer

                minimum: 1

        '204': # No Content
@@ -332,8 +333,23 @@ components: 
      type: object

      description: 'A configuration for content contribution.'

      required:

        - contributionId

        - canonicalDomainName

        - baseURL

        - entryPoint

      properties:

        contributionId:

          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 

            contribution configurations are deployed across 

            resilience zones.

        edgeResourcesConfigurationId:

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

        contentPreparationTemplateId:
@@ -342,9 +358,14 @@ components: 
          allOf:

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

            - description: 'A reference to a Server Certificate resource to be presented by the Media AS at reference point M4.'

        canonicalDomainName:

          type: string

          description: 'Default Fully-Qualified Domain Name for use at reference point M4 or M10.'

        domainNameAlias: 

          type: string

          description: 'Additional domain name nominated by the Media Application Provider and used by the Media AS to set appropriate CORS HTTP response headers at reference point M4.'

        baseURL:

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

        entryPoint:

          $ref: 'TS26510_CommonData.yaml#/components/schemas/RelativeMediaEntryPoint'
@@ -352,19 +373,6 @@ components: 
      description: 'A content contribution configuration.'

      allOf:

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

        - 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'



    # Schema for the resource itself

    ContentPublishingConfiguration: