From ac409631aff35e04d724568620aaf22978f037a9 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Wed, 29 May 2024 13:06:32 +0100 Subject: [PATCH 1/2] [S4-240812] as amended by [S4aI240045]: Background Data Transfer additions. --- TS26510_CommonData.yaml | 13 ++++++ TS26510_Maf_Provisioning_PolicyTemplates.yaml | 42 +++++++++++++++++++ ...510_Maf_SessionHandling_DynamicPolicy.yaml | 16 +++++++ ...sionHandling_ServiceAccessInformation.yaml | 5 +++ 4 files changed, 76 insertions(+) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index 8cc6d8d..c7cf271 100755 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -298,6 +298,19 @@ components: maxAge: $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32' + BDTWindow: + type: object + description: 'A window in time during which Background Data Transfer is possible with a particular bit rate in the downlink and/or uplink direction.' + required: + - timeWindow + properties: + timeWindow: + $ref: 'TS29122_CommonData.yaml#/components/schemas/TimeWindow' + maximumDownlinkBitRate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' + maximumUplinkBitRate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' + ##################################### # Clause 6.4.4: Enumerated data types ##################################### diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index 012d8d7..11f7729 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -253,6 +253,8 @@ components: anyOf: - required: [qoSSpecification] - required: [chargingSpecification] + - required: [bdtPolicyId] + - required: [bdtSpecification] properties: policyTemplateId: readOnly: true @@ -292,3 +294,43 @@ components: $ref: 'TS26510_CommonData.yaml#/components/schemas/M1QoSSpecification' chargingSpecification: $ref: 'TS26510_CommonData.yaml#/components/schemas/ChargingSpecification' + bdtPolicyId: + $ref: 'TS29122_CommonData.yaml#/components/schemas/BdtReferenceId' + bdtSpecification: + $ref: '#/components/schemas/M1BDTSpecification' + + M1BDTSpecification: + type: object + description: "Background Data Transfer policy schedule specification." + required: + - windows + properties: + startDate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DateTime' + endDate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DateTime' + windows: + type: object + properties: + startTime: + $ref: 'TS29571_CommonData.yaml#/components/schemas/TimeOfDay' + duration: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationMin' + daysInWeek: + type: array + minItems: 1 + maxItems: 7 + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DayOfWeek' + numberOfOccurrences: + type: integer + minimum: 1 + numberOfUes: + type: integer + minimum: 1 + estimatedDataVolumePerUe: + $ref: 'TS29571_CommonData.yaml#/components/schemas/UsageThreshold' + aggregatedDownlinkBitRate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' + aggregatedUplinkBitRate: + $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' diff --git a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml index 9bddb52..cb83841 100644 --- a/TS26510_Maf_SessionHandling_DynamicPolicy.yaml +++ b/TS26510_Maf_SessionHandling_DynamicPolicy.yaml @@ -284,6 +284,22 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MediaType' qosSpecification: $ref: 'TS26510_CommonData.yaml#/components/schemas/M5QoSSpecification' + bdtSpecification: + $ref: '#/components/schemas/M5BDTSpecification' qosEnforcement: readOnly: true type: boolean + + M5BDTSpecification: + description: "A client-facing set of Background Data Transfer bids/grants." + type: object + required: + - windows + properties: + estimatedDataTransferVolume: + $ref: 'TS29122_CommonData.yaml#/components/schemas/UsageThreshold' + windows: + type: array + minItems: 1 + items: + $ref: 'TS26510_CommonData.yaml#/components/schemas/BDTWindow' diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index b723636..da5c376 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -169,6 +169,11 @@ components: type: string policyTemplateId: $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId' + bdtWindows: + type: array + minItems: 1 + items: + $ref: 'TS26510_CommonData.yaml#/components/schemas/BDTWindow' sdfMethods: type: array items: -- GitLab From 6c8b596c4342504cd5501f7b5974feffe45f7056 Mon Sep 17 00:00:00 2001 From: Richard Bradbury Date: Wed, 29 May 2024 13:12:00 +0100 Subject: [PATCH 2/2] Fixed references to data types defined in TS 29.122. --- TS26510_Maf_Provisioning_PolicyTemplates.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TS26510_Maf_Provisioning_PolicyTemplates.yaml b/TS26510_Maf_Provisioning_PolicyTemplates.yaml index 11f7729..0b8e053 100644 --- a/TS26510_Maf_Provisioning_PolicyTemplates.yaml +++ b/TS26510_Maf_Provisioning_PolicyTemplates.yaml @@ -313,15 +313,15 @@ components: type: object properties: startTime: - $ref: 'TS29571_CommonData.yaml#/components/schemas/TimeOfDay' + $ref: 'TS29122_CommonData.yaml#/components/schemas/TimeOfDay' duration: - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationMin' + $ref: 'TS29122_CommonData.yaml#/components/schemas/DurationMin' daysInWeek: type: array minItems: 1 maxItems: 7 items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/DayOfWeek' + $ref: 'TS29122_CommonData.yaml#/components/schemas/DayOfWeek' numberOfOccurrences: type: integer minimum: 1 @@ -329,7 +329,7 @@ components: type: integer minimum: 1 estimatedDataVolumePerUe: - $ref: 'TS29571_CommonData.yaml#/components/schemas/UsageThreshold' + $ref: 'TS29122_CommonData.yaml#/components/schemas/UsageThreshold' aggregatedDownlinkBitRate: $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate' aggregatedUplinkBitRate: -- GitLab