From a2e84b38070916730e67decc5a27ebfd10108804 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 06:49:00 +0000 Subject: [PATCH 1/2] TS28.541_Rel18_CR_1059_NRM_enhancements_for_MNPFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 110 +++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6b19f5d4f..69f891936 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2738,6 +2738,17 @@ components: minProperties: 1 not: required: [ networkInstance, dnaiNwInstanceList ] + MnpfInfo: + description: Information of an MNPF Instance + type: object + properties: + msisdnRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + required: + - msisdnRanges #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -2857,9 +2868,11 @@ components: BSFFunction: $ref: '#/components/schemas/BsfFunction-Multiple' MBSMFFunction: - $ref: '#/components/schemas/MbSmfFunction-Multiple' + $ref: '#/components/schemas/MbSmfFunction-Multiple' MBUPFFunction: - $ref: '#/components/schemas/MbUpfFunction-Multiple' + $ref: '#/components/schemas/MbUpfFunction-Multiple' + MNPFFunction: + $ref: '#/components/schemas/MnpfFunction-Multiple' AmfFunction-Single: allOf: @@ -4972,6 +4985,34 @@ components: $ref: '#/components/schemas/EP_N19mb-Multiple' EP_Nmb9: $ref: '#/components/schemas/EP_Nmb9-Multiple' + + MnpfFunction-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' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mnpfInfo: + $ref: '#/components/schemas/MnpfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_SM12: + $ref: '#/components/schemas/EP_SM12-Multiple' + EP_SM13: + $ref: '#/components/schemas/EP_SM13-Multiple' + EP_SM14: + $ref: '#/components/schemas/EP_SM14-Multiple' EP_N3mb-Single: allOf: @@ -5029,6 +5070,48 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM12-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM13-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM14-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -5396,7 +5479,19 @@ components: EP_Nmb9-Multiple: type: array items: - $ref: '#/components/schemas/EP_Nmb9-Single' + $ref: '#/components/schemas/EP_Nmb9-Single' + EP_SM12-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM12-Single' + EP_SM13-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM13-Single' + EP_SM14-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM14-Single' Configurable5QISet-Multiple: type: array items: @@ -5461,6 +5556,10 @@ components: type: array items: $ref: '#/components/schemas/MbUpfFunction-Single' + MnpfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MnpfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -5571,6 +5670,10 @@ components: - $ref: '#/components/schemas/EP_N16mb-Single' - $ref: '#/components/schemas/EP_Nmb1-Single' + - $ref: '#/components/schemas/EP_SM12-Single' + - $ref: '#/components/schemas/EP_SM13-Single' + - $ref: '#/components/schemas/EP_SM14-Single' + - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -5588,3 +5691,4 @@ components: - $ref: '#/components/schemas/BsfFunction-Single' - $ref: '#/components/schemas/MbSmfFunction-Single' - $ref: '#/components/schemas/MbUpfFunction-Single' + - $ref: '#/components/schemas/MnpfFunction-Single' -- GitLab From 995ed96bebb4566af8326490a90a3f9edef68227 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 07:02:58 +0000 Subject: [PATCH 2/2] Additional changes to MNPF interface NRM --- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 69f891936..602e8b476 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3276,6 +3276,8 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' EP_N96: $ref: '#/components/schemas/EP_N96-Multiple' + EP_SM14: + $ref: '#/components/schemas/EP_SM14-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3464,6 +3466,10 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_SM13: + $ref: '#/components/schemas/EP_SM13-Multiple' NefFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab