From 622b402e586341be7ab9071dc5731865eb89eecf Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:50:54 +0000 Subject: [PATCH 1/6] TS28.541_Rel18_CR0895 CHFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 155 +++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f..8aeda3689 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1399,6 +1399,34 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + ChfInfo: + description: Information of a CHF NF Instance + type: object + not: + required: [ primaryChfInstance, secondaryChfInstance ] + properties: + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + plmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 0 + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + primaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + secondaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1578,6 +1606,10 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1688,6 +1720,8 @@ components: $ref: '#/components/schemas/EP_N16-Multiple' EP_S5C: $ref: '#/components/schemas/EP_S5C-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -1850,6 +1884,8 @@ components: $ref: '#/components/schemas/EP_N15-Multiple' EP_N16: $ref: '#/components/schemas/EP_N16-Multiple' + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' PredefinedPccRuleSet: @@ -3140,6 +3176,95 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + ChfFunction-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' + chfInfo: + $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' + + EP_N28-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_N40-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_N41-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_N42-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: @@ -3345,6 +3470,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N27-Single' + EP_N28-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N28-Single' EP_N31-Multiple: type: array @@ -3358,6 +3487,19 @@ components: type: array items: $ref: '#/components/schemas/EP_N33-Single' + EP_N40-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N40-Single' + EP_N41-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N41-Single' + EP_N42-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N42-Single' + EP_S5C-Multiple: type: array items: @@ -3434,6 +3576,10 @@ components: type: array items: $ref: '#/components/schemas/AfFunction-Single' + ChfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ChfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3496,10 +3642,15 @@ components: - $ref: '#/components/schemas/EP_N26-Single' - $ref: '#/components/schemas/EP_N27-Single' + - $ref: '#/components/schemas/EP_N28-Single' - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N40-Single' + - $ref: '#/components/schemas/EP_N41-Single' + - $ref: '#/components/schemas/EP_N42-Single' + - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' @@ -3524,4 +3675,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - + - $ref: '#/components/schemas/ChfFunction-Single' -- GitLab From 787107fafa7347ebfdedfaf0b09cacfe7c075264 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 02:33:23 +0000 Subject: [PATCH 2/6] EP_N58 correction 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 8aeda3689..bacf394e8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1605,7 +1605,7 @@ components: EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: - $ref: '#/components/schemas/EP_N13-Multiple' + $ref: '#/components/schemas/EP_N58-Multiple' EP_N41: $ref: '#/components/schemas/EP_N41-Multiple' EP_N42: -- GitLab From 5d6d506f987dcaa4b49250b60481cc00c58869ba Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 07:30:43 +0000 Subject: [PATCH 3/6] correction to name containment Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bacf394e8..adf1fed88 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1530,6 +1530,8 @@ components: $ref: '#/components/schemas/NssaafFunction-Multiple' AFFunction: $ref: '#/components/schemas/AfFunction-Multiple' + ChfFunction: + $ref: '#/components/schemas/ChfFunction-Multiple' AmfFunction-Single: allOf: -- GitLab From b800f3f1ce9a8e41963f6a7f916d1b704256699a Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:50:54 +0000 Subject: [PATCH 4/6] TS28.541_Rel18_CR0895 CHFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 154 +++++++++++++++++++++++++++++++++++- 1 file changed, 153 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0fd5c1cfe..6627a1c0b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1436,6 +1436,34 @@ components: $ref: '#/components/schemas/TaiRange' minItems: 1 + ChfInfo: + description: Information of a CHF NF Instance + type: object + not: + required: [ primaryChfInstance, secondaryChfInstance ] + properties: + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + plmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 0 + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + primaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + secondaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1617,6 +1645,10 @@ components: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1727,6 +1759,8 @@ components: $ref: '#/components/schemas/EP_N16-Multiple' EP_S5C: $ref: '#/components/schemas/EP_S5C-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -1889,6 +1923,8 @@ components: $ref: '#/components/schemas/EP_N15-Multiple' EP_N16: $ref: '#/components/schemas/EP_N16-Multiple' + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' PredefinedPccRuleSet: @@ -3201,6 +3237,95 @@ components: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + ChfFunction-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' + chfInfo: + $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' + + EP_N28-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_N40-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_N41-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_N42-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: @@ -3406,6 +3531,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N27-Single' + EP_N28-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N28-Single' EP_N31-Multiple: type: array @@ -3419,6 +3548,19 @@ components: type: array items: $ref: '#/components/schemas/EP_N33-Single' + EP_N40-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N40-Single' + EP_N41-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N41-Single' + EP_N42-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N42-Single' + EP_S5C-Multiple: type: array items: @@ -3499,6 +3641,10 @@ components: type: array items: $ref: '#/components/schemas/DccfFunction-Single' + ChfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ChfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3561,10 +3707,15 @@ components: - $ref: '#/components/schemas/EP_N26-Single' - $ref: '#/components/schemas/EP_N27-Single' + - $ref: '#/components/schemas/EP_N28-Single' - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N40-Single' + - $ref: '#/components/schemas/EP_N41-Single' + - $ref: '#/components/schemas/EP_N42-Single' + - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' @@ -3590,3 +3741,4 @@ components: - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - $ref: '#/components/schemas/DccfFunction-Single' + - $ref: '#/components/schemas/ChfFunction-Single' \ No newline at end of file -- GitLab From e7c97d38e8b6e9acc00fd4b00c33166bc72e8f87 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 02:33:23 +0000 Subject: [PATCH 5/6] EP_N58 correction 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 6627a1c0b..2fd355c2f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1644,7 +1644,7 @@ components: EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: - $ref: '#/components/schemas/EP_N13-Multiple' + $ref: '#/components/schemas/EP_N58-Multiple' EP_N41: $ref: '#/components/schemas/EP_N41-Multiple' EP_N42: -- GitLab From e0ee6bfad7256842e9aaa93de84f45ae83f11490 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 12 May 2023 07:30:43 +0000 Subject: [PATCH 6/6] correction to name containment Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2fd355c2f..f52edcde5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1569,6 +1569,8 @@ components: $ref: '#/components/schemas/AfFunction-Multiple' DCCFFunction: $ref: '#/components/schemas/DccfFunction-Multiple' + ChfFunction: + $ref: '#/components/schemas/ChfFunction-Multiple' AmfFunction-Single: allOf: -- GitLab