From 4bb26f2794a6d42fc5f5b0489815fd2bda9f4dbe Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 3 Dec 2021 08:38:00 +0100 Subject: [PATCH 01/11] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 5bfacad52..ed83094d0 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -409,6 +409,9 @@ components: - S6d - S6a - Sh + - N70 + - N71 + - NU1 EIRInterfaces: type: array items: @@ -551,6 +554,7 @@ components: - N10 - N13 - N21 + - NU1 UPFInterfaces: type: array items: @@ -615,6 +619,8 @@ components: - UPF - AUSF - SMSF + - HSS + - UDM tjPLMNTarget-Type: type: object -- GitLab From d684915d6ca8eae6451483d2b7f8acb0540988a0 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 13:24:40 +0100 Subject: [PATCH 02/11] Rel16 CR0623 remove extra '"', Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ef221ec58..a850d5f91 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -65,7 +65,7 @@ components: PlmnInfo: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' -- GitLab From 470a89a5eb4b053c340f838602c4dcda9697a6fc Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Sat, 20 Nov 2021 08:23:18 +0100 Subject: [PATCH 03/11] Update OpenAPI/faultMnS.yaml --- OpenAPI/faultMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml index 7ccf28031..3590a3676 100644 --- a/OpenAPI/faultMnS.yaml +++ b/OpenAPI/faultMnS.yaml @@ -660,7 +660,7 @@ components: - notifyCorrelatedNotificationChanged - notifyComments - notifyClearedAlarm - - notifyAlarmListRebuiltAlarm + - notifyAlarmListRebuilt - notifyPotentialFaultyAlarmList AlarmListAlignmentRequirement: type: string -- GitLab From b9daf4ef7ec9de314913b163bfa4c58657aa53ee Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Sat, 20 Nov 2021 08:31:45 +0100 Subject: [PATCH 04/11] Update faultMnS.yaml --- OpenAPI/faultMnS.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml index 3590a3676..203b424b9 100644 --- a/OpenAPI/faultMnS.yaml +++ b/OpenAPI/faultMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 16.6.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services -- GitLab From 2e751e39cc8c5b05cda5d4057a40f129fd6f7102 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Dec 2021 08:01:50 +0000 Subject: [PATCH 05/11] update version to 16.9.0 for genericNrm.yaml --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index ed83094d0..400314b45 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.9.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 9a342d92be6a3b1448329f5ee7450e8bc449fecf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Oct 2021 03:05:42 +0200 Subject: [PATCH 06/11] Update fileDataReportingMnS.yaml --- OpenAPI/fileDataReportingMnS.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml index 66bf53764..e9f6c71b8 100644 --- a/OpenAPI/fileDataReportingMnS.yaml +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 16.8.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -13,7 +13,7 @@ servers: - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' variables: MnSRoot: - description: See clause 4.4.2 of TS 32.158 + description: See clause 4.4.3 of TS 32.158 default: http://example.com/3GPPManagement MnSVersion: description: Version number of the OpenAPI definition -- GitLab From d7bbed2ad31cfaae508e83926a971ceba1cec3cb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Oct 2021 03:11:46 +0200 Subject: [PATCH 07/11] Update streamingDataMnS.yaml --- OpenAPI/streamingDataMnS.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/streamingDataMnS.yaml b/OpenAPI/streamingDataMnS.yaml index 4c8872353..abbf1271f 100644 --- a/OpenAPI/streamingDataMnS.yaml +++ b/OpenAPI/streamingDataMnS.yaml @@ -1,17 +1,17 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 16.6.0 + version: 16.10.0 description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) servers: - - url: '{MnSRoot}/StreamingDataReportingMnS/{version}' + - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' variables: MnSRoot: - description: See subclause 4.4 of TS 32.158. + description: See clause 4.4.3 of TS 32.158. default: https://example.com/3GPPManagement - version: - description: Indicates the current version of the specification - default: 16.5.0 + MnSVersion: + description: See clause 4.4.3 of TS 32.158. + default: '' paths: '/connections': post: -- GitLab From ce595c2c8af6a6d62889530c49d6df5ef9a08ca4 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Sep 2021 10:40:44 +0200 Subject: [PATCH 08/11] CR0572 Correct Class diagram of AMF Region/AMF Set and stage 3 implementation --- OpenAPI/5gcNrm.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 8025144d8..3840726d2 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -592,6 +592,11 @@ components: $ref: '#/components/schemas/AmfSetId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFRegion: + $ref: 'comDefs.yaml#/components/schemas/Dn' + aMFSetMemberList: + $ref: 'comDefs.yaml#/components/schemas/DnList' + AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -610,6 +615,9 @@ components: $ref: '#/components/schemas/AmfRegionId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFSet: + $ref: 'comDefs.yaml#/components/schemas/DnList' + SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 833cd18c2678131e43eccad13459506c53657c9b Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Sep 2021 10:43:16 +0200 Subject: [PATCH 09/11] CR0572 Correct Class diagram of AMF Region/AMF Set and stage 3 implementation --- OpenAPI/5gcNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 3840726d2..cb839c03b 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -596,6 +596,10 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' + aMFRegion: + $ref: 'comDefs.yaml#/components/schemas/Dn' + aMFSetMemberList: + $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: @@ -617,6 +621,8 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFSet: $ref: 'comDefs.yaml#/components/schemas/DnList' + aMFSet: + $ref: 'comDefs.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: -- GitLab From 4e40ef582ec2782e08ba3ba2ebdb64d44c447315 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 15 Oct 2021 05:05:58 +0200 Subject: [PATCH 10/11] Align with updated stage3 implementation. Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index cb839c03b..7c466eeb9 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -541,7 +541,7 @@ components: $ref: '#/components/schemas/WeightFactor' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - amfSet: + amfSetRef: $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' @@ -596,7 +596,7 @@ components: $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' - aMFRegion: + aMFRegionRef: $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' @@ -619,11 +619,8 @@ components: $ref: '#/components/schemas/AmfRegionId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - aMFSet: - $ref: 'comDefs.yaml#/components/schemas/DnList' - aMFSet: + aMFSetListRef: $ref: 'comDefs.yaml#/components/schemas/DnList' - SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 18c95176bee227233203e050ecfc1f2de62f6d06 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 15 Oct 2021 05:08:46 +0200 Subject: [PATCH 11/11] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 7c466eeb9..537d212d6 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -592,15 +592,10 @@ components: $ref: '#/components/schemas/AmfSetId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - aMFRegion: - $ref: 'comDefs.yaml#/components/schemas/Dn' - aMFSetMemberList: - $ref: 'comDefs.yaml#/components/schemas/DnList' aMFRegionRef: $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' - AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab