From 353876cfdb548fbe9b18e3d2ee5099c71a817bdf Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Mon, 29 Sep 2025 18:31:20 +0100 Subject: [PATCH 1/2] 26510-CR0030r4 [S4-251497] carried across from Rel-18 into Rel-19 in the same meeting cycle (SA#109). (cherry picked from commit 27ecdbe91f44b3674a9e5316335762e722c1b1a1) --- TS26510_CommonData.yaml | 8 ++++++-- TS26510_Maf_Provisioning_PolicyTemplates.yaml | 3 ++- TS26510_Maf_SessionHandling_DynamicPolicy.yaml | 2 +- TS26510_Maf_SessionHandling_NetworkAssistance.yaml | 10 +++++----- TS26512_M5_DynamicPolicies.yaml | 6 +++--- TS26512_M5_NetworkAssistance.yaml | 8 ++++---- TS26512_Maf_Provisioning.yaml | 4 ++-- TS26512_Maf_SessionHandling.yaml | 4 ++-- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index f0a43f26..bc73d865 100644 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -1,7 +1,11 @@ openapi: 3.0.0 info: title: 'Media Delivery: Common Data Types' +<<<<<<< HEAD version: 1.1.0 +======= + version: 1.0.3 +>>>>>>> 27ecdbe (SA4#133-e -> SA#109) description: | Media Delivery: Common Data Types © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -130,7 +134,7 @@ components: pduSetQosLimits: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSetQosPara' - QosRange: + PolicyConstraints: type: object required: - componentReference @@ -175,7 +179,7 @@ components: minimumRequestedBitRate: $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' - ClientQosSpecification: + ClientPolicySpecification: type: object required: - downlinkBitRates diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index 04facac9..be4adef4 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -12,6 +12,7 @@ tags: description: 'Media Delivery: Policy Templates Provisioning API' externalDocs: +<<<<<<< HEAD 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/' @@ -317,7 +318,7 @@ 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: diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index 16bf2af7..cd302930 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -334,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." diff --git a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml index b8526df1..87896e1e 100644 --- a/TS26510_Maf_SessionHandling_NetworkAssistance.yaml +++ b/TS26510_Maf_SessionHandling_NetworkAssistance.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Maf_SessionHandling_NetworkAssistance - version: 1.0.2 + version: 1.0.3 description: | Media Delivery: Network Assistance API © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,7 +12,7 @@ tags: description: 'Media Delivery: Network Assistance API' externalDocs: - description: 'TS 26.510 V18.4.0; Media Delivery; Interactions and APIs for media session handling' + description: 'TS 26.510 V18.5.0; Media Delivery; Interactions and APIs for media session handling' url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.510/' servers: @@ -276,7 +276,7 @@ paths: content: application/json: schema: - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors $ref: 'TS29571_CommonData.yaml#/components/responses/400' '401': # Unauthorized @@ -406,8 +406,8 @@ components: applicationFlowDescription: $ref: 'TS26510_CommonData.yaml#/components/schemas/ApplicationFlowDescription' requestedQoS: - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' recommendedQoS: readOnly: true allOf: - - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' diff --git a/TS26512_M5_DynamicPolicies.yaml b/TS26512_M5_DynamicPolicies.yaml index f8c2eeff..aca86c5c 100644 --- a/TS26512_M5_DynamicPolicies.yaml +++ b/TS26512_M5_DynamicPolicies.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: M5_DynamicPolicies - version: 3.0.3 + version: 3.0.4 description: | 5GMS AF M5 Dynamic Policy API (deprecated) © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,7 +12,7 @@ tags: description: '5G Media Streaming: Media Session Handling (M5) APIs: Dynamic Policies (deprecated)' externalDocs: - description: 'TS 26.512 V18.6.0; 5G Media Streaming (5GMS); Protocols' + description: 'TS 26.512 V18.7.0; 5G Media Streaming (5GMS); Protocols' url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/' paths: {} @@ -44,7 +44,7 @@ components: provisioningSessionId: $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId' qosSpecification: - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' enforcementMethod: readOnly: true type: string diff --git a/TS26512_M5_NetworkAssistance.yaml b/TS26512_M5_NetworkAssistance.yaml index 04d2d10e..5e98bbf5 100644 --- a/TS26512_M5_NetworkAssistance.yaml +++ b/TS26512_M5_NetworkAssistance.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: M5_NetworkAssistance - version: 3.0.3 + version: 3.0.4 description: | 5GMS AF M5 Network Assistance API (deprecated) © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,7 +12,7 @@ tags: description: '5G Media Streaming: Media Session Handling (M5) APIs: Network Assistance (deprecated)' externalDocs: - description: 'TS 26.512 V18.6.0; 5G Media Streaming (5GMS); Protocols' + description: 'TS 26.512 V18.7.0; 5G Media Streaming (5GMS); Protocols' url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/' paths: {} @@ -44,11 +44,11 @@ components: policyTemplateId: $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId' requestedQoS: - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' recommendedQoS: readOnly: true allOf: - - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientQosSpecification' + - $ref: 'TS26510_CommonData.yaml#/components/schemas/ClientPolicySpecification' notficationURL: readOnly: true allOf: diff --git a/TS26512_Maf_Provisioning.yaml b/TS26512_Maf_Provisioning.yaml index e8d7978b..6d82d769 100644 --- a/TS26512_Maf_Provisioning.yaml +++ b/TS26512_Maf_Provisioning.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Maf_Provisioning (5G Media Streaming) - version: 1.0.1 + version: 1.0.2 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.6.0; 5G Media Streaming (5GMS); Protocols' + description: 'TS 26.512 V18.7.0; 5G Media Streaming (5GMS); Protocols' url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/' servers: diff --git a/TS26512_Maf_SessionHandling.yaml b/TS26512_Maf_SessionHandling.yaml index 9d489469..3d0c5ee5 100644 --- a/TS26512_Maf_SessionHandling.yaml +++ b/TS26512_Maf_SessionHandling.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: Maf_SessionHandling (5G Media Streaming) - version: 1.0.1 + version: 1.0.2 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: Media Session Handling APIs' externalDocs: - description: 'TS 26.512 V18.6.0; 5G Media Streaming (5GMS); Protocols' + description: 'TS 26.512 V18.7.0; 5G Media Streaming (5GMS); Protocols' url: 'https://www.3gpp.org/ftp/Specs/archive/26_series/26.512/' servers: -- GitLab From 2dc749ef0c4882ee263990398cb5975662ef7d40 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Tue, 30 Sep 2025 11:55:33 +0100 Subject: [PATCH 2/2] Oops. --- TS26510_CommonData.yaml | 4 ---- TS26510_Maf_Provisioning_PolicyTemplates.yaml | 1 - 2 files changed, 5 deletions(-) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index bc73d865..190b79da 100644 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -1,11 +1,7 @@ openapi: 3.0.0 info: title: 'Media Delivery: Common Data Types' -<<<<<<< HEAD version: 1.1.0 -======= - version: 1.0.3 ->>>>>>> 27ecdbe (SA4#133-e -> SA#109) description: | Media Delivery: Common Data Types © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index be4adef4..df4cc1cb 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -12,7 +12,6 @@ tags: description: 'Media Delivery: Policy Templates Provisioning API' externalDocs: -<<<<<<< HEAD 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