From cae6d3e47325a2b0c12bd5d982121efb83c74381 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:11:01 +0000 Subject: [PATCH 01/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 825a03d62..c6abe6960 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5322,9 +5322,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + Managed5GCFunction: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - AmfFunction-Multiple: type: array items: -- GitLab From 3fb071e4560fd47de5e1dbe4e4afe3f95235f2a0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:19:16 +0000 Subject: [PATCH 02/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c6abe6960..d4e594a8f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5322,18 +5322,13 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - Managed5GCFunction: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - type: object - properties: - ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- + Managed5GCFunction-nc0: + type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: -- GitLab From 2429a24f59ffe50f4578a104b8f50833c25b511f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:22:42 +0000 Subject: [PATCH 03/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d4e594a8f..24fd4a73c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3075,6 +3075,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-ncO' - type: object properties: EP_N2: -- GitLab From 5695d31cdc6863e873cb0fe59e6dc357c7afa720 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:27:17 +0000 Subject: [PATCH 04/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 24fd4a73c..765990426 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3075,7 +3075,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N2: -- GitLab From 9b6acaa457104410a215da44ebf804650ae744ee Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:33:40 +0000 Subject: [PATCH 05/15] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b7978e4b5..c6fee26d2 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -542,8 +542,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' -- GitLab From b3914c2ee80207cbf3c67e47a6d25ce01b600e25 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:02:38 +0000 Subject: [PATCH 06/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 765990426..f4641242f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3189,6 +3189,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N4: @@ -3245,6 +3246,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3272,6 +3274,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3305,6 +3308,7 @@ components: dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -3345,6 +3349,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N12: @@ -3376,6 +3381,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N8: @@ -3409,6 +3415,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3435,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3449,6 +3457,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N27: @@ -3478,6 +3487,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N22: @@ -3507,6 +3517,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N20: @@ -3540,6 +3551,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NLS: @@ -3565,6 +3577,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N17: @@ -3590,6 +3603,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N32: @@ -3635,7 +3649,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3653,6 +3667,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM13: @@ -3680,6 +3695,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N33: @@ -3712,6 +3728,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N60: @@ -3736,6 +3753,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_Npc4: @@ -3768,6 +3786,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N88: @@ -3823,6 +3842,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3836,6 +3856,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3849,6 +3870,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3866,7 +3888,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4631,6 +4653,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -4665,6 +4688,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4716,6 +4740,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MfafFunction-Single: allOf: @@ -4738,6 +4763,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ChfFunction-Single: allOf: @@ -4760,6 +4786,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N28: @@ -4922,6 +4949,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NL2: @@ -4955,6 +4983,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N84: @@ -5078,6 +5107,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MbSmfFunction-Single: allOf: @@ -5098,6 +5128,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N11mb: @@ -5171,6 +5202,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3mb: @@ -5201,6 +5233,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM12: -- GitLab From 82f672039e2274e29fb7148ce7c0e5c4504a615e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:16:45 +0000 Subject: [PATCH 07/15] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 53 ++++++++++++++++++++++++++++++++- OpenAPI/TS28623_GenericNrm.yaml | 49 ++---------------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f4641242f..3228062ba 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2926,6 +2926,23 @@ components: properties: nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -5364,6 +5381,37 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- + +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array @@ -5802,7 +5850,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c6fee26d2..ef03be174 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -131,23 +131,7 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - NAMF_COMMUNICATION - - NAMF_EVENTEXPOSURE - - NAMF_MT - - NAMF_LOCATION - - NSMF_PDUSESSION - - NSMF_EVENTEXPOSURE - - OTHERS + TransportProtocol: anyOf: - type: string @@ -563,32 +547,7 @@ components: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -716,10 +675,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: -- GitLab From 4ae00c7e5aacfe8e7093d74ad501b91a9200bb64 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:19:58 +0000 Subject: [PATCH 08/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3228062ba..850c8346c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5378,7 +5378,7 @@ components: type: object properties: ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' + $ref: '#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 60daff99730ffda23a5c7f068d35dc08f0d0a7d5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:24:07 +0000 Subject: [PATCH 09/15] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + OpenAPI/TS28623_GenericNrm.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 850c8346c..6b0df5f8b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5879,6 +5879,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index ef03be174..6a0c59f96 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -714,7 +714,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From cc59068f0f05d59aec1a9f71f4600bd33b4e9150 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:28:12 +0000 Subject: [PATCH 10/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6b0df5f8b..02372631c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5385,7 +5385,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top' + - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From bc4da83136fe585fbe167a2e645612ed8cc7f193 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:31:44 +0000 Subject: [PATCH 11/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 02372631c..0dad063d1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5385,7 +5385,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From e7dc354417b6a0096297d7fd6c6ca671bf4dcb8e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:37:54 +0000 Subject: [PATCH 12/15] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 95 ++++++++++++++++++++++++++++++--- OpenAPI/TS28623_GenericNrm.yaml | 80 --------------------------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0dad063d1..0240d407e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -63,7 +63,7 @@ components: type: string description: uuid of NF instance nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' nFStatus: $ref: '#/components/schemas/NFStatus' plmn: @@ -105,7 +105,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -218,7 +218,7 @@ components: nfInstanceID: type: string nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +240,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -1050,7 +1050,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1523,7 +1523,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1545,7 +1545,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -2925,7 +2925,7 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' SAP: type: object properties: @@ -2943,7 +2943,86 @@ components: - NSMF_PDUSESSION - NSMF_EVENTEXPOSURE - OTHERS + Operation: + type: object + properties: + name: + type: string + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + type: string + description: ' NF name defined in TS 23.501 or TS 29.510' + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + OperationSemantics: + type: string + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 6a0c59f96..3439e59fa 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -51,86 +51,6 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY TransportProtocol: anyOf: -- GitLab From 749c65daa3ade7164d2274be0fc1a1328898494d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:43:54 +0000 Subject: [PATCH 13/15] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ OpenAPI/TS28623_GenericNrm.yaml | 6 +----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b8c44996d..db0d6f755 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0240d407e..88a71ae41 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3023,6 +3023,12 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + enum: + - REGISTERED + - DEREGISTERED + #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3439e59fa..04139e9b5 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: -- GitLab From d501c7e601ed32c2984eb35cf85b9dc918573ffe Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:46:59 +0000 Subject: [PATCH 14/15] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index db0d6f755..5dcbd234c 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext -- GitLab From 096c9d653ed1367329903f4cc5930bb83de905ed Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 27 May 2024 07:10:31 +0000 Subject: [PATCH 15/15] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 88a71ae41..5c2a0f525 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3177,7 +3177,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3291,7 +3291,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3348,7 +3348,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3376,7 +3376,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3410,7 +3410,7 @@ components: dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3451,7 +3451,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3483,7 +3483,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3517,7 +3517,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3537,7 +3537,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3559,7 +3559,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3589,7 +3589,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3619,7 +3619,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3653,7 +3653,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NLS: @@ -3679,7 +3679,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3705,7 +3705,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3751,7 +3751,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3769,7 +3769,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3797,7 +3797,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3830,7 +3830,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3855,7 +3855,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3888,7 +3888,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3944,7 +3944,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3958,7 +3958,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3972,7 +3972,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3990,7 +3990,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4755,7 +4755,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4790,7 +4790,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4842,7 +4842,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4865,7 +4865,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4888,7 +4888,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -5051,7 +5051,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -5085,7 +5085,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5209,7 +5209,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5230,7 +5230,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5304,7 +5304,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5335,7 +5335,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5459,7 +5459,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of abstract IOCs -------------------------------------------- - Managed5GCFunction-nc0: + ManagedFunction5GC-nc0: type: object properties: ManagedNFService: -- GitLab