From 66a1907270ff23efc04bc5cff3a7e8fe5e42b9e3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 02:45:37 +0000 Subject: [PATCH 1/7] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..4f7c68db3 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -201,7 +201,26 @@ components: enum: - DELIVER - ENSURE - ValueRangeType: + Frequency: + description: -> + It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) + and/or the frequency operating band used for a given direction (UL or DL) in FDD or + for both UL and DL directions in TDD. + type: object + properties: + arfcn: + description: -> + This attribute shall be supported, when the frequency information represent RF reference frequency. + For NR reference frequency, see TS 38.104 subclause 5.4.2.1. + For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 + type: integer + freqband: + description: -> + This attribute shall be supported, when the frequency information represent frequency operating band + For NR frequency operating band, see TS 38.104 subclause 5.4.2.3 + For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 + type: integer + ValueRangeType: oneOf: - type: number - type: string @@ -212,6 +231,7 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + - $ref: '#/components/schemas/Frequency' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From a3977eab4c648e702b30a15378fac01acd139f32 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 02:57:46 +0000 Subject: [PATCH 2/7] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 32 +++++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 40f94c033..2d5feac0d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -166,7 +166,8 @@ components: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' - $ref: '#/components/schemas/PLMNContext' - - $ref: '#/components/schemas/NRFqBandContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' @@ -737,15 +738,17 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - NRFqBandContext: + DlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for NRFqBandContext + This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + It describes the downlink frequency information (RF reference frequencies and/ or the + frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: type: string enum: - - NRFqBand + - DlFrequency contextCondition: type: string enum: @@ -753,7 +756,26 @@ components: contextValueRange: type: array items: - type: string + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' + UlFrequencyContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + It describes the uplink frequency information (RF reference frequencies and/ or the frequency + operating band) supported by the RAN SubNetwork that the intent expectation is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - UlFrequency + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: description: >- This data type is the "ObjectContext" data type with specialisations for RATContext -- GitLab From e9b114bbb059885b6cf7b1c6bfe6a8f360fde52d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 03:14:04 +0000 Subject: [PATCH 3/7] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 2d5feac0d..8433a62fc 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -740,7 +740,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object @@ -759,7 +759,7 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the uplink frequency information (RF reference frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object -- GitLab From f343828184460a77dadc698bec3bd997b98fc783 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:48:45 +0000 Subject: [PATCH 4/7] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 4f7c68db3..1791368dc 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -209,17 +209,15 @@ components: type: object properties: arfcn: + type: integer description: -> This attribute shall be supported, when the frequency information represent RF reference frequency. - For NR reference frequency, see TS 38.104 subclause 5.4.2.1. - For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 - type: integer + For NR reference frequency, see TS 38.104 subclause 5.4.2.1; For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 freqband: + type: integer description: -> This attribute shall be supported, when the frequency information represent frequency operating band - For NR frequency operating band, see TS 38.104 subclause 5.4.2.3 - For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 - type: integer + For NR frequency operating band, see TS 38.104 subclause 5.4.2.3;For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 ValueRangeType: oneOf: - type: number -- GitLab From 746c872c1ac5039716e13c8025f3cccdb581640e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:57:08 +0000 Subject: [PATCH 5/7] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 1791368dc..8839b79f5 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -211,13 +211,11 @@ components: arfcn: type: integer description: -> - This attribute shall be supported, when the frequency information represent RF reference frequency. - For NR reference frequency, see TS 38.104 subclause 5.4.2.1; For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 + This attribute shall be supported, when the frequency information represent RF reference frequency. freqband: type: integer description: -> - This attribute shall be supported, when the frequency information represent frequency operating band - For NR frequency operating band, see TS 38.104 subclause 5.4.2.3;For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 + This attribute shall be supported, when the frequency information represent frequency operating band. ValueRangeType: oneOf: - type: number -- GitLab From 453d56d4213dd40d2386a2afcccf39f8a2ba0b3f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 00:29:19 +0000 Subject: [PATCH 6/7] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 8839b79f5..cab5fb09a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -202,7 +202,7 @@ components: - DELIVER - ENSURE Frequency: - description: -> + description: >- It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) and/or the frequency operating band used for a given direction (UL or DL) in FDD or for both UL and DL directions in TDD. @@ -210,12 +210,10 @@ components: properties: arfcn: type: integer - description: -> - This attribute shall be supported, when the frequency information represent RF reference frequency. + description: This attribute shall be supported, when the frequency information represent RF reference frequency. freqband: type: integer - description: -> - This attribute shall be supported, when the frequency information represent frequency operating band. + description: This attribute shall be supported, when the frequency information represent frequency operating band. ValueRangeType: oneOf: - type: number -- GitLab From ffb5ce21b69560ede8217b18dc1392f660d5e584 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 03:40:00 +0000 Subject: [PATCH 7/7] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cab5fb09a..d53c4192e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -210,10 +210,14 @@ components: properties: arfcn: type: integer - description: This attribute shall be supported, when the frequency information represent RF reference frequency. + description: >- + This attribute shall be supported, when the frequency information represent RF reference frequency. + The allowed values for NR see TS 38.104 subclause 5.4.2.1; The allowed values for EUTRAN see TS 36.104 [X] subclause 5.7.3; freqband: - type: integer - description: This attribute shall be supported, when the frequency information represent frequency operating band. + type: string + description: >- + This attribute shall be supported, when the frequency information represent frequency operating band. + The allowed values for NR see TS 38.104 subclause 5.4.2.3; The allowed value for EUTRAN see TS 36.104 subclause 5.7.3 ValueRangeType: oneOf: - type: number -- GitLab