From 9914e90e4d156fd4faa2cb1e91edb107af3ecfb3 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 14:11:37 +0000 Subject: [PATCH 1/4] TS28.541_Rel16_CR1039 --- OpenAPI/TS28541_5GcNrm.yaml | 34 ++++++++++++++++------------------ OpenAPI/TS28541_NrNrm.yaml | 1 + 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0278a0119..b87794b10 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -16,27 +16,25 @@ components: #-------- Definition of types----------------------------------------------------- AmfIdentifier: - type: object - description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer' - properties: - amfRegionId: - $ref: '#/components/schemas/AmfRegionId' - amfSetId: - $ref: '#/components/schemas/AmfSetId' - amfPointer: - $ref: '#/components/schemas/AmfPointer' + type: string + pattern: '^[A-Fa-f0-9]{6}$' + description: >- + String identifying the AMF ID composed of AMF Region ID (8 bits), AMF Set ID (10 bits) + and AMF Pointer (6 bits) as specified in clause 2.10.1 of 3GPP TS 23.003. It is encoded + as a string of 6 hexadecimal characters (i.e., 24 bits). AmfRegionId: - type: integer - description: AmfRegionId is defined in TS 23.003 - maximum: 255 + type: string + pattern: '^[A-Fa-f0-9]{2}$' + description: >- + String identifying the AMF Region ID (8 bits), as specified in clause 2.10.1 of 3GPP TS 23.003 [7]. + It is encoded as a string of 2 hexadecimal characters (i.e. 8 bits). AmfSetId: type: string - description: AmfSetId is defined in TS 23.003 - maximum: 1023 - AmfPointer: - type: integer - description: AmfPointer is defined in TS 23.003 - maximum: 63 + pattern: '^[0-3][A-Fa-f0-9]{2}$' + description: >- + String identifying the AMF Set ID (10 bits) as specified in clause 2.10.1 of 3GPP TS 23.003. + It is encoded as a string of 3 hexadecimal characters where the first character is limited + to values 0 to 3 (i.e. 10 bits). IpEndPoint: type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1dbce0d98..5edb3c0c6 100644 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -43,6 +43,7 @@ components: $ref: '#/components/schemas/Sst' sd: type: string + pattern: '^[A-Fa-f0-9]{6}$' PlmnIdList: type: array -- GitLab From 618697cc50cb06f384e448b29e3b3e25461e3860 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 14:16:08 +0000 Subject: [PATCH 2/4] description udpate --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b87794b10..64d8d2055 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -26,7 +26,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{2}$' description: >- - String identifying the AMF Region ID (8 bits), as specified in clause 2.10.1 of 3GPP TS 23.003 [7]. + String identifying the AMF Region ID (8 bits), as specified in clause 2.10.1 of 3GPP TS 23.003. It is encoded as a string of 2 hexadecimal characters (i.e. 8 bits). AmfSetId: type: string -- GitLab From 2760bb23965252f5728f1179074cd4b5216d4f25 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 12 Oct 2023 08:25:10 +0000 Subject: [PATCH 3/4] update as per comments Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 64d8d2055..192d3984c 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -16,25 +16,26 @@ components: #-------- Definition of types----------------------------------------------------- AmfIdentifier: - type: string - pattern: '^[A-Fa-f0-9]{6}$' - description: >- - String identifying the AMF ID composed of AMF Region ID (8 bits), AMF Set ID (10 bits) - and AMF Pointer (6 bits) as specified in clause 2.10.1 of 3GPP TS 23.003. It is encoded - as a string of 6 hexadecimal characters (i.e., 24 bits). + type: object + description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer' + properties: + amfRegionId: + $ref: '#/components/schemas/AmfRegionId' + amfSetId: + $ref: '#/components/schemas/AmfSetId' + amfPointer: + $ref: '#/components/schemas/AmfPointer' AmfRegionId: - type: string - pattern: '^[A-Fa-f0-9]{2}$' - description: >- - String identifying the AMF Region ID (8 bits), as specified in clause 2.10.1 of 3GPP TS 23.003. - It is encoded as a string of 2 hexadecimal characters (i.e. 8 bits). + type: integer + description: AmfRegionId is defined in TS 23.003 + maximum: 255 AmfSetId: - type: string - pattern: '^[0-3][A-Fa-f0-9]{2}$' - description: >- - String identifying the AMF Set ID (10 bits) as specified in clause 2.10.1 of 3GPP TS 23.003. - It is encoded as a string of 3 hexadecimal characters where the first character is limited - to values 0 to 3 (i.e. 10 bits). + description: AmfSetId is defined in TS 23.003 + maximum: 1023 + AmfPointer: + type: integer + description: AmfPointer is defined in TS 23.003 + maximum: 63 IpEndPoint: type: object properties: -- GitLab From 31aa693fba6ab4e3f64af5acc16e761b4f1863dd Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 12 Oct 2023 08:27:16 +0000 Subject: [PATCH 4/4] correction to validation Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 192d3984c..0278a0119 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -24,12 +24,13 @@ components: amfSetId: $ref: '#/components/schemas/AmfSetId' amfPointer: - $ref: '#/components/schemas/AmfPointer' + $ref: '#/components/schemas/AmfPointer' AmfRegionId: type: integer description: AmfRegionId is defined in TS 23.003 maximum: 255 AmfSetId: + type: string description: AmfSetId is defined in TS 23.003 maximum: 1023 AmfPointer: -- GitLab