From 1a8e3b8a299cbf4f82782fb55062f622dbe16b95 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 13:29:25 +0000 Subject: [PATCH 1/5] TS28.541_Rel18_CR0894 NRF phase one Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 154 +++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f..7728a0be2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1399,6 +1399,154 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + NrfInfo: + description: Information of an NRF NF Instance, used in hierarchical NRF deployments + type: object + properties: + servedUdrInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdrInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedUdmInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdmInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedAusfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAusfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedNwdafInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NwdafInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedNwdafInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/NwdafInfo' + minProperties: 1 + minProperties: 1 + servedLmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/LmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdsfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdsfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedScpInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ScpInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedSeppInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SeppInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedEasdfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/EasdfInfo' + minProperties: 1 + servedTrustAfInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/TrustAfInfo' + minProperties: 1 + servedNssaafInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/NssaafInfo' + minProperties: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1963,8 +2111,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + plmnInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' sBIFqdn: type: string cNSIIdList: @@ -1973,6 +2121,8 @@ components: $ref: '#/components/schemas/NFProfileList' snssaiList: $ref: '#/components/schemas/SnssaiList' + nrfInfo: + $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From e7818884a57618e72499f15f7d1aca82e269e93c Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:24:09 +0000 Subject: [PATCH 2/5] Correction according to comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7728a0be2..ed635fb32 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2119,8 +2119,6 @@ components: $ref: '#/components/schemas/CNSIIdList' nFProfileList: $ref: '#/components/schemas/NFProfileList' - snssaiList: - $ref: '#/components/schemas/SnssaiList' nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From cb91017708ccbfe1668cf9fb6881623d6ba49a37 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 29 May 2023 01:39:49 +0000 Subject: [PATCH 3/5] align with agreed comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 83 ------------------------------------- 1 file changed, 83 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ed635fb32..d31e278da 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1411,18 +1411,6 @@ components: - $ref: '#/components/schemas/UdrInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - servedUdrInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdrInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - minProperties: 1 servedUdmInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1431,18 +1419,6 @@ components: - $ref: '#/components/schemas/UdmInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - servedUdmInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdmInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - minProperties: 1 servedAusfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1451,18 +1427,6 @@ components: - $ref: '#/components/schemas/AusfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - servedAusfInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/AusfInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - minProperties: 1 servedNwdafInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1471,16 +1435,6 @@ components: - $ref: '#/components/schemas/NwdafInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - servedNwdafInfoList: - type: object - description: A map (list of key-value pairs) where NF Instance Id serves as key - additionalProperties: - type: object - description: A map (list of key-value pairs) where a valid JSON string serves as key - additionalProperties: - $ref: '#/components/schemas/NwdafInfo' - minProperties: 1 - minProperties: 1 servedLmfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1497,43 +1451,6 @@ components: - $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 - servedUdsfInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdsfInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - minProperties: 1 - servedScpInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/ScpInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - servedSeppInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/SeppInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - servedEasdfInfoList: - type: object - description: A map (list of key-value pairs) where NF Instance Id serves as key - additionalProperties: - type: object - description: A map (list of key-value pairs) where a valid JSON string serves as key - additionalProperties: - $ref: '#/components/schemas/EasdfInfo' - minProperties: 1 servedTrustAfInfo: type: object description: A map (list of key-value pairs) where NF Instance Id serves as key -- GitLab From 6136ca1f737240b244724aed005dd41d2cd1a256 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 13:29:25 +0000 Subject: [PATCH 4/5] TS28.541_Rel18_CR0894 NRF phase one Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 71 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 329aabba2..cbd7f5319 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1480,6 +1480,71 @@ components: secondaryChfInstance: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + NrfInfo: + description: Information of an NRF NF Instance, used in hierarchical NRF deployments + type: object + properties: + servedUdrInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdmInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAusfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedNwdafInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NwdafInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedLmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/LmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdsfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedTrustAfInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/TrustAfInfo' + minProperties: 1 + servedNssaafInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/NssaafInfo' + minProperties: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -2058,8 +2123,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + plmnInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' sBIFqdn: type: string cNSIIdList: @@ -2068,6 +2133,8 @@ components: $ref: '#/components/schemas/NFProfileList' snssaiList: $ref: '#/components/schemas/SnssaiList' + nrfInfo: + $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From d3262a5c9132888ca22b814bf559d0166c6679d7 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:24:09 +0000 Subject: [PATCH 5/5] Correction according to comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index cbd7f5319..6831c4180 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2131,8 +2131,6 @@ components: $ref: '#/components/schemas/CNSIIdList' nFProfileList: $ref: '#/components/schemas/NFProfileList' - snssaiList: - $ref: '#/components/schemas/SnssaiList' nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab