From c6a94a3c342e688e2fbe9ffb322d437af9926e5e Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 04:12:47 +0000 Subject: [PATCH 1/7] CR0221 IpAddr, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f876e0c6a..fdc8a3eb7 100644 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -85,6 +85,7 @@ components: oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Ipv6Prefix' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. -- GitLab From 528bb2fb8e057b8556809c1adfe83f6f1765d375 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 04:38:16 +0000 Subject: [PATCH 2/7] CR0865 remove redundant stage 3 definition for Mnc and PlmnId --- OpenAPI/TS28541_5GcNrm.yaml | 10 +++++----- OpenAPI/TS28541_NrNrm.yaml | 24 +++++++----------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 38d2dc12c..8536618eb 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,7 +67,7 @@ components: nFStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -101,7 +101,7 @@ components: apiPrfix: type: string allowedPlmns: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -1006,7 +1006,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: @@ -1124,7 +1124,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPId: type: integer fqdn: @@ -1457,7 +1457,7 @@ components: - type: object properties: remotePlmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' remoteSeppId: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2892635a9..7e6e00d7a 100644 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -44,25 +44,15 @@ components: sd: type: string - Mnc: - type: string - pattern: '[0-9]{3}|[0-9]{2}' - PlmnId: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' PlmnIdList: type: array items: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' PlmnInfoList: @@ -96,7 +86,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' @@ -253,7 +243,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: @@ -553,7 +543,7 @@ components: TceID: type: integer PlmnTarget: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array items: @@ -751,7 +741,7 @@ components: gnbCuName: $ref: '#/components/schemas/GnbName' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlackList: $ref: '#/components/schemas/GGnbIdList' xnBlackList: @@ -1471,7 +1461,7 @@ components: gnbIdLength: $ref: '#/components/schemas/GnbIdLength' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 3e45f9d6bca9fd05ec8a28a35fd1a526a4d33d5e Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:02:11 +0000 Subject: [PATCH 3/7] 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 c57e9a261..3b4f3b6a3 100644 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -148,7 +148,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - monitorGranularityPeriods: + reportingPeriods: type: array items: type: integer -- GitLab From f410a60bfab6abd8017d8d1e2a64e1f7c4009a69 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 Mar 2023 06:26:33 +0000 Subject: [PATCH 4/7] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3b4f3b6a3..26b40e8c2 100644 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1478,8 +1478,6 @@ components: $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' - traceRecordingSessionReference: - type: string traceReportingFormat: $ref: '#/components/schemas/traceReportingFormat-Type' traceTarget: -- GitLab From 03f866e07eccc53d65ac00900751b959ab752809 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:13:48 +0000 Subject: [PATCH 5/7] Update version to align with latest TS version --- 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 8536618eb..167f23075 100644 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 16.11.0 + version: 16.15.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 76ffbb1a07754d4a231302e1bbada53001132271 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:14:59 +0000 Subject: [PATCH 6/7] Update version to align with latest TS version --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 7e6e00d7a..436988652 100644 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 16.11.0 + version: 16.15.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From d6c67f22ce57f927b0544f03a21d2fd841c5acf7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:16:56 +0000 Subject: [PATCH 7/7] Update version to align with latest TS version --- 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 26b40e8c2..24ce7d80f 100644 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.11.0 + version: 16.14.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab