Commit 7029821a authored by bradburyr's avatar bradburyr
Browse files

Resolve merge conflict.

parents a2e84f4e 13128d58

README.md

+3 −5
Original line number Diff line number Diff line
@@ -354,6 +354,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
* IMS UE Context Management

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29562_Nhss_imsUECM.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS29562_Nhss_imsUECM.yaml))

* IMS Event Exposure

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29562_Nhss_imsEE.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS29562_Nhss_imsEE.yaml))

* GBA Subscriber Data Management

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29562_Nhss_gbaSDM.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS29562_Nhss_gbaSDM.yaml))
@@ -561,11 +564,6 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29176_Nmf_MRM.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS29176_Nmf_MRM.yaml))



## SCP (Service Communication Proxy)

* Event Exposure Service

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29570_Nscp_EventExposure.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS29570_Nscp_EventExposure.yaml))



## AIOTF (Ambient IoT Function)

* Ambient IoT Service

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS29569_Naiotf_AIoT.yaml))

TS26510_CommonData.yaml

+12 −0
Original line number Diff line number Diff line
@@ -113,6 +113,18 @@ components: 
          $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MediaType'

        mediaTransportParameters:

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

        uplinkMultiplexedMediaInfos:

          type: array

          items:

            $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MpxMediaInfo'

          minItems: 1

          description: Multiplexed media identification information for the uplink IP flow.

        downlinkMultiplexedMediaInfos:

          type: array

          items:

            $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MpxMediaInfo'

          minItems: 1

          description: Multiplexed media identification information for the downlink IP flow.



    UnidirectionalQoSSpecification:

      type: object

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:

TS26510_Maf_Provisioning_ContentPublishing.yaml

+23 −11
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).
@@ -12,7 +12,7 @@ tags: 
    description: 'Media Delivery: Content Publishing 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:
@@ -265,7 +265,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 +332,22 @@ components: 
      type: object

      description: 'A configuration for content contribution.'

      required:

        - contributionId

        - 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 +356,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'
@@ -353,18 +372,11 @@ components: 
      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'

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



    # Schema for the resource itself

    ContentPublishingConfiguration:

TS26512_Maf_Provisioning.yaml

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

info:

  title: Maf_Provisioning (5G Media Streaming)

  version: 1.0.2

  version: 1.1.0

  description: |

    5GMS AF Provisioning API

    © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -12,7 +12,7 @@ tags: 
    description: '5G Media Streaming: AF Provisioning APIs'



externalDocs:

  description: 'TS 26.512 V18.7.0; 5G Media Streaming (5GMS); Protocols'

  description: 'TS 26.512 V19.0.0; 5G Media Streaming (5GMS); Protocols'

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



servers: