From da0cd26100849c109f5af7e506cfb5c70a6d0eb8 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 13:55:45 +0000 Subject: [PATCH 1/4] TS28.541_Rel18_CR1041 --- OpenAPI/TS28541_5GcNrm.yaml | 36 +++++++++++++++++------------------- OpenAPI/TS28541_NrNrm.yaml | 1 + 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4cf5ec976..76348a808 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -14,29 +14,27 @@ components: schemas: #-------- 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 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) 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 0a5099749..370f6f68c 100755 --- 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 7bddb713258c978d50c67a27b3df53397f9d455e Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 14:14:29 +0000 Subject: [PATCH 2/4] description correction --- OpenAPI/TS28541_5GcNrm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 76348a808..ce7c8df87 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -25,9 +25,8 @@ components: type: string pattern: '^[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) + 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 pattern: '^[0-3][A-Fa-f0-9]{2}$' -- GitLab From 1c3532a016dc2a180103e459bcac2125edcb2684 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 12 Oct 2023 08:44:39 +0000 Subject: [PATCH 3/4] updated as per comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ce7c8df87..a994bde11 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -15,25 +15,27 @@ 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 f97698a906e51b4744c95ea98313ef24bce69a13 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 12 Oct 2023 08:48:46 +0000 Subject: [PATCH 4/4] roll back changes fully. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a994bde11..4cf5ec976 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -14,6 +14,7 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + AmfIdentifier: type: object description: 'AmfIdentifier comprise of amfRegionId, amfSetId and amfPointer' -- GitLab