From 220709747da671028e83743aabe315ab63f5e00f Mon Sep 17 00:00:00 2001 From: Srinivas Gudumasu Date: Thu, 15 Aug 2024 15:21:35 -0400 Subject: [PATCH 1/4] added threshold filters and geographic location filters to metrics configuration and Service Access Information resources. --- TS26510_CommonData.yaml | 8 ++++++++ TS26510_Maf_Provisioning_MetricsReporting.yaml | 10 ++++++++++ ...0_Maf_SessionHandling_ServiceAccessInformation.yaml | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index 232cc27..ca768ef 100644 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -113,6 +113,14 @@ components: mediaTransportParameters: $ref: 'TS29571_CommonData.yaml#/components/schemas/ProtocolDescription' + MetricThreshold: + type: object + properties: + metric: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri' + threshold: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32' + M1UnidirectionalQoSSpecification: type: object required: diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index 41dec86..920e453 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -309,6 +309,16 @@ components: exclusiveMinimum: true allOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' + thresholdFilters: + type: array + items: + $ref: 'TS26510_CommonData.yaml#/components/schemas/MetricThreshold' + minItems: 1 + geographicArea: + type: array + items: + $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' + minItems: 1 metrics: type: array items: diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index 265617f..e566fa9 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -250,6 +250,16 @@ components: minItems: 0 samplingPeriod: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' + thresholdFilters: + type: array + items: + $ref: 'TS26510_CommonData.yaml#/components/schemas/MetricThreshold' + minItems: 1 + geographicArea: + type: array + items: + $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' + minItems: 1 metrics: type: array items: -- GitLab From 9627322f18d7291ebb7ea346a2b8661adfe314cc Mon Sep 17 00:00:00 2001 From: Srinivas Gudumasu Date: Tue, 20 Aug 2024 20:31:43 -0400 Subject: [PATCH 2/4] Updated the threshold filters to metrics. --- TS26510_CommonData.yaml | 8 ------ ...510_Maf_Provisioning_MetricsReporting.yaml | 25 ++++++++++++++----- ...sionHandling_ServiceAccessInformation.yaml | 23 +++++++++++++---- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index ca768ef..43d89b3 100644 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -112,14 +112,6 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MediaType' mediaTransportParameters: $ref: 'TS29571_CommonData.yaml#/components/schemas/ProtocolDescription' - - MetricThreshold: - type: object - properties: - metric: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri' - threshold: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32' M1UnidirectionalQoSSpecification: type: object diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index 920e453..6ec238a 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -309,16 +309,29 @@ components: exclusiveMinimum: true allOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' - thresholdFilters: - type: array - items: - $ref: 'TS26510_CommonData.yaml#/components/schemas/MetricThreshold' - minItems: 1 + positiveCrossingThresholds: + description: "A map (list of key-value pairs) for a metric and it's positive crossing threshold values. The key of the map shall be a metric URI." + type: object + additionalProperties: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' + minItems: 1 + minProperties: 1 + negativeCrossingThresholds: + description: "A map (list of key-value pairs) for a metric and it's negative crossing threshold values. The key of the map shall be a metric URI." + type: object + additionalProperties: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' + minItems: 1 + minProperties: 1 geographicArea: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' - minItems: 1 + minItems: 1 metrics: type: array items: diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index e566fa9..087c083 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -250,16 +250,29 @@ components: minItems: 0 samplingPeriod: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' - thresholdFilters: - type: array - items: - $ref: 'TS26510_CommonData.yaml#/components/schemas/MetricThreshold' + positiveCrossingThresholds: + description: "A map (list of key-value pairs) for a metric and it's positive crossing threshold values. The key of the map shall be a metric URI." + type: object + additionalProperties: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' minItems: 1 + minProperties: 1 + negativeCrossingThresholds: + description: "A map (list of key-value pairs) for a metric and it's negative crossing threshold values. The key of the map shall be a metric URI." + type: object + additionalProperties: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' + minItems: 1 + minProperties: 1 geographicArea: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' - minItems: 1 + minItems: 1 metrics: type: array items: -- GitLab From bf8db6481bcf05dee57aad669583270d1844ae31 Mon Sep 17 00:00:00 2001 From: Srinivas Gudumasu Date: Tue, 20 Aug 2024 22:06:32 -0400 Subject: [PATCH 3/4] Updated the location filter name. --- TS26510_Maf_Provisioning_MetricsReporting.yaml | 2 +- TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index 6ec238a..b7911b4 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -327,7 +327,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' minItems: 1 minProperties: 1 - geographicArea: + locationFIlter: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index 087c083..3e0fb48 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -268,7 +268,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' minItems: 1 minProperties: 1 - geographicArea: + locationFIlter: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' -- GitLab From 202d1e716c843950606ef46fbcf6d2a73906cec1 Mon Sep 17 00:00:00 2001 From: Srinivas Gudumasu Date: Wed, 21 Aug 2024 14:41:48 -0400 Subject: [PATCH 4/4] Corrected typos. --- TS26510_CommonData.yaml | 2 +- TS26510_Maf_Provisioning_MetricsReporting.yaml | 6 +++--- TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TS26510_CommonData.yaml b/TS26510_CommonData.yaml index 43d89b3..232cc27 100644 --- a/TS26510_CommonData.yaml +++ b/TS26510_CommonData.yaml @@ -112,7 +112,7 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MediaType' mediaTransportParameters: $ref: 'TS29571_CommonData.yaml#/components/schemas/ProtocolDescription' - + M1UnidirectionalQoSSpecification: type: object required: diff --git a/TS26510_Maf_Provisioning_MetricsReporting.yaml b/TS26510_Maf_Provisioning_MetricsReporting.yaml index b7911b4..1be0612 100644 --- a/TS26510_Maf_Provisioning_MetricsReporting.yaml +++ b/TS26510_Maf_Provisioning_MetricsReporting.yaml @@ -310,7 +310,7 @@ components: allOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' positiveCrossingThresholds: - description: "A map (list of key-value pairs) for a metric and it's positive crossing threshold values. The key of the map shall be a metric URI." + description: "A map (list of key-value pairs) for a metric and its positive crossing threshold values. The key of the map shall be a metric URI." type: object additionalProperties: type: array @@ -319,7 +319,7 @@ components: minItems: 1 minProperties: 1 negativeCrossingThresholds: - description: "A map (list of key-value pairs) for a metric and it's negative crossing threshold values. The key of the map shall be a metric URI." + description: "A map (list of key-value pairs) for a metric and its negative crossing threshold values. The key of the map shall be a metric URI." type: object additionalProperties: type: array @@ -327,7 +327,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' minItems: 1 minProperties: 1 - locationFIlter: + locationFilter: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' diff --git a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml index 3e0fb48..217722f 100644 --- a/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml +++ b/TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml @@ -251,7 +251,7 @@ components: samplingPeriod: $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' positiveCrossingThresholds: - description: "A map (list of key-value pairs) for a metric and it's positive crossing threshold values. The key of the map shall be a metric URI." + description: "A map (list of key-value pairs) for a metric and its positive crossing threshold values. The key of the map shall be a metric URI." type: object additionalProperties: type: array @@ -260,7 +260,7 @@ components: minItems: 1 minProperties: 1 negativeCrossingThresholds: - description: "A map (list of key-value pairs) for a metric and it's negative crossing threshold values. The key of the map shall be a metric URI." + description: "A map (list of key-value pairs) for a metric and its negative crossing threshold values. The key of the map shall be a metric URI." type: object additionalProperties: type: array @@ -268,7 +268,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Float' minItems: 1 minProperties: 1 - locationFIlter: + locationFilter: type: array items: $ref: 'TS29122_CommonData.yaml#/components/schemas/LocationArea5G' -- GitLab