From 602302f3b4c2aeb731945f2731d276e539603bdb Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:35:23 +0000 Subject: [PATCH 1/6] TS28.541_Rel18_CR0896 MFAF Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 52 ++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f..e76b8ea91 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1399,6 +1399,28 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + MfafInfo: + description: Information of a MFAF NF Instance + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1502,6 +1524,8 @@ components: $ref: '#/components/schemas/NssaafFunction-Multiple' AFFunction: $ref: '#/components/schemas/AfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' AmfFunction-Single: allOf: @@ -3140,6 +3164,28 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + MfafFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mfafInfo: + $ref: '#/components/schemas/MfafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3434,6 +3480,10 @@ components: type: array items: $ref: '#/components/schemas/AfFunction-Single' + MfafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MfafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3524,4 +3574,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - + - $ref: '#/components/schemas/MfacfFunction-Single' -- GitLab From c0eaf369052fca87deda542f1533368bdbaeb432 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:52:19 +0000 Subject: [PATCH 2/6] fix validation Update 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 e76b8ea91..333a4ab9c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3574,4 +3574,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - - $ref: '#/components/schemas/MfacfFunction-Single' + - $ref: '#/components/schemas/MfafFunction-Single' -- GitLab From c001a3bcbd50a1c3d05f2d0e3cb4b4ea1803905e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:51:40 +0000 Subject: [PATCH 3/6] updated per review comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 333a4ab9c..27a15607a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1407,19 +1407,16 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - minItems: 1 servingNfSetIdList: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' - minItems: 1 taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: $ref: '#/components/schemas/TaiRange' - minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: -- GitLab From 3ff66217e1d217e7828cdd97790494182c332c0a Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:35:23 +0000 Subject: [PATCH 4/6] TS28.541_Rel18_CR0896 MFAF Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 50 ++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1b9d0a6c2..51aa5f5b8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1426,10 +1426,29 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: type: array items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + $ref: '#/components/schemas/TaiRange' + minItems: 1 + + MfafInfo: + description: Information of a MFAF NF Instance + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: @@ -1571,6 +1590,8 @@ components: $ref: '#/components/schemas/DccfFunction-Multiple' ChfFunction: $ref: '#/components/schemas/ChfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' AmfFunction-Single: allOf: @@ -3239,6 +3260,28 @@ components: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + MfafFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mfafInfo: + $ref: '#/components/schemas/MfafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + ChfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3647,6 +3690,10 @@ components: type: array items: $ref: '#/components/schemas/ChfFunction-Single' + MfafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MfafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3745,3 +3792,4 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' + - $ref: '#/components/schemas/MfacfFunction-Single' -- GitLab From 8a71ac7c21db592db4e03b646bae7fa77823ee2e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:52:19 +0000 Subject: [PATCH 5/6] fix validation Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 51aa5f5b8..1fbfc4512 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3791,5 +3791,4 @@ components: - $ref: '#/components/schemas/AfFunction-Single' - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - - $ref: '#/components/schemas/ChfFunction-Single' - - $ref: '#/components/schemas/MfacfFunction-Single' + - $ref: '#/components/schemas/MfafFunction-Single' -- GitLab From 1b6edc30d1c01fa82be64e12c3b20a966db9240e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:51:40 +0000 Subject: [PATCH 6/6] updated per review comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1fbfc4512..329aabba2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1441,19 +1441,16 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - minItems: 1 servingNfSetIdList: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' - minItems: 1 taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: $ref: '#/components/schemas/TaiRange' - minItems: 1 ChfInfo: description: Information of a CHF NF Instance -- GitLab