From e52b1cfe36f518b7bfede9b1ee1d486a2702c328 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Fri, 3 Nov 2023 05:26:57 +0000 Subject: [PATCH 1/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d8607d6a..1306b0440 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -315,6 +315,10 @@ components: - type: array items: $ref: '#/components/schemas/Tai' + - type: array + items: + $ref: '#/components/schemas/SnpnId-Type' + Tai: type: object properties: @@ -824,6 +828,15 @@ components: - mcc - mnc + SnpnId-Type: + type: object + description: This describes the PLMN id and the NID of the SNPN within the PLMN. These two together identifies a SNPN uniquely in the network. + properties: + plmnId: + $ref: '#/components/schemas/PlmnId' + nid: + $ref: '#/components/schemas/Nid' + traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -1767,6 +1780,10 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' + sNPNList: + type: array + items: + $ref: '#/components/schemas/SnpnId-Type' mdtConfig-Type: description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. @@ -1987,6 +2004,8 @@ components: $ref: '#/components/schemas/jobType-Type' plmnTarget: $ref: '#/components/schemas/plmnTarget-Type' + sNPNTarget: + $ref: '#/components/schemas/SnpnId-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 2a3d31a7575cc48fa445d2a7c07b6dc7accb6f25 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Fri, 3 Nov 2023 05:32:11 +0000 Subject: [PATCH 2/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1306b0440..8b53f0054 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -833,9 +833,9 @@ components: description: This describes the PLMN id and the NID of the SNPN within the PLMN. These two together identifies a SNPN uniquely in the network. properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nid: - $ref: '#/components/schemas/Nid' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. -- GitLab From f57233673785c978eaf2de6c02a49958abe741a0 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Tue, 14 Nov 2023 15:36:11 +0000 Subject: [PATCH 3/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 8b53f0054..5e83fdef5 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -317,7 +317,7 @@ components: $ref: '#/components/schemas/Tai' - type: array items: - $ref: '#/components/schemas/SnpnId-Type' + $ref: '#/components/schemas/NpnId-Type' Tai: type: object @@ -828,14 +828,20 @@ components: - mcc - mnc - SnpnId-Type: + NpnId-Type: type: object - description: This describes the PLMN id and the NID of the SNPN within the PLMN. These two together identifies a SNPN uniquely in the network. + 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' - nid: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + cAGIdList: + type: array + items: + type: string + nIDList: + type: array + items: + type: 'TS28623_ComDefs.yaml#/components/schemas/Nid' traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. @@ -1780,10 +1786,10 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' - sNPNList: + nPNIdentityList: type: array items: - $ref: '#/components/schemas/SnpnId-Type' + $ref: '#/components/schemas/NpnId-Type' mdtConfig-Type: description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. @@ -2004,8 +2010,8 @@ components: $ref: '#/components/schemas/jobType-Type' plmnTarget: $ref: '#/components/schemas/plmnTarget-Type' - sNPNTarget: - $ref: '#/components/schemas/SnpnId-Type' + nPNTarget: + $ref: '#/components/schemas/NpnId-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 0ca8e35e911a4ef0eb08193f3e66d8e9f53847d5 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Tue, 14 Nov 2023 15:39:05 +0000 Subject: [PATCH 4/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5e83fdef5..6d1c19a1d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -836,8 +836,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cAGIdList: type: array - items: - type: string + items: + type: string nIDList: type: array items: -- GitLab From f956cc1fc8c5d0473f93fad2784728f6fae320b4 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Tue, 14 Nov 2023 22:29:58 +0000 Subject: [PATCH 5/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 6d1c19a1d..d80142a58 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -841,7 +841,7 @@ components: nIDList: type: array items: - type: 'TS28623_ComDefs.yaml#/components/schemas/Nid' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. -- GitLab From ca4cd45670cff874bcb16e3f13202fdeacaca317 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Fri, 3 Nov 2023 05:26:57 +0000 Subject: [PATCH 6/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5cd7a37ab..428eeaed6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -319,6 +319,10 @@ components: - type: array items: $ref: '#/components/schemas/Tai' + - type: array + items: + $ref: '#/components/schemas/SnpnId-Type' + Tai: type: object properties: -- GitLab From 18799ab544ecedccde43c4f221ea17781065e1b7 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Tue, 14 Nov 2023 15:36:11 +0000 Subject: [PATCH 7/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 428eeaed6..a54417f19 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -321,7 +321,7 @@ components: $ref: '#/components/schemas/Tai' - type: array items: - $ref: '#/components/schemas/SnpnId-Type' + $ref: '#/components/schemas/NpnId-Type' Tai: type: object -- GitLab From 7e881706472f4580224a57d05a7d3a670d151231 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 22 Nov 2023 13:18:55 +0800 Subject: [PATCH 8/9] manully merge TS28.623_Rel-18_CR0295_MDT_support_for_NPN --- OpenAPI/TS28623_GenericNrm.yaml | 14 ++++++++++++++ OpenAPI/TS28623_TraceControlNrm.yaml | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index a54417f19..8fcebeda6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -416,6 +416,20 @@ components: type: integer 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' #-------- Definition of abstract IOC Top ----------------------------------------- diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 97ad48131..340072563 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -1342,6 +1342,10 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' + nPNIdentityList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' mdtConfig-Type: description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. @@ -1373,6 +1377,9 @@ components: - type: array items: $ref: '#/components/schemas/Tai' + - type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' Tai: type: object properties: @@ -1419,6 +1426,8 @@ components: $ref: '#/components/schemas/jobType-Type' plmnTarget: $ref: '#/components/schemas/plmnTarget-Type' + nPNTarget: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From c28e9f8ec8d1c70ca5ea67f0a81ee6e1bb1aa960 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 22 Nov 2023 06:32:19 +0000 Subject: [PATCH 9/9] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 58d3541f6..8fcebeda6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -429,6 +429,7 @@ components: nIDList: type: array items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' #-------- Definition of abstract IOC Top ----------------------------------------- -- GitLab