From 2952de3a64271ca309a34d4f4edb06cda7bcfd5d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 10 Aug 2023 02:48:30 +0000 Subject: [PATCH 1/2] TS28.541_Rel18_CR0962 --- OpenAPI/TS28541_5GcNrm.yaml | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7eeb11a6c..eda57f34e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1559,6 +1559,47 @@ components: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + BsfInfo: + description: Information of a BSF NF Instance + type: object + properties: + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 0 + ipDomainList: + type: array + items: + type: string + minItems: 0 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 0 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 0 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1668,6 +1709,8 @@ components: $ref: '#/components/schemas/ChfFunction-Multiple' MFAFFunction: $ref: '#/components/schemas/MfafFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' AmfFunction-Single: allOf: @@ -3446,6 +3489,29 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + BsfFunction-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 + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + nFProfileList: + $ref: '#/components/schemas/NFProfileList' + commModelList: + $ref: '#/components/schemas/CommModelList' + bsfInfo: + $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -3770,6 +3836,10 @@ components: type: array items: $ref: '#/components/schemas/MfafFunction-Single' + BsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/BsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3868,3 +3938,4 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/MfafFunction-Single' + - $ref: '#/components/schemas/BsfFunction-Single' -- GitLab From 29ac53b874b54d21f43030d908ab82e0d5673667 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 10 Aug 2023 02:48:30 +0000 Subject: [PATCH 2/2] TS28.541_Rel18_CR0962 --- OpenAPI/TS28541_5GcNrm.yaml | 73 ++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 053b53ba9..83e68cd27 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1622,6 +1622,46 @@ components: type: array items: $ref: '#/components/schemas/InternalGroupIdRange' + BsfInfo: + description: Information of a BSF NF Instance + type: object + properties: + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 0 + ipDomainList: + type: array + items: + type: string + minItems: 0 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 0 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 0 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 AanfInfo: description: Represents the information relative to an AAnF NF Instance. @@ -1748,6 +1788,8 @@ components: $ref: '#/components/schemas/TsctsfFunction-Multiple' AANFFunction: $ref: '#/components/schemas/AanfFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' AmfFunction-Single: allOf: @@ -3739,7 +3781,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - TsctsfInfo: + tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -3841,6 +3883,30 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + BsfFunction-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 + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + bsfInfo: + $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -4229,6 +4295,10 @@ components: type: array items: $ref: '#/components/schemas/AanfFunction-Single' + BsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/BsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -4344,3 +4414,4 @@ components: - $ref: '#/components/schemas/GmlcFunction-Single' - $ref: '#/components/schemas/TsctsfFunction-Single' - $ref: '#/components/schemas/AanfFunction-Single' + - $ref: '#/components/schemas/BsfFunction-Single' -- GitLab