From ab4ccaa5a97b451ccfcc82857370f1663a40451c Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Sun, 29 Aug 2021 14:01:41 +0200 Subject: [PATCH 01/37] S5-214115rev1 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 9355f53e9..20b71d0b1 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1206,6 +1206,10 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + MnsRegistry: + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1342,6 +1346,18 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + MnsRegistry: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + mnsVersion: + type: string + mnsAddress: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- VsDataContainer-Single: -- GitLab From dd7fae572d34e0706b2bf6b04f295b85029ab986 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Sun, 29 Aug 2021 14:03:23 +0200 Subject: [PATCH 02/37] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 20b71d0b1..0911920a2 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1208,8 +1208,8 @@ components: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: type: array - items: - $ref: '#/components/schemas/MnsRegistry' + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: -- GitLab From 6e3c49f78441feb8f8e9daecba0d6090299627c6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 03:01:26 +0200 Subject: [PATCH 03/37] Update logicInterfaceId of EP_transport --- OpenAPI/sliceNrm.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6e12a4d8b..18473078c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -465,6 +465,18 @@ components: oneOf: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + + LogicInterfaceInfo: + type: object + properties: + logicalInterfceType: + type: string + enum: + - VLAN + - MPLS + - Segment + logicalInterfceId: + type: string ServiceProfileList: type: array @@ -549,8 +561,8 @@ components: properties: ipAddress: $ref: '#/components/schemas/IpAddress' - logicInterfaceId: - type: string + logicInterfaceInfo: + $ref: '#/components/schemas/LogicInterfaceInfo' nextHopInfo: type: string qosProfile: -- GitLab From 9d0df45f24b8470634b9ed7f7fd01ce9ecb550b4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 02:53:23 +0200 Subject: [PATCH 04/37] Fix the issue caused by the updated NetworkSliceSubnet inheritence relationship --- OpenAPI/sliceNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 18473078c..6c6f6a233 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -550,6 +550,18 @@ components: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: $ref: 'genericNrm.yaml#/components/schemas/DnList' + priorityLabel: + type: integer + PerfMetricJob: + $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' + ThresholdMonitor: + $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' + NtfSubscriptionControl: + $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' + TraceJob: + $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' + AlarmList: + $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: -- GitLab From 5fab16f8c4dd464d56fb860dd14820ae535940dc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 24 Aug 2021 13:28:51 +0200 Subject: [PATCH 05/37] Update sliceNrm.yaml to remove AlarmList --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6c6f6a233..156255cd0 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -560,8 +560,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' - AlarmList: - $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: -- GitLab From 16f6f3f78c2a456c795cb4bccc261dc3f008c4d6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Aug 2021 06:06:51 +0200 Subject: [PATCH 06/37] Update sliceNrm.yaml to remove XXX Control IOC name contained by NetworkSliceSubnet --- OpenAPI/sliceNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 156255cd0..046c85abe 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -552,14 +552,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' priorityLabel: type: integer - PerfMetricJob: - $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' - TraceJob: - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' EP_Transport-Single: allOf: -- GitLab From e726ffdfa594aa448a23ecbcc1c0f4e16778d6dd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 16 Aug 2021 11:22:08 +0200 Subject: [PATCH 07/37] Add YAML (Rest based) solution set for the CR S5-213508 which proposes to convert the 5QI characteristics datatype to IOC --- OpenAPI/5gcNrm.yaml | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fd61fca9d..50d31111a 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -265,26 +265,7 @@ components: type: integer exponent: type: integer - FiveQICharacteristics: - type: object - properties: - fiveQIValue: - type: integer - resourceType: - type: string - enum: - - GBR - - NonGBR - priorityLevel: - type: integer - packetDelayBudget: - type: integer - packetErrorRate: - $ref: '#/components/schemas/PacketErrorRate' - averagingWindow: - type: integer - maximumDataBurstVolume: - type: integer + GtpUPathDelayThresholdsType: @@ -1637,6 +1618,32 @@ components: items: $ref: '#/components/schemas/FiveQiDscpMapping' + FiveQICharacteristics-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + fiveQIValue: + type: integer + resourceType: + type: string + enum: + - GBR + - NonGBR + priorityLevel: + type: integer + packetDelayBudget: + type: integer + packetErrorRate: + $ref: '#/components/schemas/PacketErrorRate' + averagingWindow: + type: integer + maximumDataBurstVolume: + type: integer + FiveQICharacteristics-Multiple: + type: array + items: + $ref: '#/components/schemas/FiveQICharacteristics-Single' Configurable5QISet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -1649,7 +1656,7 @@ components: configurable5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' Dynamic5QISet-Single: allOf: @@ -1663,7 +1670,7 @@ components: dynamic5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' GtpUPathQoSMonitoringControl-Single: allOf: -- GitLab From 33fd5aa300636542de12dccce05f6dda92cceef8 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:42:43 +0200 Subject: [PATCH 08/37] CR 0555 removing "isINEF" --- OpenAPI/5gcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 50d31111a..042b94c04 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1082,8 +1082,6 @@ components: $ref: '#/components/schemas/ManagedNFProfile' capabilityList: $ref: '#/components/schemas/CapabilityList' - isINEF: - type: boolean isCAPIFSup: type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From a8e1726f79a66fd5f24b5f7350d1256b43a0edbe Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:45:44 +0200 Subject: [PATCH 09/37] CR 0555 removing isINEF --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fdb701ed4..7ab28015d 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -43,10 +43,6 @@ module _3gpp-5gc-nrm-neffunction { reference "3GPP TS 23.003"; type string; } - - leaf isINEF { - type boolean; - } leaf isCAPIFSup { type boolean; -- GitLab From 11710a7c203538e288e8e213ef82aeede7c1a2df Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:29:28 +0200 Subject: [PATCH 10/37] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index b1a462f33..00c32396f 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -887,6 +887,20 @@ components: type: array items: $ref: 'genericNrm.yaml#/components/schemas/Dn' + rimRSMonitoringStartTime: + type: string + rimRSMonitoringStopTime: + type: string + rimRSMonitoringWindowDuration: + type: integer + rimRSMonitoringWindowStartingOffset: + type: integer + rimRSMonitoringWindowPeriodicity: + type: integer + rimRSMonitoringOccasionInterval: + type: integer + rimRSMonitoringOccasionStartingOffset: + type: integer nRFrequencyRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' victimSetRef: @@ -1393,20 +1407,6 @@ components: $ref: '#/components/schemas/RSSetId' setType: $ref: '#/components/schemas/RSSetType' - rimRSMonitoringStartTime: - type: string - rimRSMonitoringStopTime: - type: string - rimRSMonitoringWindowDuration: - type: integer - rimRSMonitoringWindowStartingOffset: - type: integer - rimRSMonitoringWindowPeriodicity: - type: integer - rimRSMonitoringOccasionInterval: - type: integer - rimRSMonitoringOccasionStartingOffset: - type: integer nRCellDURefs: $ref: 'genericNrm.yaml#/components/schemas/DnList' -- GitLab From df5692a7a195ae5d16a6e96056335130f1f566f0 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:14:14 +0200 Subject: [PATCH 11/37] Update OpenAPI/nrNrm.yaml, OpenAPI/5gcNrm.yaml, OpenAPI/sliceNrm.yaml files --- OpenAPI/5gcNrm.yaml | 126 +++++++++++++++++++++--------------------- OpenAPI/nrNrm.yaml | 86 ++++++++++++++-------------- OpenAPI/sliceNrm.yaml | 8 +-- 3 files changed, 110 insertions(+), 110 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 042b94c04..57bbc0a72 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -469,7 +469,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -499,7 +499,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -551,7 +551,7 @@ components: AmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -604,7 +604,7 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' AmfSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -622,7 +622,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' AmfRegion-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -640,7 +640,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' SmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -691,7 +691,7 @@ components: UpfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -724,7 +724,7 @@ components: $ref: '#/components/schemas/EP_S5U-Multiple' N3iwfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -745,7 +745,7 @@ components: $ref: '#/components/schemas/EP_N4-Multiple' PcfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -786,7 +786,7 @@ components: AusfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -813,7 +813,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdmFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -842,7 +842,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -860,7 +860,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' UdsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -878,7 +878,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' NrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -903,7 +903,7 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' NssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -932,7 +932,7 @@ components: $ref: '#/components/schemas/EP_N31-Multiple' SmsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -959,7 +959,7 @@ components: $ref: '#/components/schemas/EP_MAP_SMSC-Multiple' LmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -980,7 +980,7 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' NgeirFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1005,7 +1005,7 @@ components: $ref: '#/components/schemas/EP_N17-Multiple' SeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1028,7 +1028,7 @@ components: $ref: '#/components/schemas/EP_N32-Multiple' NwdafFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1051,7 +1051,7 @@ components: ScpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1066,7 +1066,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1088,7 +1088,7 @@ components: NsacfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1110,7 +1110,7 @@ components: ExternalAmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1124,7 +1124,7 @@ components: $ref: '#/components/schemas/AmfIdentifier' ExternalNrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1136,7 +1136,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalNssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1148,7 +1148,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalSeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1166,7 +1166,7 @@ components: EP_N2-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1180,7 +1180,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N3-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1196,7 +1196,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1210,7 +1210,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N5-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1224,7 +1224,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N6-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1238,7 +1238,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N7-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1252,7 +1252,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N8-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1266,7 +1266,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N9-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1280,7 +1280,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N10-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1294,7 +1294,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N11-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1308,7 +1308,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N12-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1322,7 +1322,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N13-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1336,7 +1336,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N14-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1350,7 +1350,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N15-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1364,7 +1364,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N16-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1378,7 +1378,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N17-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1393,7 +1393,7 @@ components: EP_N20-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1408,7 +1408,7 @@ components: EP_N21-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1422,7 +1422,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N22-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1437,7 +1437,7 @@ components: EP_N26-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1451,7 +1451,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N27-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1467,7 +1467,7 @@ components: EP_N31-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1481,7 +1481,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N32-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1504,7 +1504,7 @@ components: EP_S5C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1518,7 +1518,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1532,7 +1532,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Rx-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1546,7 +1546,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_MAP_SMSC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1560,7 +1560,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLS-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1574,7 +1574,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLG-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1589,7 +1589,7 @@ components: EP_N60-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1604,7 +1604,7 @@ components: FiveQiDscpMappingSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1644,7 +1644,7 @@ components: $ref: '#/components/schemas/FiveQICharacteristics-Single' Configurable5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1658,7 +1658,7 @@ components: Dynamic5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1672,7 +1672,7 @@ components: GtpUPathQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1709,7 +1709,7 @@ components: QFQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1746,7 +1746,7 @@ components: PredefinedPccRuleSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 00c32396f..b235070e0 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -624,7 +624,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -657,7 +657,7 @@ components: GnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -694,7 +694,7 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' GnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -733,7 +733,7 @@ components: $ref: '#/components/schemas/EP_S1U-Multiple' GnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -793,7 +793,7 @@ components: NrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -831,7 +831,7 @@ components: NrCellDu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -919,7 +919,7 @@ components: NRFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -937,7 +937,7 @@ components: maximum: 256 EUtranFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -954,7 +954,7 @@ components: NrSectorCarrier-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -983,7 +983,7 @@ components: $ref: '#/components/schemas/CommonBeamformingFunction-Single' Bwp-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1006,7 +1006,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' CommonBeamformingFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1025,7 +1025,7 @@ components: $ref: '#/components/schemas/Beam-Multiple' Beam-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1056,7 +1056,7 @@ components: maximum: 1800 RRMPolicyRatio-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1073,7 +1073,7 @@ components: NRCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1099,7 +1099,7 @@ components: type: boolean EUtranCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1112,7 +1112,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1175,7 +1175,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1238,7 +1238,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1251,7 +1251,7 @@ components: DESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1286,7 +1286,7 @@ components: DRACHOptimizationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1302,7 +1302,7 @@ components: DMROFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1319,7 +1319,7 @@ components: DPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1332,7 +1332,7 @@ components: CPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1345,7 +1345,7 @@ components: CESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1380,7 +1380,7 @@ components: RimRSGlobal-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1397,7 +1397,7 @@ components: RimRSSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1412,7 +1412,7 @@ components: ExternalGnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1433,7 +1433,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' ExternalGnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1456,7 +1456,7 @@ components: $ref: '#/components/schemas/EP_XnU-Multiple' ExternalGnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1484,7 +1484,7 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' ExternalNrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1503,7 +1503,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1520,7 +1520,7 @@ components: $ref: '#/components/schemas/ExternalEUTranCell-Multiple' ExternalEUTranCell-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1534,7 +1534,7 @@ components: EP_XnC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1548,7 +1548,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_E1-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1562,7 +1562,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1576,7 +1576,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1590,7 +1590,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_X2C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1604,7 +1604,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_XnU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1618,7 +1618,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1632,7 +1632,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1649,7 +1649,7 @@ components: EP_X2U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1663,7 +1663,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_S1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 046c85abe..f1ad099a3 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -491,7 +491,7 @@ components: #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -511,7 +511,7 @@ components: NetworkSlice-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -529,7 +529,7 @@ components: NetworkSliceSubnet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -555,7 +555,7 @@ components: EP_Transport-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 4ec7d14c5b935d64326648fb6b4ae921339e22b1 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:22:24 +0200 Subject: [PATCH 12/37] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index b235070e0..456b3060a 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1630,6 +1630,9 @@ components: $ref: '#/components/schemas/LocalAddress' remoteAddress: $ref: '#/components/schemas/RemoteAddress' + epTransportRefs: + $ref: 'genericNrm.yaml#/components/schemas/DnList' + EP_NgU-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 122bda63d92ed422a39a28cefda29fa75a4ee46a Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 09:32:48 +0200 Subject: [PATCH 13/37] Rel-17 CR 28.541 Add NPN Identity on NR cell to support access control for NPN UEs --- OpenAPI/nrNrm.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 456b3060a..035cf12ee 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -73,6 +73,23 @@ components: type: array items: $ref: '#/components/schemas/PlmnInfo' + cagId: + type: string + nid: + type: string + NpnIdentity: + type: object + properties: + plmnId": + $ref: '#/components/schemas/PlmnId' + cagidList: + $ref: '#/components/schemas/cagId' + nidList: + $ref: '#/components/schemas/nid' + NpnIdentityList: + type: array + items: + $ref: '#/components/schemas/NpnIdentity' GGnbId: type: string pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' @@ -849,6 +866,8 @@ components: $ref: '#/components/schemas/CellState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' + npnIdentityList: + $ref: '#/components/schemas/NpnIdentiyList' nrPci: $ref: '#/components/schemas/NrPci' nrTac: -- GitLab From a7e65bdd064271f6b34d6df8119a7cb61cb323c9 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 09:42:34 +0200 Subject: [PATCH 14/37] Rel-17 CR 28.541 Add NPN Identity on NR cell to support access control for NPN UEs --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 035cf12ee..f332d2d8a 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -867,7 +867,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' npnIdentityList: - $ref: '#/components/schemas/NpnIdentiyList' + $ref: '#/components/schemas/NpnIdentityList' nrPci: $ref: '#/components/schemas/NrPci' nrTac: -- GitLab From 1b05157e0f1b14a5e50914b4bebdf2b5957a0dea Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 11:31:13 +0200 Subject: [PATCH 15/37] Add radio spectrum support in slicing profiles --- OpenAPI/sliceNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index f1ad099a3..f0dcad991 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -160,6 +160,13 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' + RadioSpectrum: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + nROperatingBands: + type: string Synchronicity: type: object properties: @@ -310,6 +317,8 @@ components: $ref: '#/components/schemas/ServiceType' maxPktSize: type: integer + nROperatingBands: + type: string delayTolerance: $ref: '#/components/schemas/DelayTolerance' positioning: @@ -347,6 +356,8 @@ components: type: integer maxNumberOfPDUSessions: type: integer + nROperatingBands: + type: string sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: @@ -417,6 +428,8 @@ components: $ref: '#/components/schemas/KPIMonitoring' nBIoT: $ref: '#/components/schemas/NBIoT' + radioSpectrum: + $ref: '#/components/schemas/RadioSpectrum' synchronicity: $ref: '#/components/schemas/Synchronicity' positioning: -- GitLab From 6afc80dd7a46f8986e99180044462808c6e18e76 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 11:02:07 +0200 Subject: [PATCH 16/37] Update maxPktSize and determinComm to support UL and DL requirements --- OpenAPI/sliceNrm.yaml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index f0dcad991..c05ab4376 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -278,7 +278,9 @@ components: type: integer resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer delayTolerance: $ref: '#/components/schemas/DelayTolerance' @@ -290,7 +292,9 @@ components: type: string energyEfficiency: type: integer - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' RANSliceSubnetProfile: type: object @@ -315,7 +319,9 @@ components: type: string serviceType: $ref: '#/components/schemas/ServiceType' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer nROperatingBands: type: string @@ -333,7 +339,9 @@ components: type: string synchronicity: $ref: '#/components/schemas/SynchronicityRANSubnet' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' TopSliceSubnetProfile: type: object @@ -352,7 +360,9 @@ components: $ref: '#/components/schemas/XLThpt' uLThptPerUE: $ref: '#/components/schemas/XLThpt' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer maxNumberOfPDUSessions: type: integer @@ -384,7 +394,9 @@ components: type: string serviceType: $ref: '#/components/schemas/ServiceType' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string @@ -410,7 +422,9 @@ components: type: number delayTolerance: $ref: '#/components/schemas/DelayTolerance' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' dLThptPerSlice: $ref: '#/components/schemas/XLThpt' @@ -420,7 +434,9 @@ components: $ref: '#/components/schemas/XLThpt' uLThptPerUE: $ref: '#/components/schemas/XLThpt' - maxPktSize: + dLMaxPktSize: + $ref: '#/components/schemas/MaxPktSize' + uLMaxPktSize: $ref: '#/components/schemas/MaxPktSize' maxNumberofPDUSessions: $ref: '#/components/schemas/MaxNumberofPDUSessions' -- GitLab From 6c738bb61a6cfef02119e04f15aeb84350922f0b Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 10:50:50 +0200 Subject: [PATCH 17/37] Remove obsolete coverageArea attribute in TopSliceSubnetProfile --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index c05ab4376..618cab023 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -346,8 +346,6 @@ components: TopSliceSubnetProfile: type: object properties: - coverageArea: - type: string latency: type: integer maxNumberofUEs: -- GitLab From 29ac65240020ef2eb243b3714bf0e4cb592ae3e9 Mon Sep 17 00:00:00 2001 From: shumim Date: Mon, 2 Aug 2021 14:05:38 +0800 Subject: [PATCH 18/37] Enhance 5GC NRM to support 5G DDNMF --- OpenAPI/5gcNrm.yaml | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 57bbc0a72..7c3fa97ae 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1108,6 +1108,34 @@ components: EP_N60: $ref: '#/components/schemas/EP_N60-Multiple' + DDNMFFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N64: + $ref: '#/components/schemas/EP_N64-Multiple' + EP_N65: + $ref: '#/components/schemas/EP_N65-Multiple' + EP_N66: + $ref: '#/components/schemas/EP_N66-Multiple' + ExternalAmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1601,6 +1629,48 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N64-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N65-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N66-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' FiveQiDscpMappingSet-Single: allOf: @@ -1996,7 +2066,18 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' - + EP_N64-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N64-Single' + EP_N65-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N65-Single' + EP_N66-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N66-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From 106ee8f9cf6a50142a02683a9c55d7eb80fe1c51 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Tue, 17 Aug 2021 03:15:41 +0200 Subject: [PATCH 19/37] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 7c3fa97ae..1626b02b1 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1085,7 +1085,10 @@ components: isCAPIFSup: type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - type: object + properties: + EP_N33: + $ref: '#/components/schemas/EP_N33-Multiple' NsacfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1529,7 +1532,20 @@ components: type: string withIPX: type: boolean - + EP_N33-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5C-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -2037,7 +2053,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N32-Single' - + EP_N33-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N33-Single' EP_S5C-Multiple: type: array items: @@ -2150,7 +2169,8 @@ components: - $ref: '#/components/schemas/EP_N27-Single' - $ref: '#/components/schemas/EP_N31-Single' - - $ref: '#/components/schemas/EP_N31-Single' + - $ref: '#/components/schemas/EP_N32-Single' + - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' - $ref: '#/components/schemas/EP_S5C-Single' -- GitLab From bb18db315fd59f22b0f1c4365c5c7776c2f4d7dd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 7 Sep 2021 05:30:34 +0200 Subject: [PATCH 20/37] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 618cab023..7e0ad1f7f 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -296,6 +296,8 @@ components: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' + survivalTime: + type: string RANSliceSubnetProfile: type: object properties: -- GitLab From 7cbcc82c2814e7d2665ff1fcc0add597b87e5b07 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 02:58:54 +0200 Subject: [PATCH 21/37] Update the version of nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index f332d2d8a..850106631 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 0bd473769b9debe6f0693b6bf13020d88e71f290 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:01:33 +0200 Subject: [PATCH 22/37] Update version of 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 1626b02b1..e4c4b2619 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 610fadd131ab0466d6f276a31c7ea6e0c6af7cba Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:02:50 +0200 Subject: [PATCH 23/37] Update version of sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7e0ad1f7f..bf6b4d71c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 816a87a2b19552c49386c30bc37cdebdc1a942f1 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:29:28 +0200 Subject: [PATCH 24/37] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index b1a462f33..00c32396f 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -887,6 +887,20 @@ components: type: array items: $ref: 'genericNrm.yaml#/components/schemas/Dn' + rimRSMonitoringStartTime: + type: string + rimRSMonitoringStopTime: + type: string + rimRSMonitoringWindowDuration: + type: integer + rimRSMonitoringWindowStartingOffset: + type: integer + rimRSMonitoringWindowPeriodicity: + type: integer + rimRSMonitoringOccasionInterval: + type: integer + rimRSMonitoringOccasionStartingOffset: + type: integer nRFrequencyRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' victimSetRef: @@ -1393,20 +1407,6 @@ components: $ref: '#/components/schemas/RSSetId' setType: $ref: '#/components/schemas/RSSetType' - rimRSMonitoringStartTime: - type: string - rimRSMonitoringStopTime: - type: string - rimRSMonitoringWindowDuration: - type: integer - rimRSMonitoringWindowStartingOffset: - type: integer - rimRSMonitoringWindowPeriodicity: - type: integer - rimRSMonitoringOccasionInterval: - type: integer - rimRSMonitoringOccasionStartingOffset: - type: integer nRCellDURefs: $ref: 'genericNrm.yaml#/components/schemas/DnList' -- GitLab From 85e6a7f28b08e14431aa3d96bd48b8a9a1da552e Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:14:14 +0200 Subject: [PATCH 25/37] Update OpenAPI/nrNrm.yaml, OpenAPI/5gcNrm.yaml, OpenAPI/sliceNrm.yaml files --- OpenAPI/5gcNrm.yaml | 126 +++++++++++++++++++++--------------------- OpenAPI/nrNrm.yaml | 86 ++++++++++++++-------------- OpenAPI/sliceNrm.yaml | 8 +-- 3 files changed, 110 insertions(+), 110 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 042b94c04..57bbc0a72 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -469,7 +469,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -499,7 +499,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -551,7 +551,7 @@ components: AmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -604,7 +604,7 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' AmfSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -622,7 +622,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' AmfRegion-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -640,7 +640,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' SmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -691,7 +691,7 @@ components: UpfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -724,7 +724,7 @@ components: $ref: '#/components/schemas/EP_S5U-Multiple' N3iwfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -745,7 +745,7 @@ components: $ref: '#/components/schemas/EP_N4-Multiple' PcfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -786,7 +786,7 @@ components: AusfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -813,7 +813,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdmFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -842,7 +842,7 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -860,7 +860,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' UdsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -878,7 +878,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' NrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -903,7 +903,7 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' NssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -932,7 +932,7 @@ components: $ref: '#/components/schemas/EP_N31-Multiple' SmsfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -959,7 +959,7 @@ components: $ref: '#/components/schemas/EP_MAP_SMSC-Multiple' LmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -980,7 +980,7 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' NgeirFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1005,7 +1005,7 @@ components: $ref: '#/components/schemas/EP_N17-Multiple' SeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1028,7 +1028,7 @@ components: $ref: '#/components/schemas/EP_N32-Multiple' NwdafFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1051,7 +1051,7 @@ components: ScpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1066,7 +1066,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1088,7 +1088,7 @@ components: NsacfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1110,7 +1110,7 @@ components: ExternalAmfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1124,7 +1124,7 @@ components: $ref: '#/components/schemas/AmfIdentifier' ExternalNrfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1136,7 +1136,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalNssfFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1148,7 +1148,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' ExternalSeppFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1166,7 +1166,7 @@ components: EP_N2-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1180,7 +1180,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N3-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1196,7 +1196,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1210,7 +1210,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N5-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1224,7 +1224,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N6-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1238,7 +1238,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N7-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1252,7 +1252,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N8-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1266,7 +1266,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N9-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1280,7 +1280,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N10-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1294,7 +1294,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N11-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1308,7 +1308,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N12-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1322,7 +1322,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N13-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1336,7 +1336,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N14-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1350,7 +1350,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N15-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1364,7 +1364,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N16-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1378,7 +1378,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N17-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1393,7 +1393,7 @@ components: EP_N20-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1408,7 +1408,7 @@ components: EP_N21-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1422,7 +1422,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N22-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1437,7 +1437,7 @@ components: EP_N26-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1451,7 +1451,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N27-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1467,7 +1467,7 @@ components: EP_N31-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1481,7 +1481,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_N32-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1504,7 +1504,7 @@ components: EP_S5C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1518,7 +1518,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1532,7 +1532,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Rx-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1546,7 +1546,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_MAP_SMSC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1560,7 +1560,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLS-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1574,7 +1574,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_NLG-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1589,7 +1589,7 @@ components: EP_N60-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1604,7 +1604,7 @@ components: FiveQiDscpMappingSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1644,7 +1644,7 @@ components: $ref: '#/components/schemas/FiveQICharacteristics-Single' Configurable5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1658,7 +1658,7 @@ components: Dynamic5QISet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1672,7 +1672,7 @@ components: GtpUPathQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1709,7 +1709,7 @@ components: QFQoSMonitoringControl-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1746,7 +1746,7 @@ components: PredefinedPccRuleSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 00c32396f..b235070e0 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,7 @@ components: SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -624,7 +624,7 @@ components: ManagedElement-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -657,7 +657,7 @@ components: GnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -694,7 +694,7 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' GnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -733,7 +733,7 @@ components: $ref: '#/components/schemas/EP_S1U-Multiple' GnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -793,7 +793,7 @@ components: NrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -831,7 +831,7 @@ components: NrCellDu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -919,7 +919,7 @@ components: NRFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -937,7 +937,7 @@ components: maximum: 256 EUtranFrequency-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -954,7 +954,7 @@ components: NrSectorCarrier-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -983,7 +983,7 @@ components: $ref: '#/components/schemas/CommonBeamformingFunction-Single' Bwp-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1006,7 +1006,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' CommonBeamformingFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1025,7 +1025,7 @@ components: $ref: '#/components/schemas/Beam-Multiple' Beam-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1056,7 +1056,7 @@ components: maximum: 1800 RRMPolicyRatio-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1073,7 +1073,7 @@ components: NRCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1099,7 +1099,7 @@ components: type: boolean EUtranCellRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1112,7 +1112,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1175,7 +1175,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1238,7 +1238,7 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1251,7 +1251,7 @@ components: DESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1286,7 +1286,7 @@ components: DRACHOptimizationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1302,7 +1302,7 @@ components: DMROFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1319,7 +1319,7 @@ components: DPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1332,7 +1332,7 @@ components: CPCIConfigurationFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1345,7 +1345,7 @@ components: CESManagementFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1380,7 +1380,7 @@ components: RimRSGlobal-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1397,7 +1397,7 @@ components: RimRSSet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1412,7 +1412,7 @@ components: ExternalGnbDuFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1433,7 +1433,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' ExternalGnbCuUpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1456,7 +1456,7 @@ components: $ref: '#/components/schemas/EP_XnU-Multiple' ExternalGnbCuCpFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1484,7 +1484,7 @@ components: $ref: '#/components/schemas/EP_F1C-Multiple' ExternalNrCellCu-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1503,7 +1503,7 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1520,7 +1520,7 @@ components: $ref: '#/components/schemas/ExternalEUTranCell-Multiple' ExternalEUTranCell-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1534,7 +1534,7 @@ components: EP_XnC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1548,7 +1548,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_E1-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1562,7 +1562,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1576,7 +1576,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgC-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1590,7 +1590,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_X2C-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1604,7 +1604,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_XnU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1618,7 +1618,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_F1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1632,7 +1632,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_NgU-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1649,7 +1649,7 @@ components: EP_X2U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1663,7 +1663,7 @@ components: $ref: '#/components/schemas/RemoteAddress' EP_S1U-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 046c85abe..f1ad099a3 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -491,7 +491,7 @@ components: #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -511,7 +511,7 @@ components: NetworkSlice-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -529,7 +529,7 @@ components: NetworkSliceSubnet-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -555,7 +555,7 @@ components: EP_Transport-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 9a3eb1dfcb4ea79585831b78f27d5f4ead9947a0 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:22:24 +0200 Subject: [PATCH 26/37] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index b235070e0..456b3060a 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1630,6 +1630,9 @@ components: $ref: '#/components/schemas/LocalAddress' remoteAddress: $ref: '#/components/schemas/RemoteAddress' + epTransportRefs: + $ref: 'genericNrm.yaml#/components/schemas/DnList' + EP_NgU-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From f34ce3577577dc72e9ed4e47e929a908e486725d Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 09:32:48 +0200 Subject: [PATCH 27/37] Rel-17 CR 28.541 Add NPN Identity on NR cell to support access control for NPN UEs --- OpenAPI/nrNrm.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 456b3060a..035cf12ee 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -73,6 +73,23 @@ components: type: array items: $ref: '#/components/schemas/PlmnInfo' + cagId: + type: string + nid: + type: string + NpnIdentity: + type: object + properties: + plmnId": + $ref: '#/components/schemas/PlmnId' + cagidList: + $ref: '#/components/schemas/cagId' + nidList: + $ref: '#/components/schemas/nid' + NpnIdentityList: + type: array + items: + $ref: '#/components/schemas/NpnIdentity' GGnbId: type: string pattern: '^[0-9]{3}[0-9]{2,3}-(22|23|24|25|26|27|28|29|30|31|32)-[0-9]{1,10}' @@ -849,6 +866,8 @@ components: $ref: '#/components/schemas/CellState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' + npnIdentityList: + $ref: '#/components/schemas/NpnIdentiyList' nrPci: $ref: '#/components/schemas/NrPci' nrTac: -- GitLab From a15fee0c45558cbcef63fc4713244539dfdb5ccc Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 09:42:34 +0200 Subject: [PATCH 28/37] Rel-17 CR 28.541 Add NPN Identity on NR cell to support access control for NPN UEs --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 035cf12ee..f332d2d8a 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -867,7 +867,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' npnIdentityList: - $ref: '#/components/schemas/NpnIdentiyList' + $ref: '#/components/schemas/NpnIdentityList' nrPci: $ref: '#/components/schemas/NrPci' nrTac: -- GitLab From 995b755fd347e2e3113be76ca65e17b55d2914ce Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 11:31:13 +0200 Subject: [PATCH 29/37] Add radio spectrum support in slicing profiles --- OpenAPI/sliceNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index f1ad099a3..f0dcad991 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -160,6 +160,13 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' + RadioSpectrum: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + nROperatingBands: + type: string Synchronicity: type: object properties: @@ -310,6 +317,8 @@ components: $ref: '#/components/schemas/ServiceType' maxPktSize: type: integer + nROperatingBands: + type: string delayTolerance: $ref: '#/components/schemas/DelayTolerance' positioning: @@ -347,6 +356,8 @@ components: type: integer maxNumberOfPDUSessions: type: integer + nROperatingBands: + type: string sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: @@ -417,6 +428,8 @@ components: $ref: '#/components/schemas/KPIMonitoring' nBIoT: $ref: '#/components/schemas/NBIoT' + radioSpectrum: + $ref: '#/components/schemas/RadioSpectrum' synchronicity: $ref: '#/components/schemas/Synchronicity' positioning: -- GitLab From 77c173611a720b0ad4f8e38a70f4ab7be465cac4 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 11:02:07 +0200 Subject: [PATCH 30/37] Update maxPktSize and determinComm to support UL and DL requirements --- OpenAPI/sliceNrm.yaml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index f0dcad991..c05ab4376 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -278,7 +278,9 @@ components: type: integer resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer delayTolerance: $ref: '#/components/schemas/DelayTolerance' @@ -290,7 +292,9 @@ components: type: string energyEfficiency: type: integer - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' RANSliceSubnetProfile: type: object @@ -315,7 +319,9 @@ components: type: string serviceType: $ref: '#/components/schemas/ServiceType' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer nROperatingBands: type: string @@ -333,7 +339,9 @@ components: type: string synchronicity: $ref: '#/components/schemas/SynchronicityRANSubnet' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' TopSliceSubnetProfile: type: object @@ -352,7 +360,9 @@ components: $ref: '#/components/schemas/XLThpt' uLThptPerUE: $ref: '#/components/schemas/XLThpt' - maxPktSize: + dLMaxPktSize: + type: integer + uLMaxPktSize: type: integer maxNumberOfPDUSessions: type: integer @@ -384,7 +394,9 @@ components: type: string serviceType: $ref: '#/components/schemas/ServiceType' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string @@ -410,7 +422,9 @@ components: type: number delayTolerance: $ref: '#/components/schemas/DelayTolerance' - deterministicComm: + dLDeterministicComm: + $ref: '#/components/schemas/DeterministicComm' + uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' dLThptPerSlice: $ref: '#/components/schemas/XLThpt' @@ -420,7 +434,9 @@ components: $ref: '#/components/schemas/XLThpt' uLThptPerUE: $ref: '#/components/schemas/XLThpt' - maxPktSize: + dLMaxPktSize: + $ref: '#/components/schemas/MaxPktSize' + uLMaxPktSize: $ref: '#/components/schemas/MaxPktSize' maxNumberofPDUSessions: $ref: '#/components/schemas/MaxNumberofPDUSessions' -- GitLab From d57c6c0315ec71bcb81332894793fd30c43c1a79 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 13 Aug 2021 10:50:50 +0200 Subject: [PATCH 31/37] Remove obsolete coverageArea attribute in TopSliceSubnetProfile --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index c05ab4376..618cab023 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -346,8 +346,6 @@ components: TopSliceSubnetProfile: type: object properties: - coverageArea: - type: string latency: type: integer maxNumberofUEs: -- GitLab From 1fb23c216c4c73488abc13f8fb25aaa3813b9a8f Mon Sep 17 00:00:00 2001 From: shumim Date: Mon, 2 Aug 2021 14:05:38 +0800 Subject: [PATCH 32/37] Enhance 5GC NRM to support 5G DDNMF --- OpenAPI/5gcNrm.yaml | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 57bbc0a72..7c3fa97ae 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1108,6 +1108,34 @@ components: EP_N60: $ref: '#/components/schemas/EP_N60-Multiple' + DDNMFFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N64: + $ref: '#/components/schemas/EP_N64-Multiple' + EP_N65: + $ref: '#/components/schemas/EP_N65-Multiple' + EP_N66: + $ref: '#/components/schemas/EP_N66-Multiple' + ExternalAmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1601,6 +1629,48 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N64-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N65-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_N66-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' FiveQiDscpMappingSet-Single: allOf: @@ -1996,7 +2066,18 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' - + EP_N64-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N64-Single' + EP_N65-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N65-Single' + EP_N66-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N66-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From ef7701e2dd20762a13ad5dd2d119a9bf02226b57 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Tue, 17 Aug 2021 03:15:41 +0200 Subject: [PATCH 33/37] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 7c3fa97ae..1626b02b1 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1085,7 +1085,10 @@ components: isCAPIFSup: type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - type: object + properties: + EP_N33: + $ref: '#/components/schemas/EP_N33-Multiple' NsacfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1529,7 +1532,20 @@ components: type: string withIPX: type: boolean - + EP_N33-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_S5C-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -2037,7 +2053,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N32-Single' - + EP_N33-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N33-Single' EP_S5C-Multiple: type: array items: @@ -2150,7 +2169,8 @@ components: - $ref: '#/components/schemas/EP_N27-Single' - $ref: '#/components/schemas/EP_N31-Single' - - $ref: '#/components/schemas/EP_N31-Single' + - $ref: '#/components/schemas/EP_N32-Single' + - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' - $ref: '#/components/schemas/EP_S5C-Single' -- GitLab From 7babe15fc249b8a8f40cf0f0117328f77d4ee7a8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 7 Sep 2021 05:30:34 +0200 Subject: [PATCH 34/37] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 618cab023..7e0ad1f7f 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -296,6 +296,8 @@ components: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' + survivalTime: + type: string RANSliceSubnetProfile: type: object properties: -- GitLab From 0b539e54e1e9db7a5348da4be181d4bea6f9b727 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 02:58:54 +0200 Subject: [PATCH 35/37] Update the version of nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index f332d2d8a..850106631 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 5d57112dcc8790266d6f26d0eb2e6921d55a0c73 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:01:33 +0200 Subject: [PATCH 36/37] Update version of 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 1626b02b1..e4c4b2619 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 7e789ab6e89306ab24c972e3df6e4e6f726580f8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Sep 2021 03:02:50 +0200 Subject: [PATCH 37/37] Update version of sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 7e0ad1f7f..bf6b4d71c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.3.0 + version: 17.4.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab