From f0dad44a5918092e03aa10ff8166b41ca8d1554d Mon Sep 17 00:00:00 2001 From: jmclou Date: Sun, 13 Jul 2025 10:45:41 -0700 Subject: [PATCH 1/8] Resolve merge conflict --- TS26510_Maf_Provisioning_ContentHosting.yaml | 30 +++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/TS26510_Maf_Provisioning_ContentHosting.yaml b/TS26510_Maf_Provisioning_ContentHosting.yaml index e61c422d..a286080f 100644 --- a/TS26510_Maf_Provisioning_ContentHosting.yaml +++ b/TS26510_Maf_Provisioning_ContentHosting.yaml @@ -1,7 +1,7 @@ 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: -- GitLab From 5368340eca4d4bbff2de85dfb5bdab0c96c3b51a Mon Sep 17 00:00:00 2001 From: jmclou Date: Sun, 13 Jul 2025 10:46:59 -0700 Subject: [PATCH 2/8] Resolve merge conflicts --- ...10_Maf_Provisioning_ContentPublishing.yaml | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/TS26510_Maf_Provisioning_ContentPublishing.yaml b/TS26510_Maf_Provisioning_ContentPublishing.yaml index 0bc6d654..b2aecf6b 100644 --- a/TS26510_Maf_Provisioning_ContentPublishing.yaml +++ b/TS26510_Maf_Provisioning_ContentPublishing.yaml @@ -1,7 +1,7 @@ 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: -- GitLab From c9f6bdbce3a5ba7d564291b510e26b433e20478c Mon Sep 17 00:00:00 2001 From: jmclou Date: Sun, 13 Jul 2025 10:47:55 -0700 Subject: [PATCH 3/8] Resolve merge conflicts --- TS26512_Mas_Configuration_ContentHosting.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/TS26512_Mas_Configuration_ContentHosting.yaml b/TS26512_Mas_Configuration_ContentHosting.yaml index 5e739394..a74fc55c 100644 --- a/TS26512_Mas_Configuration_ContentHosting.yaml +++ b/TS26512_Mas_Configuration_ContentHosting.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Mas_Configuration_ContentHosting - version: 1.0.2 + version: 1.1.0 description: | 5GMS AS Configuration API: Content Hosting © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,7 +12,7 @@ tags: description: '5G Media Streaming: Application Server Configuration (M3) APIs: Content Hosting' externalDocs: - description: 'TS 26.512 V18.6.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: @@ -335,16 +335,10 @@ components: allOf: - $ref: 'TS26510_Maf_Provisioning_ContentHosting.yaml#/components/schemas/BaseDistributionConfiguration' - type: object - required: - - canonicalDomainName - - baseURL properties: canonicalDomainName: type: string - description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' - baseURL: - 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 ApplicationServerContentHostingConfiguration: -- GitLab From 1a359940fecadf400d58db5cedb01e61f38ad634 Mon Sep 17 00:00:00 2001 From: jmclou Date: Sun, 13 Jul 2025 10:48:44 -0700 Subject: [PATCH 4/8] Resolve merge conflicts --- TS26512_Mas_Configuration_ContentPublishing.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/TS26512_Mas_Configuration_ContentPublishing.yaml b/TS26512_Mas_Configuration_ContentPublishing.yaml index e5e85490..02ac7261 100644 --- a/TS26512_Mas_Configuration_ContentPublishing.yaml +++ b/TS26512_Mas_Configuration_ContentPublishing.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Mas_Configuration_ContentPublishing - version: 1.0.2 + version: 1.1.0 description: | 5GMS AS Configuration API: Content Publishing © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,7 +12,7 @@ tags: description: '5G Media Streaming: Application Server Configuration (M3) APIs: Content Publishing' externalDocs: - description: 'TS 26.512 V18.6.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: @@ -334,17 +334,6 @@ components: description: 'A content contribution configuration used to configure a Media AS.' allOf: - $ref: 'TS26510_Maf_Provisioning_ContentPublishing.yaml#/components/schemas/BaseContributionConfiguration' - - type: object - required: - - canonicalDomainName - - baseURL - properties: - canonicalDomainName: - type: string - description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' - baseURL: - allOf: - - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl' # Schema for the resource itself ApplicationServerContentPublishingConfiguration: -- GitLab From a3dca77fb7b8f84055d5487b93ce8323be0998ed Mon Sep 17 00:00:00 2001 From: Jason Cloud Date: Sun, 13 Jul 2025 18:02:11 +0000 Subject: [PATCH 5/8] Attempting to fix Validate OpenAPI issues. --- TS26510_Maf_Provisioning_ContentPublishing.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/TS26510_Maf_Provisioning_ContentPublishing.yaml b/TS26510_Maf_Provisioning_ContentPublishing.yaml index b2aecf6b..2c75d45d 100644 --- a/TS26510_Maf_Provisioning_ContentPublishing.yaml +++ b/TS26510_Maf_Provisioning_ContentPublishing.yaml @@ -12,7 +12,6 @@ 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/' -- GitLab From e051666a0d6a3fb8dd6870f73640ebf662d56660 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Thu, 2 Oct 2025 16:15:01 +0100 Subject: [PATCH 6/8] In contribution configuration, canonicalDomainName needs to be read-only at M1 and read/write at M3, so can't be promoted to a common base data type. --- TS26510_Maf_Provisioning_ContentPublishing.yaml | 8 +++++++- TS26512_Mas_Configuration_ContentPublishing.yaml | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/TS26510_Maf_Provisioning_ContentPublishing.yaml b/TS26510_Maf_Provisioning_ContentPublishing.yaml index 2c75d45d..2c97007c 100644 --- a/TS26510_Maf_Provisioning_ContentPublishing.yaml +++ b/TS26510_Maf_Provisioning_ContentPublishing.yaml @@ -333,7 +333,6 @@ components: description: 'A configuration for content contribution.' required: - contributionId - - canonicalDomainName - baseURL - entryPoint properties: @@ -372,6 +371,13 @@ components: description: 'A content contribution configuration.' allOf: - $ref: '#/components/schemas/BaseContributionConfiguration' + - type: object + properties: + canonicalDomainName: + readOnly: true + type: string + description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' + # Schema for the resource itself ContentPublishingConfiguration: diff --git a/TS26512_Mas_Configuration_ContentPublishing.yaml b/TS26512_Mas_Configuration_ContentPublishing.yaml index 02ac7261..9960c738 100644 --- a/TS26512_Mas_Configuration_ContentPublishing.yaml +++ b/TS26512_Mas_Configuration_ContentPublishing.yaml @@ -334,6 +334,12 @@ components: description: 'A content contribution configuration used to configure a Media AS.' allOf: - $ref: 'TS26510_Maf_Provisioning_ContentPublishing.yaml#/components/schemas/BaseContributionConfiguration' + - type: object + properties: + canonicalDomainName: + type: string + description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' + # Schema for the resource itself ApplicationServerContentPublishingConfiguration: -- GitLab From 1abf94fc31427d69cad4cf3f5da7bd6829b10593 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Thu, 2 Oct 2025 16:33:13 +0100 Subject: [PATCH 7/8] Adjust comment to include M10. --- TS26510_Maf_Provisioning_ContentPublishing.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TS26510_Maf_Provisioning_ContentPublishing.yaml b/TS26510_Maf_Provisioning_ContentPublishing.yaml index 2c97007c..9d43ea9a 100644 --- a/TS26510_Maf_Provisioning_ContentPublishing.yaml +++ b/TS26510_Maf_Provisioning_ContentPublishing.yaml @@ -376,8 +376,7 @@ components: canonicalDomainName: readOnly: true type: string - description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' - + 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: -- GitLab From c6aad699a765de4635de0a7d19dee0dd54653ed4 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Thu, 2 Oct 2025 16:34:48 +0100 Subject: [PATCH 8/8] Adjust comment to add M10. --- TS26512_Mas_Configuration_ContentPublishing.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TS26512_Mas_Configuration_ContentPublishing.yaml b/TS26512_Mas_Configuration_ContentPublishing.yaml index 9960c738..3837b00c 100644 --- a/TS26512_Mas_Configuration_ContentPublishing.yaml +++ b/TS26512_Mas_Configuration_ContentPublishing.yaml @@ -338,7 +338,7 @@ components: properties: canonicalDomainName: type: string - description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.' + description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4 and M10.' # Schema for the resource itself -- GitLab