From 68c5d7670de3e7656ed0188e272e029115a77362 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 07:27:15 +0000 Subject: [PATCH 1/4] TS28.541_Rel18_CR1021 MBSMFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 299 +++++++++++++++++++++++++++++++++++- 1 file changed, 296 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0fcaad7c3..a299e9072 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2324,7 +2324,202 @@ components: items: $ref: '#/components/schemas/IdentityRange' minItems: 0 - + + MbSmfInfo: + description: Information of an MB-SMF NF Instance + type: object + properties: + sNssaiInfoList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/SnssaiMbSmfInfoItem' + minProperties: 1 + tmgiRangeList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/TmgiRange' + minProperties: 1 + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + mbsSessionList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/MbsSession' + minProperties: 1 + + TmgiRange: + description: Range of TMGIs + type: object + required: + - mbsServiceIdStart + - mbsServiceIdEnd + - plmnId + properties: + mbsServiceIdStart: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + mbsServiceIdEnd: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + nid: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' + + MbsSession: + description: MBS Session currently served by an MB-SMF + type: object + required: + - mbsSessionId + properties: + mbsSessionId: + $ref: '#/components/schemas/MbsSessionId' + mbsAreaSessions: + description: A map (list of key-value pairs) where the key identifies an areaSessionId + additionalProperties: + $ref: '#/components/schemas/MbsServiceAreaInfo' + minProperties: 1 + + MbsServiceAreaInfo: + description: MBS Service Area Information for location dependent MBS session + type: object + properties: + areaSessionId: + type: Integer + minimum: 0 + maximum: 65535 + mbsServiceArea: + $ref: '#/components/schemas/MbsServiceArea' + required: + - areaSessionId + - mbsServiceArea + + MbsSessionId: + description: MBS Session Identifier + type: object + properties: + tmgi: + $ref: '#/components/schemas/Tmgi' + ssm: + $ref: '#/components/schemas/Ssm' + nid: + $ref: '#/components/schemas/Nid' + anyOf: + - required: [ tmgi ] + - required: [ ssm ] + + Tmgi: + description: Temporary Mobile Group Identity + type: object + properties: + mbsServiceId: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + description: MBS Service ID + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + required: + - mbsServiceId + - plmnId + + Ssm: + description: Source specific IP multicast address + type: object + properties: + sourceIpAddr: + $ref: 'TS29571_CommonData.yaml#/components/schemas/IpAddr' + destIpAddr: + $ref: 'TS29571_CommonData.yaml#/components/schemas/IpAddr' + required: + - sourceIpAddr + - destIpAddr + + MbsServiceArea: + description: MBS Service Area + type: object + properties: + ncgiList: + type: array + items: + $ref: '#/components/schemas/NcgiTai' + minItems: 1 + description: List of NR cell Ids + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + description: List of tracking area Ids + anyOf: + - required: [ ncgiList ] + - required: [ taiList ] + + NcgiTai: + description: List of NR cell ids, with their pertaining TAIs + type: object + properties: + tai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + cellList: + type: array + items: + $ref: '#/components/schemas/Ncgi' + minItems: 1 + description: List of List of NR cell ids + required: + - tai + - cellList + + Ncgi: + description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 + type: object + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + nrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + # $ref: 'TS29571_CommonData.yaml#/components/schemas/NrCellId' + nid: + $ref: '#/components/schemas/Nid' + required: + - plmnId + - nrCellId + + SnssaiMbSmfInfoItem: + description: Parameters supported by an MB-SMF for a given S-NSSAI + type: object + required: + - sNssai + - dnnInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnInfoList: + type: array + items: + $ref: '#/components/schemas/DnnMbSmfInfoItem' + minItems: 1 + + DnnMbSmfInfoItem: + description: Parameters supported by an MB-SMF for a given DNN + type: object + required: + - dnn + properties: + dnn: + anyOf: + - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + AanfInfo: description: Represents the information relative to an AAnF NF Instance. type: object @@ -2335,6 +2530,7 @@ components: type: string pattern: '^[0-9]{1,4}$' + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -2451,7 +2647,9 @@ components: AANFFunction: $ref: '#/components/schemas/AanfFunction-Multiple' BSFFunction: - $ref: '#/components/schemas/BsfFunction-Multiple' + $ref: '#/components/schemas/BsfFunction-Multiple' + MBSMFFunction: + $ref: '#/components/schemas/MbSmfFunction-Multiple' AmfFunction-Single: allOf: @@ -2519,7 +2717,9 @@ components: EP_N42: $ref: '#/components/schemas/EP_N42-Multiple' EP_N89: - $ref: '#/components/schemas/EP_N89-Multiple' + $ref: '#/components/schemas/EP_N89-Multiple' + EP_N11mb: + $ref: '#/components/schemas/EP_N11mb-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2609,6 +2809,8 @@ components: $ref: '#/components/schemas/EP_N40-Multiple' EP_N88: $ref: '#/components/schemas/EP_N88-Multiple' + EP_N16mb: + $ref: '#/components/schemas/EP_N16mb-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -4438,6 +4640,77 @@ components: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + MbSmfFunction-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: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mbSmfInfo: + $ref: '#/components/schemas/MbSmfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N11mb: + $ref: '#/components/schemas/EP_N11mb-Multiple' + EP_N16mb: + $ref: '#/components/schemas/EP_N16mb-Multiple' + EP_Nmb1: + $ref: '#/components/schemas/EP_Nmb1-Multiple' + + EP_N11mb-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_N16mb-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_Nmb1-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 ---------------------- SubNetwork-Multiple: @@ -4773,6 +5046,18 @@ components: type: array items: $ref: '#/components/schemas/EP_N96-Single' + EP_N11mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N11mb-Single' + EP_N16mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N16mb-Single' + EP_Nmb1-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Nmb1-Single' Configurable5QISet-Multiple: type: array items: @@ -4829,6 +5114,10 @@ components: type: array items: $ref: '#/components/schemas/BsfFunction-Single' + MbSmfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MbSmfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -4929,6 +5218,9 @@ components: - $ref: '#/components/schemas/EP_NL5-Single' - $ref: '#/components/schemas/EP_NL6-Single' - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/EP_N11mb-Single' + - $ref: '#/components/schemas/EP_N16mb-Single' + - $ref: '#/components/schemas/EP_Nmb1-Single' - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' @@ -4945,3 +5237,4 @@ components: - $ref: '#/components/schemas/TsctsfFunction-Single' - $ref: '#/components/schemas/AanfFunction-Single' - $ref: '#/components/schemas/BsfFunction-Single' + - $ref: '#/components/schemas/MbSmfFunction-Single' -- GitLab From 4d3f6a221e552d62cab1a23dd362b659777afa70 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 07:36:15 +0000 Subject: [PATCH 2/4] Fix validation issue --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a299e9072..03f5dd4e3 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2435,9 +2435,9 @@ components: type: object properties: sourceIpAddr: - $ref: 'TS29571_CommonData.yaml#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' destIpAddr: - $ref: 'TS29571_CommonData.yaml#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' required: - sourceIpAddr - destIpAddr -- GitLab From 167bd60e50982190290d557a9286bf2300b1f1b6 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 27 Sep 2023 07:51:11 +0000 Subject: [PATCH 3/4] fix validation issue --- 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 03f5dd4e3..951d8564f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2393,7 +2393,7 @@ components: type: object properties: areaSessionId: - type: Integer + type: integer minimum: 0 maximum: 65535 mbsServiceArea: -- GitLab From 2cc78b5b9a42944e6f47f15cea3a40986c374229 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 29 Sep 2023 00:27:35 +0000 Subject: [PATCH 4/4] adding EP_N4mp containment, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 951d8564f..5c0a3e2d7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4667,6 +4667,10 @@ components: $ref: '#/components/schemas/EP_N16mb-Multiple' EP_Nmb1: $ref: '#/components/schemas/EP_Nmb1-Multiple' + # EP_N4mb introduced in S5-236244 CR1020, to uncomment the following two lines + # by code moderator when merging CR in integration branch + # EP_N4mb: + # $ref: '#/components/schemas/EP_N4mb-Multiple' EP_N11mb-Single: allOf: -- GitLab