From ca93bf230dbe6ca152c15ba86edddb860a662433 Mon Sep 17 00:00:00 2001 From: chenxiu Date: Wed, 15 May 2024 03:39:29 +0000 Subject: [PATCH 1/4] Rel-18 CR TS 28.623 Change NpnId from dataType to choice --- OpenAPI/TS28623_GenericNrm.yaml | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 16385e044..2855b9b01 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -330,19 +330,27 @@ components: minimum: 0 maximum: 31 NpnId-Type: - type: object - description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN. - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - cAGIdList: - type: array - items: - type: string - nIDList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + oneOf: + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + cagidList: + type: array + items: + $ref: '#/components/schemas/cagId' + minItems: 1 + maxItems: 256 + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + nidList: + type: array + items: + $ref: '#/components/schemas/nid' + minItems: 1 + maxItems: 16 #-------- Definition of abstract IOC Top ----------------------------------------- -- GitLab From a499f5d3af7eaf2d4e93c9500da437eee8843f2f Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 May 2024 06:40:23 +0000 Subject: [PATCH 2/4] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 2855b9b01..9e4542f16 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -333,24 +333,24 @@ components: oneOf: - type: object properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - cagidList: - type: array - items: - $ref: '#/components/schemas/cagId' - minItems: 1 - maxItems: 256 + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + cAGIdList: + type: array + items: + type: string + minItems: 1 + maxItems: 256 - type: object properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - nidList: - type: array - items: - $ref: '#/components/schemas/nid' - minItems: 1 - maxItems: 16 + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + nIDList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + minItems: 1 + maxItems: 16 #-------- Definition of abstract IOC Top ----------------------------------------- -- GitLab From d1f01667d05ef54eaf9580ef160747f609485528 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 29 May 2024 02:19:11 +0000 Subject: [PATCH 3/4] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 9e4542f16..2b93c6e9f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -330,11 +330,11 @@ components: minimum: 0 maximum: 31 NpnId-Type: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' oneOf: - type: object properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cAGIdList: type: array items: @@ -343,8 +343,6 @@ components: maxItems: 256 - type: object properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nIDList: type: array items: -- GitLab From 9800889aa942bf00de477a4a2b6435293d55ff64 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 29 May 2024 02:34:13 +0000 Subject: [PATCH 4/4] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 2b93c6e9f..24855fc4b 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -330,25 +330,25 @@ components: minimum: 0 maximum: 31 NpnId-Type: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + cAGIdList: + type: array + items: + type: string + minItems: 1 + maxItems: 256 + nIDList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + minItems: 1 + maxItems: 16 oneOf: - - type: object - properties: - cAGIdList: - type: array - items: - type: string - minItems: 1 - maxItems: 256 - - type: object - properties: - nIDList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' - minItems: 1 - maxItems: 16 + - required: [plmnId, cAGIdList] + - required: [plmnId, nIDList] #-------- Definition of abstract IOC Top ----------------------------------------- -- GitLab