From 94c3b2fd18307a5a8e79ddee1e16fc028988beea Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 9 Apr 2024 12:59:32 +0000 Subject: [PATCH 01/82] adding File Management NRM. Update README.md --- OpenAPI/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 76505cbef..dd808586c 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -31,10 +31,14 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml)) -* Subscription Control NRM NRM (TS 28.623) +* Subscription Control NRM (TS 28.623) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_SubscriptionControlNrm.yaml)) +* File Management NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_FileManagementNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_FileManagementNrm.yaml)) + * Threshold Monitor NRM(TS 28.623) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ThresholdMonitorNrm.yaml)) -- GitLab From b5437461bf277e46dafc0ba4fc1673ddf735a6fc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 06:52:57 +0000 Subject: [PATCH 02/82] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 130494e02..20e6b35b2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -150,13 +150,12 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# - - Edge_Service_Support #value for Edge Service Support Expectation--# - - 5GC_SubNetwork #value for 5GC Network Expectation--# + - RAN_SUBNETWORK #value for Radio Network Expectation--# + - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# + - 5GC_SUBNETWORK #value for 5GC Network Expectation--# + - RadioService #value for Radio Service Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - contextSelectivity: - $ref: "#/components/schemas/Selectivity" objectContexts: type: array items: @@ -227,7 +226,7 @@ components: enum: - DELIVER - ENSURE - description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. + description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed Frequency: description: >- It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) @@ -360,6 +359,9 @@ components: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: type: number + description: >- + It describes the value that has been achieved for the expectation target at the time at which + the report is generated. #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -429,6 +431,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK + - RadioService description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array -- GitLab From fcf45a515007933a948d128ba8082c28af3e80c8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:36:52 +0000 Subject: [PATCH 03/82] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 140 ++++++++++++++++-------- OpenAPI/TS28312_IntentNrm.yaml | 4 +- 2 files changed, 99 insertions(+), 45 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b48f7afaf..e9185eacd 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -243,7 +243,10 @@ components: #-------Definition of the Scenario specific ExpectationTarget dataType----------# WeakRSRPRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget. It describes + the downlink weak coverage ratio target for the RAN SubNetwork that the intent expectation is applied. + The numerator is the number of the cells with downlink weak RSRP, and the denominator is the total number + of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -262,7 +265,9 @@ components: $ref: '#/components/schemas/WeakRSRPContext' WeakRSRPContext: description: >- - This data type is the "TargetContext" data type with specialisations for WeakRSRPContext + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext. It describes the threshold + for downlink weak RSRP of the cells (see RSRP measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent + expectation is applied. type: object properties: contextAttribute: @@ -277,7 +282,9 @@ components: type: number LowSINRRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget.It describes the low SINR + ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the cells with + low SINR, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -296,7 +303,8 @@ components: $ref: '#/components/schemas/LowSINRContext' LowSINRContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowSINRContext + This data type is the "TargetContext" data type with specialisations for LowSINRContext.It describes the threshold for + low SINR of the cells (see SINR measurements in TS 28.552 [6]) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -311,7 +319,9 @@ components: type: integer AveULRANUEThptTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget.It describes the average + UL RAN UE throughput target for RAN SubNetwork (see UL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent + expectation is applied. type: object properties: targetName: @@ -326,7 +336,9 @@ components: type: integer AveDLRANUEThptTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average + DL RAN UE throughput target for RAN SubNetwork (see DL RAN UE throughput for a sub-network in TS 28.554[11]) that the intent + expectation is applied. type: object properties: targetName: @@ -341,7 +353,10 @@ components: type: integer LowULRANUEThptRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low + UL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied. The numerator is the number + of the cells with low UL RAN UE throughput, and the denominator is the total number of cells of the RAN Subnetwork in the + specified area. type: object properties: targetName: @@ -360,7 +375,9 @@ components: $ref: '#/components/schemas/LowULRANUEThptContext' LowULRANUEThptContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext.It describes the threshold + for the low UL RAN UE throughput cells (see average UL RAN UE throughput in gNB and distribution of UL UE throughput in gNB + in TS 28.552[6]) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -375,7 +392,10 @@ components: type: number LowDLRANUEThptRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget. It describes + the low DL RAN UE throughput ratio target for the RAN SubNetwork that the intent expectation is applied.The numerator + is the number of the cells with low DL RAN UE throughput, and the denominator is the total number of cells of the + RAN Subnetwork in the specified area. type: object properties: targetName: @@ -394,7 +414,9 @@ components: $ref: '#/components/schemas/LowDLRANUEThptContext' LowDLRANUEThptContext: description: >- - This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext.It describes the threshold + for the low DL RAN UE throughput cells ((see average DL RAN UE throughput in gNB and distribution of DL UE throughput in gNB + in TS 28.552[6]) ) of the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -409,7 +431,9 @@ components: type: number HighULPrbLoadRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget. It describes the high UL + PRB load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number + of the cells with high UL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -428,7 +452,9 @@ components: $ref: '#/components/schemas/HighULPrbLoadContext' HighULPrbLoadContext: description: >- - This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext + This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext.It describes the threshold for high + uplink PRB load (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN + SubNetwork in the specified area that the intent expectation is applied. type: object properties: contextAttribute: @@ -445,7 +471,9 @@ components: maximum: 100 HighDLPrbLoadRatioTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget.It describes the high DL PRB + load ratio target (as percentage) for the RAN SubNetwork that the intent expectation is applied. The numerator is the number of the + cells with high DL PRB load, and the denominator is the total number of cells of the RAN Subnetwork in the specified area. type: object properties: targetName: @@ -464,7 +492,9 @@ components: $ref: '#/components/schemas/HighDLPrbLoadContext' HighDLPrbLoadContext: description: >- - This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext + This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext.It describes the threshold for high downlink + PRB load (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) of the cells of the RAN SubNetwork in the + specified area that the intent expectation is applied. type: object properties: contextAttribute: @@ -481,7 +511,9 @@ components: maximum: 100 AveULPrbLoadTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget + This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget.It describes the average uplink PRB load target + (i.e. UL Total PRB Usage in TS 28.552 [12] to represent the percentage of UL PRBs used) of the cells of the RAN SubNetwork that the intent + expectation is applied. type: object properties: targetName: @@ -498,7 +530,9 @@ components: maximum: 100 AveDLPrbLoadTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget + This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget.It describes the average dowlink PRB load + (i.e. DL Total PRB Usage in TS 28.552 [12] to represent the percentage of DL PRBs used) target for RAN SubNetwork that the intent expectation + is applied. type: object properties: targetName: @@ -515,7 +549,9 @@ components: maximum: 100 RANEnergyConsumptionTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget.It describes the RAN energy consumption + target for RAN SubNetwork that the intent expectation is applied. The definition for RAN energy consumption see ECNG-RAN in clause 6.7.3.4.1 in + TS 28.554 [11]. type: object properties: targetName: @@ -530,7 +566,9 @@ components: type: integer RANEnergyEfficiencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget.It describes the RAN energy efficiency target + for RAN SubNetwork that the intent expectation is applied. The unit of this target is bit/J. The definition for RAN energy efficiency target for RAN + SubNetwork see EEMN,DV in clause 6.7.1.1 in TS 28.554 [11]. type: object properties: targetName: @@ -545,7 +583,8 @@ components: type: integer DLThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the + Edge service supporting or Radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -557,10 +596,11 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + type: integer ULThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the Edge + service supporting or Radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -572,10 +612,11 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + type: integer DLLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the Edge service supporting or Radio service + that the intent expectation is applied type: object properties: targetName: @@ -590,7 +631,8 @@ components: type: integer ULLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the Edge service supporting or RadioService + that the intent expectation is applied. For details see attribute ulLatency defined in clause 6.3.1 of TS 28.541 [5] type: object properties: targetName: @@ -605,7 +647,8 @@ components: type: integer MaxNumberofUEsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for Edge service supporting + that the intent expectation is applied. For details see attribute maxNumberofUE defined in clause 6.3.1 of of TS 28.541 [5] type: object properties: targetName: @@ -620,7 +663,9 @@ components: type: integer ActivityFactorTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget.It describes the percentage value of the amount of simultaneous + active UEs to the total number of UEs where active means the UEs are exchanging data with the Edge service supporting that the intent expectation is applied. + For details see activityFactor in clause 6.3.1 in TS 28.541 [5]. type: object properties: targetName: @@ -635,7 +680,8 @@ components: type: integer UESpeedTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for Edge service supporting + that the intent expectation is applied. For details see uESpeed in clause 6.3.1 in TS 28.541[5]. type: object properties: targetName: @@ -650,7 +696,8 @@ components: type: integer MaxNumberofPDUsessionsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget.It describes the maximum number of PDU sessions for 5GC + SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofPDUsessions in clause 5.3.1.2 in TS 28.552 [12]. type: object properties: targetName: @@ -667,7 +714,8 @@ components: $ref: '#/components/schemas/5GSessionContext' 5GSessionContext: description: >- - This data type is the "TargetContext" data type with specialisations for 5GSessionContext + This data type is the "TargetContext" data type with specialisations for 5GSessionContext.It describes the maximum supported 5G PDU session of the 5GC SubNetwork + related to the intent expectation. type: object properties: contextAttribute: @@ -682,7 +730,8 @@ components: type: integer MaxNumberofRegisteredsubscribersTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget.It describes the maximum number of Registered + subscribers for 5GC SubNetwork supporting that the intent expectation is applied. For details, see maxNumberofRegisteredsubscribers in clause 5.6.2 in TS 28.552 [12]. type: object properties: targetName: @@ -697,7 +746,8 @@ components: type: integer IncomingDataTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget + This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget.It describes the maximum incoming data packets for 5GC SubNetwork + related to the intent expectation. For details, see N6 incoming link usage measurement in clause 5.4.2.1 in TS 28.552 [12]. type: object properties: targetName: @@ -712,7 +762,8 @@ components: type: integer OutgoingDataTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget + This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget.It describes the maximum outgoing data packets for 5GC SubNetwork + related to the intent expectation. For details, see N6 outgoing link usage measurement in clause 5.4.2.2 in TS 28.552 [12]. type: object properties: targetName: @@ -731,7 +782,8 @@ components: #-------Definition of the concrete ObjectTarget dataType----------------# CoverageAreaPolygonContext: description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext.It describes the coverage areas for the RAN SubNetwork that the + intent expectation is applied in the form of polygon. type: object properties: contextAttribute: @@ -746,7 +798,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' CoverageTACContext: description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageTACContext + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext.It describes the coverage areas for the RAN SubNetwork that the intent + expectation is applied in the form of TAC. type: object properties: contextAttribute: @@ -780,9 +833,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: description: >- - This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". - It describes the downlink frequency information (RF reference frequencies and/ or the - frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -799,9 +851,8 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: description: >- - This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext". - It describes the uplink frequency information (RF reference frequencies and/ or the frequency - operating band) supported by the RAN SubNetwork that the intent expectation is applied. + This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: @@ -818,7 +869,8 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: description: >- - This data type is the "ObjectContext" data type with specialisations for RATContext + This data type is the "ObjectContext" data type with specialisations for RATContext.It describes the RAT supported by the RAN SubNetwork that the intent expectation + is applied. type: object properties: contextAttribute: @@ -992,7 +1044,8 @@ components: TargetAssuranceTimeContext: description: >- - This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext + This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext.It describes the timeWindows + (including startTime, endTime) when the targets in the Intent Expectation need to be assured. type: object properties: contextAttribute: @@ -1068,7 +1121,8 @@ components: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" ServiceTypeContext: description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext + This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext.It describes + the service type for the Radio Service that the intent expectation is applied. For details see sST in clause 6.4.1 in TS 28.541 [5] type: object properties: contextAttribute: diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 20e6b35b2..5c5e2a302 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -153,7 +153,7 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - RadioService #value for Radio Service Expectation--# + - Radio_Service #value for Radio Service Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -431,7 +431,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - - RadioService + - Radio_Service description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array -- GitLab From 4a4d851da0dcf4115317e59079c803bd6c8de6b1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 07:54:40 +0000 Subject: [PATCH 04/82] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index e9185eacd..a7f4755fe 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -584,7 +584,7 @@ components: DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the - Edge service supporting or Radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. + edge service supporting or radio servicde that the intent expectation is applied. For details see dlThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -599,8 +599,8 @@ components: type: integer ULThptPerUETarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the Edge - service supporting or Radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge + service supporting or radio service that the intent expectation is applied. For details see ulThptPerUE defined in clause 6.3.1 of TS 28.541 [5]. type: object properties: targetName: @@ -615,7 +615,7 @@ components: type: integer DLLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the Edge service supporting or Radio service + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service that the intent expectation is applied type: object properties: @@ -631,7 +631,7 @@ components: type: integer ULLatencyTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the Edge service supporting or RadioService + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget. It describes the UL latency target for the edge service supporting or radioService that the intent expectation is applied. For details see attribute ulLatency defined in clause 6.3.1 of TS 28.541 [5] type: object properties: @@ -647,7 +647,7 @@ components: type: integer MaxNumberofUEsTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for Edge service supporting + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget.It describes the the number of UEs for edge service supporting that the intent expectation is applied. For details see attribute maxNumberofUE defined in clause 6.3.1 of of TS 28.541 [5] type: object properties: @@ -664,7 +664,7 @@ components: ActivityFactorTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget.It describes the percentage value of the amount of simultaneous - active UEs to the total number of UEs where active means the UEs are exchanging data with the Edge service supporting that the intent expectation is applied. + active UEs to the total number of UEs where active means the UEs are exchanging data with the edge service supporting that the intent expectation is applied. For details see activityFactor in clause 6.3.1 in TS 28.541 [5]. type: object properties: @@ -680,7 +680,7 @@ components: type: integer UESpeedTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for Edge service supporting + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget.It describes the speed (in km/hour) supported for edge service supporting that the intent expectation is applied. For details see uESpeed in clause 6.3.1 in TS 28.541[5]. type: object properties: -- GitLab From 7ccada6239b65aac3cbe2fe9ac9433a1c0a297f5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Apr 2024 01:02:42 +0000 Subject: [PATCH 05/82] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index a7f4755fe..b8c44996d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -596,7 +596,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - type: integer + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge @@ -612,7 +612,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - type: integer + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service -- GitLab From f71832542a49ff3ac4cd21dc7fec0a461a99854b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:39:00 +0000 Subject: [PATCH 06/82] Update 2 files - /OpenAPI/TS28111_FaultNrm.yaml - /OpenAPI/TS28532_ProvMnS.yaml --- OpenAPI/TS28111_FaultNrm.yaml | 7 +++++++ OpenAPI/TS28532_ProvMnS.yaml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index f4ed7ce77..273225981 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -549,3 +549,10 @@ components: type: object additionalProperties: $ref: '#/components/schemas/Comment' + + #----- Definitions in TS 28.111for TS 28.532 --------------------------# + resources-faultNrm: + oneOf: + - $ref: '#/components/schemas/AlarmList-Single' + + #----- Definitions in TS 28.111 for TS 28.532 --------------------------# \ No newline at end of file diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 27e027547..47d91a826 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -432,7 +432,8 @@ components: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/resources-fileMgmtNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-faultNrm' - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' -- GitLab From 5286f676ac57d5c416f161d6cd084e28c61c2881 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:42:11 +0000 Subject: [PATCH 07/82] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 47d91a826..766475b39 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -433,7 +433,7 @@ components: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/resources-mgmtDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/resources-mnSRegistryNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-pmControlNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/resources-faultNrm' + - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/resources-faultNrm' - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/resources-qoEMeasuremetCollectionNrm' - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' -- GitLab From b34e701c1b57acfe8d8e84ed93b6fbaf4bed4459 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 30 Mar 2024 08:49:51 +0000 Subject: [PATCH 08/82] Update file TS28111_FaultNrm.yaml --- OpenAPI/TS28111_FaultNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 273225981..c82b1b97a 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -550,7 +550,7 @@ components: additionalProperties: $ref: '#/components/schemas/Comment' - #----- Definitions in TS 28.111for TS 28.532 --------------------------# + #----- Definitions in TS 28.111 for TS 28.532 --------------------------# resources-faultNrm: oneOf: - $ref: '#/components/schemas/AlarmList-Single' -- GitLab From f6582098c2b08589e770a992f9580c21c2c8eb05 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 1 Apr 2024 01:04:39 +0000 Subject: [PATCH 09/82] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 766475b39..fcf3ef389 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -439,6 +439,7 @@ components: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' - $ref: 'TS28319_MsacNrm.yaml#/components/schemas/resources-msacNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/resources-DSORecovery' Scope: type: object properties: -- GitLab From dd84079556c7f76c291c328c7a5e5b12ad376459 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 05:15:18 +0000 Subject: [PATCH 10/82] add TRP info for LMF --- OpenAPI/TS28541_5GcNrm.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9379ea467..bfded1ea9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1352,6 +1352,38 @@ components: - NG_ENB - type: string + TrpMappingInfo: + type: object + properties: + satelliteId: + type: string + pattern: '^[0-9]{5}$' + trpIds: + type: array + items: + type: integer + minimum: 1 + maximum: 65535 + + TrpInfo: + description: The mapping relationship between TRP IDs, gNB ID and Satellite ID. + type: object + properties: + gNBId: + type: integer + minimum: 0 + maximum: 4294967295 + trpMappingInfoList: + type: array + items: + $ref: '#/components/schemas/TrpMappingInfo' + minItems: 1 + + TrpInfoList: + type: array + items: + $ref: '#/components/schemas/TrpInfo' + LmfInfo: description: Information of an LMF NF Instance type: object @@ -3494,6 +3526,10 @@ components: $ref: '#/components/schemas/CommModelList' lmfInfo: $ref: '#/components/schemas/LmfInfo' + ephemerisInfos: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos' + trpInfoList: + $ref: '#/components/schemas/TrpInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 4a6fbbbd6f4cf429431707376a699e0d308857e5 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 25 Apr 2024 06:37:58 +0000 Subject: [PATCH 11/82] TS28.541_Rel18_CR1175_add_missing_attributes_of_ManagedNFProfile --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bfded1ea9..2053089df 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -229,6 +229,10 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sNPNList: + type: array + items: + $ref: '#/components/schemas/SnpnId' allowedSNPNs: type: array items: -- GitLab From db7aa96735bcf89c51017738538c6aaf3a8788a6 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 1 Apr 2024 14:24:03 +0000 Subject: [PATCH 12/82] Schema_definition_Issues_for_SubNetwork_of_OpenAPI_SS_TS28318_Rel18 --- OpenAPI/TS28318_DsoNrm.yaml | 33 ++++++++++----------------------- OpenAPI/TS28623_GenericNrm.yaml | 1 + 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 25c311611..5fab07886 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -30,25 +30,17 @@ components: - type: object properties: SubNetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' + type: array + items: + $ref: '#/components/schemas/SubNetwork-ncO-DsoNrm' - SubNetwork-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' - - type: object - properties: - Subnetwork: - $ref: '#/components/schemas/SubNetwork-Multiple' - OutageAndRecoveryInfo: - $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' - DsoThresholdMonitor: - $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + SubNetwork-ncO-DsoNrm: + type: object + properties: + OutageAndRecoveryInfo: + $ref: '#/components/schemas/OutageAndRecoveryInfo-Multiple' + DsoThresholdMonitor: + $ref: '#/components/schemas/DsoThresholdMonitor-Multiple' OutageAndRecoveryInfo-Single: allOf: @@ -87,10 +79,6 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - SubNetwork-Multiple: - type: array - items: - $ref: '#/components/schemas/SubNetwork-Single' OutageAndRecoveryInfo-Multiple: type: array items: @@ -105,6 +93,5 @@ components: resources-DSORecovery: oneOf: - $ref: '#/components/schemas/MnS' - - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/OutageAndRecoveryInfo-Single' - $ref: '#/components/schemas/DsoThresholdMonitor-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d72b9232..843a9cbcf 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -699,6 +699,7 @@ components: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SubNetwork-ncO-SliceNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' + - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' ManagedElement-Single: allOf: -- GitLab From 2b2c31f561740cbc97290dafa0b5ed8ea87d91e9 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:04:27 +0000 Subject: [PATCH 13/82] 28.532_Rel18_CR0328_corrections_to_remove reference to TS28532_FaultMnS.yaml --- OpenAPI/TS28532_FaultMnS.yaml | 1058 --------------------------------- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 2 files changed, 1 insertion(+), 1059 deletions(-) delete mode 100755 OpenAPI/TS28532_FaultMnS.yaml diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml deleted file mode 100755 index 3c5631aae..000000000 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ /dev/null @@ -1,1058 +0,0 @@ -openapi: 3.0.1 -info: - title: Fault Supervision MnS - version: 18.1.0 - description: >- - OAS 3.0.1 definition of the Fault Supervision MnS - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.532; Generic management services - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ -servers: - - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' - variables: - MnSRoot: - description: See subclause 4.4.3 of TS 32.158 - default: http://example.com/3GPPManagement - MnSversion: - description: Version number of the OpenAPI definition - default: XXX -paths: - /alarms: - get: - summary: Retrieve multiple alarms - description: >- - Retrieves the alarms identified by alarmAckState, baseObjectInstance - and filter. - parameters: - - name: alarmAckState - in: query - required: false - schema: - $ref: '#/components/schemas/AlarmAckState' - - name: baseObjectInstance - in: query - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - - name: filter - in: query - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' - responses: - '200': - description: >- - Success case ("200 OK"). - Returns the alarms identified in the request. The alarmId is the key - of the map. - content: - application/json: - schema: - type: object - additionalProperties: - type: object - allOf: - - type: object - properties: - lastNotificationHeader: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - $ref: '#/components/schemas/AlarmRecord' - - type: object - properties: - comments: - $ref: '#/components/schemas/Comments' - default: - description: Response in case of error. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - patch: - summary: 'Clear, acknowledge or unacknowledge multiple alarms' - description: >- - Clears, acknowledges or unacknowledges multiple alarms using patch. Depending - on which action is to be performed, different merge patch documents need - to be used. - requestBody: - description: >- - Patch documents for acknowledging and unacknowledging, or clearing multiple - alarms. The keys in the map are the alarmIds to be patched. - content: - application/merge-patch+json: - schema: - oneOf: - - type: object - additionalProperties: - $ref: '#/components/schemas/MergePatchAcknowledgeAlarm' - - type: object - additionalProperties: - $ref: '#/components/schemas/MergePatchClearAlarm' - responses: - '204': - description: >- - Success case ("204 No content"). - The response message body is empty. - default: - description: Response in case of error. - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/FailedAlarm' - /alarms/alarmCount: - get: - summary: Get the alarm count per perceived severity - parameters: - - name: alarmAckState - in: query - required: false - schema: - $ref: '#/components/schemas/AlarmAckState' - - name: filter - in: query - required: false - schema: - type: string - responses: - '200': - description: >- - Success case ("200 OK"). - The alarm count per perceived severity is returned. - content: - application/json: - schema: - $ref: '#/components/schemas/AlarmCount' - default: - description: Response in case of error. The error case needs rework. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /alarms/{alarmId}: - patch: - summary: 'Clear, acknowledge or unacknowledge a single alarm' - description: >- - Clears, acknowledges or unacknowldeges a single alarm by patching the alarm - information. A conditional acknowledge request based on the perceived - severity is not supported. - parameters: - - name: alarmId - in: path - description: Identifies the alarm to be patched. - required: true - schema: - type: string - requestBody: - required: true - content: - application/merge-patch+json: - schema: - oneOf: - - $ref: '#/components/schemas/MergePatchAcknowledgeAlarm' - - $ref: '#/components/schemas/MergePatchClearAlarm' - responses: - '204': - description: >- - Success case (204 No content). - The response message body is absent. - default: - description: Response in case of error. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /alarms/{alarmId}/comments: - post: - summary: Add a comment to a single alarm - description: >- - Adds a comment to an alarm identified by alarmId. The id of the new comment - is allocated by the producer. - parameters: - - name: alarmId - in: path - description: Identifies the alarm to which the comment shall be added. - required: true - schema: - type: string - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Comment' - responses: - '201': - description: >- - Success case (201 Created). - The representation of the newly created comment resource shall be returned. - content: - application/json: - schema: - $ref: '#/components/schemas/Comment' - headers: - Location: - description: URI of the newly created comment resource. - required: true - schema: - type: string - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - - /subscriptions: - post: - summary: Create a subscription - description: >- - To create a subscription the representation of the subscription is - POSTed on the /subscriptions collection resource. - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/Subscription' - responses: - '201': - description: >- - Success case ("201 Created"). - The representation of the newly created subscription resource shall - be returned. - content: - application/json: - schema: - $ref: '#/components/schemas/Subscription' - headers: - Location: - description: URI of the newly created subscription resource - required: true - schema: - type: string - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - callbacks: - notifyNewAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - oneOf: - - $ref: '#/components/schemas/NotifyNewAlarm' - - $ref: '#/components/schemas/NotifyNewSecAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyClearedAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyClearedAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyChangedAlarm: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyChangedAlarm' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyChangedAlarmGeneral: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - oneOf: - - $ref: '#/components/schemas/NotifyChangedAlarmGeneral' - - $ref: '#/components/schemas/NotifyChangedSecAlarmGeneral' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyCorrelatedNotificationChanged: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyCorrelatedNotificationChanged' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyAckStateChanged: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyAckStateChanged' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyComments: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyComments' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyPotentialFaultyAlarmList: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyPotentialFaultyAlarmList' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - notifyAlarmListRebuilt: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyAlarmListRebuilt' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - /subscriptions/{subscriptionId}: - delete: - summary: Delete a subscription - description: >- - The subscription is deleted by deleting the corresponding subscription - resource. The resource to be deleted is identified with the path - component of the URI. - parameters: - - name: subscriptionId - in: path - description: Identifies the subscription to be deleted. - required: true - schema: - type: string - responses: - '204': - description: >- - Success case ("204 No Content"). - The subscription resource has been deleted. The response message body - is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' - -components: - schemas: - - #---- Definition of AlarmRecord ----------------------------------------------------# - - AlarmId: - type: string - AlarmType: - type: string - enum: - - COMMUNICATIONS_ALARM - - QUALITY_OF_SERVICE_ALARM - - PROCESSING_ERROR_ALARM - - EQUIPMENT_ALARM - - ENVIRONMENTAL_ALARM - - INTEGRITY_VIOLATION - - OPERATIONAL_VIOLATION - - PHYSICAL_VIOLATION - - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - - TIME_DOMAIN_VIOLATION - ProbableCause: - description: >- - The value of the probable cause may be a specific standardized string, or any - vendor provided string. Probable cause strings are not standardized in the - present document. They may be added in a future version. Up to then the - mapping of the generic probable cause strings "PROBABLE_CAUSE_001" to - "PROBABLE_CAUSE_005" is vendor specific. - The value of the probable cause may also be an integer. The mapping of integer - values to probable causes is vendor specific. - oneOf: - - anyOf: - - type: string - enum: - - PROBABLE_CAUSE_001 - - PROBABLE_CAUSE_002 - - PROBABLE_CAUSE_003 - - PROBABLE_CAUSE_004 - - PROBABLE_CAUSE_005 - - type: string - - type: integer - SpecificProblem: - oneOf: - - type: string - - type: integer - PerceivedSeverity: - type: string - enum: - - INDETERMINATE - - CRITICAL - - MAJOR - - MINOR - - WARNING - - CLEARED - TrendIndication: - type: string - enum: - - MORE_SEVERE - - NO_CHANGE - - LESS_SEVERE - ThresholdHysteresis: - type: object - required: - - high - properties: - high: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - low: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' - ThresholdLevelInd: - oneOf: - - type: object - properties: - up: - $ref: '#/components/schemas/ThresholdHysteresis' - - type: object - properties: - down: - $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: - type: object - properties: - observedMeasurement: - type: string - observedValue: - type: number - thresholdLevel: - $ref: '#/components/schemas/ThresholdLevelInd' - armTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - required: - - observedMeasurement - - observedValue - CorrelatedNotification: - type: object - properties: - sourceObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationIds: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - required: - - sourceObjectInstance - - notificationIds - CorrelatedNotifications: - type: array - items: - $ref: '#/components/schemas/CorrelatedNotification' - AckState: - type: string - enum: - - ACKNOWLEDGED - - UNACKNOWLEDGED - - AlarmRecord: - description: >- - The alarmId is not a property of an alarm record. It is used as key - in the map of alarm records instead. - type: object - properties: - # alarmId: - # $ref: '#/components/schemas/AlarmId' - objectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - alarmRaisedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmChangedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmClearedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - - rootCauseIndicator: - type: boolean - - ackTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - ackUserId: - type: string - ackSystemId: - type: string - ackState: - $ref: '#/components/schemas/AckState' - - clearUserId: - type: string - clearSystemId: - type: string - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - - #---- Definition of alarm notifications --------------------------------------------# - - AlarmNotificationTypes: - type: string - enum: - - notifyNewAlarm - - notifyChangedAlarm - - notifyChangedAlarmGeneral - - notifyAckStateChanged - - notifyCorrelatedNotificationChanged - - notifyComments - - notifyClearedAlarm - - notifyAlarmListRebuilt - - notifyPotentialFaultyAlarmList - AlarmListAlignmentRequirement: - type: string - enum: - - ALIGNMENT_REQUIRED - - ALIGNMENT_NOT_REQUIRED - - NotifyNewAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - NotifyNewSecAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - serviceUser - - serviceProvider - - securityAlarmDetector - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - NotifyClearedAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - clearUserId: - type: string - clearSystemId: - type: string - NotifyChangedAlarm: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - NotifyChangedAlarmGeneral: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - specificProblem: - $ref: '#/components/schemas/SpecificProblem' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - backedUpStatus: - type: boolean - backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - trendIndication: - $ref: '#/components/schemas/TrendIndication' - thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' - stateChangeDefinition: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' - monitoredAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - proposedRepairActions: - type: string - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - changedAlarmAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - NotifyChangedSecAlarmGeneral: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - serviceUser - - serviceProvider - - securityAlarmDetector - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - additionalText: - type: string - additionalInformation: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: - type: boolean - serviceUser: - type: string - serviceProvider: - type: string - securityAlarmDetector: - type: string - changedAlarmAttributes: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - NotifyCorrelatedNotificationChanged: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - correlatedNotifications - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - correlatedNotifications: - $ref: '#/components/schemas/CorrelatedNotifications' - rootCauseIndicator: - type: boolean - NotifyAckStateChanged: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - ackState - - ackUserId - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - ackState: - $ref: '#/components/schemas/AckState' - ackUserId: - type: string - ackSystemId: - type: string - NotifyComments: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - alarmId - - alarmType - - probableCause - - perceivedSeverity - - comments - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - alarmType: - $ref: '#/components/schemas/AlarmType' - probableCause: - $ref: '#/components/schemas/ProbableCause' - perceivedSeverity: - $ref: '#/components/schemas/PerceivedSeverity' - comments: - $ref: '#/components/schemas/Comments' - NotifyPotentialFaultyAlarmList: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - reason - properties: - reason: - type: string - NotifyAlarmListRebuilt: - allOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' - - type: object - required: - - reason - properties: - reason: - type: string - alarmListAlignmentRequirement: - $ref: '#/components/schemas/AlarmListAlignmentRequirement' - - #---- Definition of query parameters -----------------------------------------------# - - AlarmAckState: - type: string - enum: - - ALL_ALARMS - - ALL_ACTIVE_ALARMS - - ALL_ACTIVE_AND_ACKNOWLEDGED_ALARMS - - ALL_ACTIVE_AND_UNACKNOWLEDGED_ALARMS - - ALL_CLEARED_AND_UNACKNOWLEDGED_ALARMS - - ALL_UNACKNOWLEDGED_ALARMS - - #---- Definition of patch documents ------------------------------------------------# - - MergePatchAcknowledgeAlarm: - description: >- - Patch document acknowledging or unacknowledging a single alarm. For - acknowledging an alarm the value of ackState is ACKNOWLEDGED, for unacknowledging - an alarm the value of ackState is UNACKNOWLEDGED. - type: object - required: - - ackUserId - - ackState - properties: - ackUserId: - type: string - ackSystemId: - type: string - ackState: - $ref: '#/components/schemas/AckState' - MergePatchClearAlarm: - description: Patch document for clearing a single alarm - type: object - required: - - clearUserId - - perceivedSeverity - properties: - clearUserId: - type: string - clearSystemId: - type: string - perceivedSeverity: - type: string - enum: - - CLEARED - - #---- Definition of method responses -----------------------------------------------# - - FailedAlarm: - type: object - required: - - alarmId - - failureReason - properties: - alarmId: - $ref: '#/components/schemas/AlarmId' - failureReason: - type: string - - #---- Definition of resources ------------------------------------------------------# - - AlarmCount: - type: object - required: - - criticalCount - - majorCount - - minorCount - - warningCount - - indeterminateCount - - clearedCount - properties: - criticalCount: - type: integer - majorCount: - type: integer - minorCount: - type: integer - warningCount: - type: integer - indeterminateCount: - type: integer - clearedCount: - type: integer - Comment: - type: object - properties: - commentTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - commentUserId: - type: string - commentSystemId: - type: string - commentText: - type: string - Comments: - description: >- - Collection of comments. The comment identifiers are allocated by the - MnS producer and used as key in the map. - type: object - additionalProperties: - $ref: '#/components/schemas/Comment' - Subscription: - type: object - properties: - consumerReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - timeTick: - type: integer - filter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index fcf3ef389..cf4315a1e 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -539,7 +539,7 @@ components: - specificProblem properties: specificProblem: - $ref: 'TS28532_FaultMnS.yaml#/components/schemas/SpecificProblem' + $ref: 'TS28111_FaultNrm.yaml#/components/schemas/SpecificProblem' additionalText: type: string additionalInformation: -- GitLab From aee84247e2cc23dcc2cadbe268c32c5897a8c1f0 Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 09:01:01 +0000 Subject: [PATCH 14/82] 28105 Rel18 CR0126 AIMLInferenceEmulationFunction missing in SubNetwork/ManagedElement nCo, Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index b96ae1f9c..0076200e3 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -161,7 +161,9 @@ components: MLUpdateFunction: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: - $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + AIMLInferenceEmulationFunction: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple' ManagedElement-ncO-AiMlNrm: type: object @@ -176,6 +178,8 @@ components: $ref: '#/components/schemas/MLUpdateFunction-Multiple' AIMLInferenceFunction: $ref: '#/components/schemas/AIMLInferenceFunction-Multiple' + AIMLInferenceEmulationFunction: + $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From 355b9910f6ca530f8cc6bafdd8b8ee3817d375ff Mon Sep 17 00:00:00 2001 From: sunse Date: Sun, 7 Apr 2024 02:00:09 +0000 Subject: [PATCH 15/82] 28.623_Rel18_CR0340_correction_to_OpenAPI_stage_3 Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c4e866243..7f3b394e6 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -125,7 +125,9 @@ components: type: integer AreaOfInterest: oneOf: - - $ref: '#/components/schemas/GeoAreaToCellMapping' + - type: array + items: + $ref: '#/components/schemas/GeoAreaToCellMapping' - type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' @@ -197,7 +199,7 @@ components: UsageState: type: string enum: - - IDEL + - IDLE - ACTIVE - BUSY AvailabilityStatus: -- GitLab From 864243fe02dbf9c5b6705e7dd784b81d200a1f51 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 25 Apr 2024 12:50:30 +0000 Subject: [PATCH 16/82] Ts28.541 rel18 cr1214 adding mapped cell --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++++- OpenAPI/TS28541_NrNrm.yaml | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2053089df..825a03d62 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3071,7 +3071,9 @@ components: sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + $ref: '#/components/schemas/SatelliteBackhaulInfo' + mappedCellIdInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -3534,6 +3536,8 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/EphemerisInfos' trpInfoList: $ref: '#/components/schemas/TrpInfoList' + mappedCellIdInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9cfcb39b7..d7a5617a9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -694,6 +694,17 @@ components: minimum: 0 maximum: 16777215 + MappedCellIdInfo: + type: object + properties: + ntnGeoArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + mappedCellId: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Ncgi' + MappedCellIdInfoList: + type: array + items: + $ref: '#/components/schemas/MappedCellIdInfo' #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -949,6 +960,8 @@ components: type: boolean dDAPSHOControl: type: boolean + mappedCellIdInfoList: + $ref: '#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From cb68238b961e373139e4ba39426d1b4765da623a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Fri, 3 May 2024 08:50:43 +0000 Subject: [PATCH 17/82] Rel18_28.111_specificProblem_in_NotifyNewSecAlarm into Integration_Rel18_SA5_154_YAML --- OpenAPI/TS28111_FaultNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index c82b1b97a..e5c492096 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -312,6 +312,8 @@ components: $ref: '#/components/schemas/AlarmType' probableCause: $ref: '#/components/schemas/ProbableCause' + specificProblem: + $ref: '#/components/schemas/SpecificProblem' perceivedSeverity: $ref: '#/components/schemas/PerceivedSeverity' correlatedNotifications: -- GitLab From 2934c9d73ac90abee9f7761464657a5ea6740c4f Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 May 2024 13:47:01 +0000 Subject: [PATCH 18/82] 28.623 Rel-18 CR0344 Add trace message attribute yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index fb231f448..8edb3d55d 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -403,6 +403,13 @@ components: - mcc - mnc + listOfTraceMetrics: + description: The trace messages to be reported. See 3GPP TS 32.422 clause 10 for additional details. + type: array + items: + type: string + + traceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -1448,6 +1455,8 @@ components: $ref: '#/components/schemas/plmnTarget-Type' nPNTarget: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' + listOfTraceMetrics: + type: array traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 62647a67d497e4064d02b864f6f88a6507d5aefa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 3 Apr 2024 02:01:28 +0000 Subject: [PATCH 19/82] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 14 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 8 +- OpenAPI/TS28623_TraceControlNrm.yaml | 246 +++++++++++++-------------- 3 files changed, 134 insertions(+), 134 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 843a9cbcf..b7978e4b5 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -141,13 +141,13 @@ components: NFServiceType: type: string enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS TransportProtocol: anyOf: - type: string diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43..2877c918c 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -33,10 +33,10 @@ components: mnsType: type: string enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string mnsAddress: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 8edb3d55d..2698f3601 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -40,8 +40,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +54,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +89,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +129,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +172,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +188,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +202,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +215,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +243,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -336,16 +336,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -457,9 +457,9 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string @@ -478,7 +478,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -486,10 +486,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -501,129 +501,129 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UEINITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UEINITIATEDPDN_DISCONNECTION + - BEARACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -940,9 +940,9 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss + - PATHLOSS eventThresholdUphUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. -- GitLab From 5b53efd5095b4af29ef2c13eae74437dc162bf96 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Apr 2024 06:20:56 +0000 Subject: [PATCH 20/82] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 2698f3601..f1c94ae55 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -520,11 +520,11 @@ components: items: type: string enum: - - UEINITIATEDPDN_CONNECTIVITY_REQUEST + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST - SERVICE_REQUEST - INITIALATTACH_TAU_DETACH - - UEINITIATEDPDN_DISCONNECTION - - BEARACTIVIATION_MODIFICATION_DELETION + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION - HANDOVER SGW: type: array -- GitLab From d8e7cf43cb5a88c2934284b98b2c67b5aff14caa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 3 Apr 2024 03:47:09 +0000 Subject: [PATCH 21/82] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index d7a5617a9..de7a4eea2 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -643,26 +643,32 @@ components: properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -671,26 +677,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 -- GitLab From 26c3e0d4024b1695fc8b62227da10b7ab06ac1ee Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 13 May 2024 03:11:01 +0000 Subject: [PATCH 22/82] Rel 28.623 introducing common data type. Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 7f3b394e6..000a58dbd 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,6 +143,9 @@ components: Fqdn: type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -187,6 +190,12 @@ components: $ref: '#/components/schemas/FullTime' AdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED + - SHUTTINGDOWN + BasicAdministrativeState: type: string enum: - LOCKED -- GitLab From cae6d3e47325a2b0c12bd5d982121efb83c74381 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:11:01 +0000 Subject: [PATCH 23/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 825a03d62..c6abe6960 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5322,9 +5322,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + Managed5GCFunction: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - AmfFunction-Multiple: type: array items: -- GitLab From 3fb071e4560fd47de5e1dbe4e4afe3f95235f2a0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:19:16 +0000 Subject: [PATCH 24/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c6abe6960..d4e594a8f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5322,18 +5322,13 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - Managed5GCFunction: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - type: object - properties: - ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- + Managed5GCFunction-nc0: + type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: -- GitLab From 2429a24f59ffe50f4578a104b8f50833c25b511f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:22:42 +0000 Subject: [PATCH 25/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d4e594a8f..24fd4a73c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3075,6 +3075,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-ncO' - type: object properties: EP_N2: -- GitLab From 5695d31cdc6863e873cb0fe59e6dc357c7afa720 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:27:17 +0000 Subject: [PATCH 26/82] Update file 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 24fd4a73c..765990426 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3075,7 +3075,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N2: -- GitLab From 9b6acaa457104410a215da44ebf804650ae744ee Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:33:40 +0000 Subject: [PATCH 27/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b7978e4b5..c6fee26d2 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -542,8 +542,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' -- GitLab From b3914c2ee80207cbf3c67e47a6d25ce01b600e25 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:02:38 +0000 Subject: [PATCH 28/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 765990426..f4641242f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3189,6 +3189,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N4: @@ -3245,6 +3246,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3272,6 +3274,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3305,6 +3308,7 @@ components: dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -3345,6 +3349,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N12: @@ -3376,6 +3381,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N8: @@ -3409,6 +3415,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3428,6 +3435,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3449,6 +3457,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N27: @@ -3478,6 +3487,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N22: @@ -3507,6 +3517,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N20: @@ -3540,6 +3551,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NLS: @@ -3565,6 +3577,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N17: @@ -3590,6 +3603,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N32: @@ -3635,7 +3649,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3653,6 +3667,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM13: @@ -3680,6 +3695,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N33: @@ -3712,6 +3728,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N60: @@ -3736,6 +3753,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_Npc4: @@ -3768,6 +3786,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N88: @@ -3823,6 +3842,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3836,6 +3856,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3849,6 +3870,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3866,7 +3888,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4631,6 +4653,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -4665,6 +4688,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4716,6 +4740,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MfafFunction-Single: allOf: @@ -4738,6 +4763,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ChfFunction-Single: allOf: @@ -4760,6 +4786,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N28: @@ -4922,6 +4949,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NL2: @@ -4955,6 +4983,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N84: @@ -5078,6 +5107,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MbSmfFunction-Single: allOf: @@ -5098,6 +5128,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N11mb: @@ -5171,6 +5202,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3mb: @@ -5201,6 +5233,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM12: -- GitLab From 82f672039e2274e29fb7148ce7c0e5c4504a615e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:16:45 +0000 Subject: [PATCH 29/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 53 ++++++++++++++++++++++++++++++++- OpenAPI/TS28623_GenericNrm.yaml | 49 ++---------------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f4641242f..3228062ba 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2926,6 +2926,23 @@ components: properties: nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -5364,6 +5381,37 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- + +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array @@ -5802,7 +5850,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c6fee26d2..ef03be174 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -131,23 +131,7 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - NAMF_COMMUNICATION - - NAMF_EVENTEXPOSURE - - NAMF_MT - - NAMF_LOCATION - - NSMF_PDUSESSION - - NSMF_EVENTEXPOSURE - - OTHERS + TransportProtocol: anyOf: - type: string @@ -563,32 +547,7 @@ components: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -716,10 +675,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: -- GitLab From 4ae00c7e5aacfe8e7093d74ad501b91a9200bb64 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:19:58 +0000 Subject: [PATCH 30/82] Update file 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 3228062ba..850c8346c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5378,7 +5378,7 @@ components: type: object properties: ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' + $ref: '#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 60daff99730ffda23a5c7f068d35dc08f0d0a7d5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:24:07 +0000 Subject: [PATCH 31/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + OpenAPI/TS28623_GenericNrm.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 850c8346c..6b0df5f8b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5879,6 +5879,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index ef03be174..6a0c59f96 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -714,7 +714,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From cc59068f0f05d59aec1a9f71f4600bd33b4e9150 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:28:12 +0000 Subject: [PATCH 32/82] Update file 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 6b0df5f8b..02372631c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5385,7 +5385,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top' + - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From bc4da83136fe585fbe167a2e645612ed8cc7f193 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:31:44 +0000 Subject: [PATCH 33/82] Update file 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 02372631c..0dad063d1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5385,7 +5385,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From e7dc354417b6a0096297d7fd6c6ca671bf4dcb8e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:37:54 +0000 Subject: [PATCH 34/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 95 ++++++++++++++++++++++++++++++--- OpenAPI/TS28623_GenericNrm.yaml | 80 --------------------------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0dad063d1..0240d407e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -63,7 +63,7 @@ components: type: string description: uuid of NF instance nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' nFStatus: $ref: '#/components/schemas/NFStatus' plmn: @@ -105,7 +105,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -218,7 +218,7 @@ components: nfInstanceID: type: string nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +240,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -1050,7 +1050,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1523,7 +1523,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1545,7 +1545,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -2925,7 +2925,7 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' SAP: type: object properties: @@ -2943,7 +2943,86 @@ components: - NSMF_PDUSESSION - NSMF_EVENTEXPOSURE - OTHERS + Operation: + type: object + properties: + name: + type: string + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + type: string + description: ' NF name defined in TS 23.501 or TS 29.510' + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + OperationSemantics: + type: string + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 6a0c59f96..3439e59fa 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -51,86 +51,6 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY TransportProtocol: anyOf: -- GitLab From 749c65daa3ade7164d2274be0fc1a1328898494d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:43:54 +0000 Subject: [PATCH 35/82] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ OpenAPI/TS28623_GenericNrm.yaml | 6 +----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b8c44996d..db0d6f755 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0240d407e..88a71ae41 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3023,6 +3023,12 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + enum: + - REGISTERED + - DEREGISTERED + #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3439e59fa..04139e9b5 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: -- GitLab From d501c7e601ed32c2984eb35cf85b9dc918573ffe Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:46:59 +0000 Subject: [PATCH 36/82] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index db0d6f755..5dcbd234c 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext -- GitLab From 096c9d653ed1367329903f4cc5930bb83de905ed Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 27 May 2024 07:10:31 +0000 Subject: [PATCH 37/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 88a71ae41..5c2a0f525 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3177,7 +3177,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3291,7 +3291,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3348,7 +3348,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3376,7 +3376,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3410,7 +3410,7 @@ components: dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3451,7 +3451,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3483,7 +3483,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3517,7 +3517,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3537,7 +3537,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3559,7 +3559,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3589,7 +3589,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3619,7 +3619,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3653,7 +3653,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NLS: @@ -3679,7 +3679,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3705,7 +3705,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3751,7 +3751,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3769,7 +3769,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3797,7 +3797,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3830,7 +3830,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3855,7 +3855,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3888,7 +3888,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3944,7 +3944,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3958,7 +3958,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3972,7 +3972,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3990,7 +3990,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4755,7 +4755,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4790,7 +4790,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4842,7 +4842,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4865,7 +4865,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4888,7 +4888,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -5051,7 +5051,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -5085,7 +5085,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5209,7 +5209,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5230,7 +5230,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5304,7 +5304,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5335,7 +5335,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5459,7 +5459,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of abstract IOCs -------------------------------------------- - Managed5GCFunction-nc0: + ManagedFunction5GC-nc0: type: object properties: ManagedNFService: -- GitLab From 7bbb33a07b5b35b4bd8eb0dbba5ce98c5789e9aa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:08:40 +0000 Subject: [PATCH 38/82] Update 2 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 19 +++++++++++++++++++ OpenAPI/TS28623_GenericNrm.yaml | 10 ++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 6cdfde23e..dcd97b577 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 04139e9b5..ddc6f2a39 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -355,10 +355,6 @@ components: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' MnsRegistry: $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: @@ -385,10 +381,6 @@ components: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -573,6 +565,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' ManagedElement-Single: allOf: @@ -584,6 +577,7 @@ components: - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 7b39fe868add725585de869190ac1cc57a2dee88 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:15:14 +0000 Subject: [PATCH 39/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index ddc6f2a39..42c6bed7a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -577,7 +577,7 @@ components: - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 76724b0c773c1a74fff0f7ed6a5210b808257ca8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:19:59 +0000 Subject: [PATCH 40/82] Update file TS28623_FileManagementNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index dcd97b577..5b14ced93 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -21,7 +21,7 @@ components: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: $ref: '#/components/schemas/Files-Multiple' - ManagedElement-ncO-FileManagementNrm: + ManagedElement-ncO-FileManagementNrm: type: object properties: FileDownloadJob: -- GitLab From b7652d02652d6ed4faf507c5b129754520d2d49d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:38:25 +0000 Subject: [PATCH 41/82] Update 4 files - /OpenAPI/TS28623_ManagementDataCollectionNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 17 +++++++---------- .../TS28623_ManagementDataCollectionNrm.yaml | 9 +++++++++ OpenAPI/TS28623_MnSRegistryNrm.yaml | 9 +++++++++ OpenAPI/TS28623_PmControlNrm.yaml | 13 +++++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 42c6bed7a..308158b5d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -343,20 +343,14 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' NtfSubscriptionControl: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -371,8 +365,6 @@ components: properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: @@ -555,6 +547,10 @@ components: - $ref: '#/components/schemas/SubNetwork-ncO' - $ref: '#/components/schemas/SubNetwork-Multiple' - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -565,19 +561,20 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364..63710ca79 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 2877c918c..bb5d1a1a8 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..6db2ed41e 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- -- GitLab From f7af5f5a2a1636cc5c5fd9662db33b26fc6de3f9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:42:26 +0000 Subject: [PATCH 42/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 308158b5d..c71e4c69d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -550,7 +550,7 @@ components: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' - - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' -- GitLab From ba4177c0b9fd1d679a9ff58f557b36d21575ff93 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 03:02:59 +0000 Subject: [PATCH 43/82] Update 5 files - /OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml - /OpenAPI/TS28623_SubscriptionControlNrm.yaml - /OpenAPI/TS28623_ThresholdMonitorNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 30 ++++++++----------- .../TS28623_QoEMeasurementCollectionNrm.yaml | 14 +++++++++ OpenAPI/TS28623_SubscriptionControlNrm.yaml | 13 ++++++++ OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 13 ++++++++ OpenAPI/TS28623_TraceControlNrm.yaml | 13 ++++++++ 5 files changed, 65 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c71e4c69d..9b3e6697f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -343,12 +343,6 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' Scheduler: @@ -357,20 +351,13 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' Scheduler: @@ -379,8 +366,7 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -548,7 +534,11 @@ components: - $ref: '#/components/schemas/SubNetwork-Multiple' - $ref: '#/components/schemas/ManagedElement-Multiple' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' @@ -569,7 +559,11 @@ components: - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 27c4f7d1e..734507a30 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 750d31833..0509fcd51 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- Scope: type: object diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac1..711ce416c 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f1c94ae55..7407cd5a0 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: -- GitLab From 989c2b307ab5fedb2e7120cdb30fe43582ac5983 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 16 May 2024 09:29:29 +0000 Subject: [PATCH 44/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5c2a0f525..24ecf35ef 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3450,6 +3450,8 @@ components: $ref: '#/components/schemas/CommModelList' ausfInfo: $ref: '#/components/schemas/AusfInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3482,6 +3484,8 @@ components: $ref: '#/components/schemas/ECSAddrConfigInfo' udmInfo: $ref: '#/components/schemas/UdmInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3516,6 +3520,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udrInfo: $ref: '#/components/schemas/UdrInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: -- GitLab From ce326c93179308b157e70353297167ae17b06b51 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 12:57:00 +0000 Subject: [PATCH 45/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 24ecf35ef..6bf96fde0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -215,6 +215,9 @@ components: ManagedNFProfile: type: object properties: + hniList: + type: array + items: string nfInstanceID: type: string nfType: @@ -3450,8 +3453,6 @@ components: $ref: '#/components/schemas/CommModelList' ausfInfo: $ref: '#/components/schemas/AusfInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3484,8 +3485,6 @@ components: $ref: '#/components/schemas/ECSAddrConfigInfo' udmInfo: $ref: '#/components/schemas/UdmInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3520,8 +3519,6 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udrInfo: $ref: '#/components/schemas/UdrInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: -- GitLab From a4cf6370634cfbff082df8effe11744ea8b59478 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 13:11:56 +0000 Subject: [PATCH 46/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6bf96fde0..5a887aae6 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -218,6 +218,7 @@ components: hniList: type: array items: string + type: string nfInstanceID: type: string nfType: -- GitLab From b636be50ca4417fda1285a24947cf97414c5387f Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 13:13:40 +0000 Subject: [PATCH 47/82] 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 5a887aae6..0ce58be9e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -217,7 +217,7 @@ components: properties: hniList: type: array - items: string + items: type: string nfInstanceID: type: string -- GitLab From 3baf8ff4117033efe8fef854d8ed9afbe7363daf Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 30 May 2024 03:10:42 +0000 Subject: [PATCH 48/82] Update TS28541_5GcNrm.yaml --- 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 0ce58be9e..c0c57a288 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -217,8 +217,8 @@ components: properties: hniList: type: array - items: - type: string + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string nfType: -- GitLab From 52f187dc238512eb954c2f895fe7e80a9bff466b Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 16 May 2024 08:15:29 +0000 Subject: [PATCH 49/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c0c57a288..dfb60c1b2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3285,7 +3285,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + $ref: '#/components/schemas/SmfInfo' + SmfInfoList: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3350,7 +3352,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + $ref: '#/components/schemas/UpfInfo' + upfInfoList: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3408,7 +3412,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + $ref: '#/components/schemas/PcfInfo' + PcfInfoList: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -5212,6 +5218,8 @@ components: $ref: '#/components/schemas/CommModelList' bsfInfo: $ref: '#/components/schemas/BsfInfo' + bsfInfoList: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' -- GitLab From 852b96070178d9f450843dfd519445c0ef0f2de1 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 30 May 2024 02:18:11 +0000 Subject: [PATCH 50/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index dfb60c1b2..4921dd31e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3285,9 +3285,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' - SmfInfoList: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3352,9 +3352,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' - upfInfoList: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3412,9 +3412,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' - PcfInfoList: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -5217,9 +5217,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' - bsfInfoList: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' -- GitLab From ecb84ef0ef67bc12f297b9061cb93e90c3765255 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 3 Apr 2024 02:01:28 +0000 Subject: [PATCH 51/82] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 14 +- OpenAPI/TS28623_MnSRegistryNrm.yaml | 8 +- OpenAPI/TS28623_TraceControlNrm.yaml | 246 +++++++++++++-------------- 3 files changed, 134 insertions(+), 134 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 695a96fa4..42ef185d3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -141,13 +141,13 @@ components: NFServiceType: type: string enum: - - Namf_Communication - - Namf_EventExposure - - Namf_MT - - Namf_Location - - Nsmf_PDUSession - - Nsmf_EventExposure - - Others + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS TransportProtocol: anyOf: - type: string diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a5a022a43..2877c918c 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -33,10 +33,10 @@ components: mnsType: type: string enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS + - PROV_MNS + - FAULT_SUPERVISION_MNS + - STREAMING_DATA_REPORTING_MNS + - FILE_DATA_REPORTING_MNS mnsVersion: type: string mnsAddress: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0d09284e0..ace50ce6d 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -40,8 +40,8 @@ components: type: string enum: - A - - Iu-CS - - Mc + - IU-CS + - MC - MAP-G - MAP-B - MAP-E @@ -54,33 +54,33 @@ components: items: type: string enum: - - Mc - - Nb-UP - - Iu-UP + - MC + - NB-UP + - IU-UP RNCInterfaces: type: array items: type: string enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu + - IU-CS + - IU-PS + - IUR + - IUB + - UU SGSNInterfaces: type: array items: type: string enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d + - GB + - IU-PS + - GN + - MAP-GR + - MAP-GD + - MAP-GF + - GE + - GS + - S6D - S4 - S3 - S13 @@ -89,34 +89,34 @@ components: items: type: string enum: - - Gn - - Gi - - Gmb + - GN + - GI + - GMB S-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Mg - - Mr - - Mi + - MW + - MG + - MR + - MI P-CSCFInterfaces: type: array items: type: string enum: - - Gm - - Mw + - GM + - MW I-CSCFInterfaces: type: array items: type: string enum: - - Cx - - Dx - - Mg - - Mw + - CX + - DX + - MG + - MW MRFCInterfaces: type: array items: @@ -129,42 +129,42 @@ components: items: type: string enum: - - Mg - - Mj - - Mn + - MG + - MJ + - MN IBCFInterfaces: type: array items: type: string enum: - - Ix - - Mx + - IX + - MX E-CSCFInterfaces: type: array items: type: string enum: - - Mw - - Ml - - Mm - - Mi/Mg + - MW + - ML + - MM + - MI/MG BGCFInterfaces: type: array items: type: string enum: - - Mi - - Mj - - Mk + - MI + - MJ + - MK ASInterfaces: type: array items: type: string enum: - - Dh - - Sh + - DH + - SH - ISC - - Ut + - UT HSSInterfaces: type: array items: @@ -172,12 +172,12 @@ components: enum: - MAP-C - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh + - GC + - GR + - CX + - S6D + - S6A + - SH - N70 - N71 - NU1 @@ -188,13 +188,13 @@ components: enum: - MAP-F - S13 - - MAP-Gf + - MAP-GF BM-SCInterfaces: type: array items: type: string enum: - - Gmb + - GMB MMEInterfaces: type: array items: @@ -202,7 +202,7 @@ components: enum: - S1-MME - S3 - - S6a + - S6A - S10 - S11 - S13 @@ -215,20 +215,20 @@ components: - S5 - S8 - S11 - - Gxc + - GXC PDN_GWInterfaces: type: array items: type: string enum: - - S2a - - S2b - - S2c + - S2A + - S2B + - S2C - S5 - - S6b - - Gx + - S6B + - GX - S8 - - SGi + - SGI eNBInterfaces: type: array items: @@ -243,7 +243,7 @@ components: enum: - S1-MME - X2 - - Uu + - UU - F1-C - E1 AMFInterfaces: @@ -336,16 +336,16 @@ components: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU gNB-CU-CPInterfaces: type: array items: type: string enum: - NG-C - - Xn-C - - Uu + - XN-C + - UU - F1-C - E1 - X2-C @@ -459,9 +459,9 @@ components: - UTRAN_CELL - E-UTRAN_CELL - NG-RAN_CELL - - eNB + - ENB - RNC - - gNB + - GNB - SUPI TargetIdValue: type: string @@ -480,7 +480,7 @@ components: enum: - MO_MT_CALLS - MO_MT_SMS - - LU_IMSIattach_IMSIdetach + - LU_IMSIATTACH_IMSIDETACH - HANDOVER - SS SGSN: @@ -488,10 +488,10 @@ components: items: type: string enum: - - PDPcontext + - PDPCONTEXT - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext + - RAU_GPRSATTACH_GPRSDETACH + - MBMSCONTEXT MGW: type: array items: @@ -503,129 +503,129 @@ components: items: type: string enum: - - PDPcontext - - MBMScontext + - PDPCONTEXT + - MBMSCONTEXT IMS: type: array items: type: string enum: - - SIPsession_StandaloneTransaction + - SIPSESSION_STANDALONETRANSACTION BM_SC: type: array items: type: string enum: - - MBMSactivation + - MBMSACTIVATION MME: type: array items: type: string enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover + - UEINITIATEDPDN_CONNECTIVITY_REQUEST + - SERVICE_REQUEST + - INITIALATTACH_TAU_DETACH + - UEINITIATEDPDN_DISCONNECTION + - BEARACTIVIATION_MODIFICATION_DELETION + - HANDOVER SGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION PGW: type: array items: type: string enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion + - PDN_CONNECTION_CREATION + - PDN_CONNECTION_TERMINATION + - BEAR_ACTIVATION_MODIFICATION_DELETION AMF: type: array items: type: string enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC + - REGISTRATION + - SERVICE_REQUEST + - HANDOVER + - UE_DEREGISTRATION + - NETWORK_DEREGISTRATION + - UE_MOBILITY_FROM_EPC + - UE_MOBILITY_TO_EPC SMF: type: array items: type: string enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc + - PDU_SESSION_ESTABLISHMENT + - PDU_SESSION_MODIFICATION + - PDU_SESSIOON_RELEASE + - PDU_SESSION_UP_ACTIVATION_DEACTIVATION + - MOBILITY_BTW_3GPP_AND_N3GPP_TO_5GC + - MOBILITY_FROM_EPC PCF: type: array items: type: string enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy + - AM_POLICY + - SM_POLICY + - AUTHORIZATION + - BDT_POLICY UPF: type: array items: type: string enum: - - N4Session + - N4SESSION AUSF: type: array items: type: string enum: - - UEauthentication + - UE_AUTHENTICATION NEF: type: array items: type: string enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger + - EVENT_EXPOSURE + - PFD_MANAGEMENT + - PARAMETER_PROVISION + - TRIGGER NRF: type: array items: type: string enum: - - NFmanagement - - NFdiscovery + - NF_MANAGEMEENT + - NF_DISCOVERY NSSF: type: array items: type: string enum: - - NSSelection + - NS_SELECTION - NSSAI SMSF: type: array items: type: string enum: - - SMservice + - SMSERVICE UDM: type: array items: type: string enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure + - UE_CONTEXT + - SUBSCRIBER_DATA + - UE_AUTHENTICATION + - EVENT_EXPOSURE anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. @@ -943,9 +943,9 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: - - CPICH_EcNo + - CPICH_ECNO - CPICH_RSCP - - PathLoss + - PATHLOSS eventThresholdUphUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. -- GitLab From e8566602abacf308660155b6b24e4f68dc43d4c1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Apr 2024 06:20:56 +0000 Subject: [PATCH 52/82] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index ace50ce6d..6c2532108 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -522,11 +522,11 @@ components: items: type: string enum: - - UEINITIATEDPDN_CONNECTIVITY_REQUEST + - UE_INITIATEDPDN_CONNECTIVITY_REQUEST - SERVICE_REQUEST - INITIALATTACH_TAU_DETACH - - UEINITIATEDPDN_DISCONNECTION - - BEARACTIVIATION_MODIFICATION_DELETION + - UE_INITIATEDPDN_DISCONNECTION + - BEAR_ACTIVIATION_MODIFICATION_DELETION - HANDOVER SGW: type: array -- GitLab From 9437231a5638b60c3b59974ab71eb3b6d265c114 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 3 Apr 2024 03:47:09 +0000 Subject: [PATCH 53/82] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 62e23de93..f9b0c46ff 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -628,26 +628,32 @@ components: properties: positionX: type: integer + default: 0 minimum: 0 maximum: 604800 positionY: type: integer + default: 0 minimum: 0 maximum: 604800 positionZ: type: integer + default: 0 minimum: 0 maximum: 604800 velocityVX: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVY: type: integer + default: 0 minimum: -131072 maximum: 131071 velocityVZ: type: integer + default: 0 minimum: -131072 maximum: 131071 @@ -656,26 +662,32 @@ components: properties: semiMajorAxis: type: integer + default: 0 minimum: 0 maximum: 8589934591 eccentricity: type: integer + default: 0 minimum: -524288 maximum: 524287 periapsis: type: integer + default: 0 minimum: 0 maximum: 16777215 longitude: type: integer + default: 0 minimum: 0 maximum: 2097151 inclination: type: integer + default: 0 minimum: -524288 maximum: 524287 meanAnomaly: type: integer + default: 0 minimum: 0 maximum: 16777215 -- GitLab From d5b7d4bee7e3bfe5be9e45674c1163d6daa8ef55 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 13 May 2024 03:11:01 +0000 Subject: [PATCH 54/82] Rel 28.623 introducing common data type. Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380..1b6188316 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -143,6 +143,9 @@ components: Fqdn: type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -192,6 +195,12 @@ components: - LOCKED - UNLOCKED default: LOCKED + - SHUTTINGDOWN + BasicAdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED OperationalState: type: string enum: -- GitLab From 004c6e0fd97a7fb09a9b7599207279566d29b8e7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:11:01 +0000 Subject: [PATCH 55/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44dc93e1c..b9c5eb360 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5301,9 +5301,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + Managed5GCFunction: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - AmfFunction-Multiple: type: array items: -- GitLab From 011a0ebb3b8fef84262fa5a14053d24a583ab0e7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:19:16 +0000 Subject: [PATCH 56/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b9c5eb360..9a2ef7522 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5301,18 +5301,13 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - Managed5GCFunction: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - attributes: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - type: object - properties: - ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- + Managed5GCFunction-nc0: + type: object + properties: + ManagedNFService: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: -- GitLab From 845275f758a7fcede7302b4299280246becb69fc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:22:42 +0000 Subject: [PATCH 57/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9a2ef7522..546587d61 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3055,6 +3055,7 @@ components: mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-ncO' - type: object properties: EP_N2: -- GitLab From 81270025a2803cf316e93d02ef2d9f5c004cf82c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:27:17 +0000 Subject: [PATCH 58/82] Update file 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 546587d61..adb5fe7c1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3055,7 +3055,7 @@ components: mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N2: -- GitLab From 9b585505e75651d9e382baaa036b0631f364d17d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 09:33:40 +0000 Subject: [PATCH 59/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 42ef185d3..f788c92bf 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -552,8 +552,6 @@ components: $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - ManagedNFService: - $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' -- GitLab From 1b43e2eb6cca7861d5a09449639636241fd964a9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:02:38 +0000 Subject: [PATCH 60/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index adb5fe7c1..fe8eb84e9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3169,6 +3169,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N4: @@ -3225,6 +3226,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3252,6 +3254,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3: @@ -3287,6 +3290,7 @@ components: predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -3325,6 +3329,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N12: @@ -3356,6 +3361,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N8: @@ -3389,6 +3395,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3408,6 +3415,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3429,6 +3437,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N27: @@ -3458,6 +3467,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N22: @@ -3487,6 +3497,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N20: @@ -3520,6 +3531,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NLS: @@ -3545,6 +3557,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N17: @@ -3570,6 +3583,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N32: @@ -3615,7 +3629,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3633,6 +3647,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM13: @@ -3660,6 +3675,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N33: @@ -3692,6 +3708,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N60: @@ -3716,6 +3733,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_Npc4: @@ -3748,6 +3766,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N88: @@ -3803,6 +3822,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3816,6 +3836,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3829,6 +3850,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3846,7 +3868,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4611,6 +4633,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N5: @@ -4645,6 +4668,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4696,6 +4720,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MfafFunction-Single: allOf: @@ -4718,6 +4743,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' ChfFunction-Single: allOf: @@ -4740,6 +4766,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N28: @@ -4902,6 +4929,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_NL2: @@ -4935,6 +4963,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N84: @@ -5058,6 +5087,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' MbSmfFunction-Single: allOf: @@ -5078,6 +5108,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N11mb: @@ -5151,6 +5182,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_N3mb: @@ -5181,6 +5213,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/Managed5GCFunction-nc0' - type: object properties: EP_SM12: -- GitLab From 05f8d624dd13025e15f7cb8dd4a8fd885dd83f63 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:16:45 +0000 Subject: [PATCH 61/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 53 ++++++++++++++++++++++++++++++++- OpenAPI/TS28623_GenericNrm.yaml | 49 ++---------------------------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fe8eb84e9..f0552d1fd 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2919,6 +2919,23 @@ components: properties: nfType: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + NFServiceType: + type: string + enum: + - NAMF_COMMUNICATION + - NAMF_EVENTEXPOSURE + - NAMF_MT + - NAMF_LOCATION + - NSMF_PDUSESSION + - NSMF_EVENTEXPOSURE + - OTHERS #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: @@ -5343,6 +5360,37 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- + +#-------- Definition of 5GC common IOCs -------------------------------------------- + ManagedNFService-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + nFServiceType: + $ref: '#/components/schemas/NFServiceType' + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + usageState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' + registrationState: + $ref: '#/components/schemas/RegistrationState' + +#-------- Definition of 5GC common IOCs -------------------------------------------- + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- AmfFunction-Multiple: type: array @@ -5781,7 +5829,10 @@ components: type: array items: $ref: '#/components/schemas/MnpfFunction-Single' - + ManagedNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedNFService-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-5gcNrm: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f788c92bf..59bce597d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -131,23 +131,7 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY - SAP: - type: object - properties: - host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' - port: - type: integer - NFServiceType: - type: string - enum: - - NAMF_COMMUNICATION - - NAMF_EVENTEXPOSURE - - NAMF_MT - - NAMF_LOCATION - - NSMF_PDUSESSION - - NSMF_EVENTEXPOSURE - - OTHERS + TransportProtocol: anyOf: - type: string @@ -573,32 +557,7 @@ components: nullable: true VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' - ManagedNFService-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - type: object - properties: - userLabel: - type: string - nFServiceType: - $ref: '#/components/schemas/NFServiceType' - sAP: - $ref: '#/components/schemas/SAP' - operations: - type: array - items: - $ref: '#/components/schemas/Operation' - administrativeState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' - operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - usageState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/UsageState' - registrationState: - $ref: '#/components/schemas/RegistrationState' + ManagementNode-Single: allOf: - $ref: '#/components/schemas/Top' @@ -735,10 +694,6 @@ components: type: array items: $ref: '#/components/schemas/VsDataContainer-Single' - ManagedNFService-Multiple: - type: array - items: - $ref: '#/components/schemas/ManagedNFService-Single' ManagementNode-Multiple: type: array items: -- GitLab From 5ef008711384591c1f6543c8f6e59454251711c8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:19:58 +0000 Subject: [PATCH 62/82] Update file 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 f0552d1fd..f4bc95a7d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5357,7 +5357,7 @@ components: type: object properties: ManagedNFService: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple' + $ref: '#/components/schemas/ManagedNFService-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 32685e6f70b202a9f974330c1785c8f5df03c714 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:24:07 +0000 Subject: [PATCH 63/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + OpenAPI/TS28623_GenericNrm.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f4bc95a7d..3e09db41e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5857,6 +5857,7 @@ components: - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' - $ref: '#/components/schemas/DDNMFFunction-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 59bce597d..57fe2ac62 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -733,7 +733,6 @@ components: - $ref: '#/components/schemas/ManagementNode-Single' - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From cf184accaa5fff005631696347cd236799e7ed34 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:28:12 +0000 Subject: [PATCH 64/82] Update file 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 3e09db41e..d172848ea 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5364,7 +5364,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top' + - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 78a9d297202ba92b8385161724e73a5455cca04a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:31:44 +0000 Subject: [PATCH 65/82] Update file 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 d172848ea..84c744128 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5364,7 +5364,7 @@ components: #-------- Definition of 5GC common IOCs -------------------------------------------- ManagedNFService-Single: allOf: - - $ref: TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab From 3205e74efc39abcd50ccdffd1592de4617cba5e0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:37:54 +0000 Subject: [PATCH 66/82] Update 2 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 95 ++++++++++++++++++++++++++++++--- OpenAPI/TS28623_GenericNrm.yaml | 80 --------------------------- 2 files changed, 87 insertions(+), 88 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 84c744128..71e8c4783 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -63,7 +63,7 @@ components: type: string description: uuid of NF instance nFType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' nFStatus: $ref: '#/components/schemas/NFStatus' plmn: @@ -105,7 +105,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNssais: type: array items: @@ -218,7 +218,7 @@ components: nfInstanceID: type: string nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' heartbeatTimer: type: integer authzInfo: @@ -240,7 +240,7 @@ components: allowedNfTypes: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' allowedNfDomains: type: array items: @@ -1043,7 +1043,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 mlAnalyticsList: type: array @@ -1516,7 +1516,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' minItems: 1 servingNfSetIdList: type: array @@ -1538,7 +1538,7 @@ components: servingNfTypeList: type: array items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' servingNfSetIdList: type: array items: @@ -2918,7 +2918,7 @@ components: type: object properties: nfType: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + $ref: '#/components/schemas/NFType' SAP: type: object properties: @@ -2936,7 +2936,86 @@ components: - NSMF_PDUSESSION - NSMF_EVENTEXPOSURE - OTHERS + Operation: + type: object + properties: + name: + type: string + allowedNFTypes: + $ref: '#/components/schemas/NFType' + operationSemantics: + $ref: '#/components/schemas/OperationSemantics' + NFType: + type: string + description: ' NF name defined in TS 23.501 or TS 29.510' + enum: + - NRF + - UDM + - AMF + - SMF + - AUSF + - NEF + - PCF + - SMSF + - NSSF + - UDR + - LMF + - GMLC + - 5G_EIR + - SEPP + - UPF + - N3IWF + - AF + - UDSF + - DN + - BSF + - CHF + - NWDAF + - PCSCF + - CBCF + - HSS + - UCMF + - SOR_AF + - SPAF + - MME + - SCSAS + - SCEF + - SCP + - NSSAAF + - ICSCF + - SCSCF + - DRA + - IMS_AS + - AANF + - 5G_DDNMF + - NSACF + - MFAF + - EASDF + - DCCF + - MB_SMF + - TSCTSF + - ADRF + - GBA_BSF + - CEF + - MB_UPF + - NSWOF + - PKMF + - MNPF + - SMS_GMSC + - SMS_IWMSC + - MBSF + - MBSTF + - PANF + - TNGF + - W_AGF + - TWIF + - TSN_AF + OperationSemantics: + type: string + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 57fe2ac62..bdd0f0d33 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -51,86 +51,6 @@ components: type: string powerInterface: type: string - Operation: - type: object - properties: - name: - type: string - allowedNFTypes: - $ref: '#/components/schemas/NFType' - operationSemantics: - $ref: '#/components/schemas/OperationSemantics' - NFType: - type: string - description: ' NF name defined in TS 23.501 or TS 29.510' - enum: - - NRF - - UDM - - AMF - - SMF - - AUSF - - NEF - - PCF - - SMSF - - NSSF - - UDR - - LMF - - GMLC - - 5G_EIR - - SEPP - - UPF - - N3IWF - - AF - - UDSF - - DN - - BSF - - CHF - - NWDAF - - PCSCF - - CBCF - - HSS - - UCMF - - SOR_AF - - SPAF - - MME - - SCSAS - - SCEF - - SCP - - NSSAAF - - ICSCF - - SCSCF - - DRA - - IMS_AS - - AANF - - 5G_DDNMF - - NSACF - - MFAF - - EASDF - - DCCF - - MB_SMF - - TSCTSF - - ADRF - - GBA_BSF - - CEF - - MB_UPF - - NSWOF - - PKMF - - MNPF - - SMS_GMSC - - SMS_IWMSC - - MBSF - - MBSTF - - PANF - - TNGF - - W_AGF - - TWIF - - TSN_AF - - OperationSemantics: - type: string - enum: - - REQUEST_RESPONSE - - SUBSCRIBE_NOTIFY TransportProtocol: anyOf: -- GitLab From 81656398cc18e1e6ceba5caf916cae58c3f74abd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:43:54 +0000 Subject: [PATCH 67/82] Update 3 files - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28541_5GcNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ OpenAPI/TS28623_GenericNrm.yaml | 6 +----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 82031387f..0cac739d6 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 71e8c4783..05f7895e9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3016,6 +3016,12 @@ components: enum: - REQUEST_RESPONSE - SUBSCRIBE_NOTIFY + RegistrationState: + type: string + enum: + - REGISTERED + - DEREGISTERED + #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: type: object diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index bdd0f0d33..e641de95a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -15,11 +15,7 @@ components: #-------- Definition of types----------------------------------------------------- - RegistrationState: - type: string - enum: - - REGISTERED - - DEREGISTERED + VnfParameter: type: object properties: -- GitLab From 0275748ff21337a7eb1d7d43c914b729ece6375b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 May 2024 11:46:59 +0000 Subject: [PATCH 68/82] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 0cac739d6..3938719ef 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -969,7 +969,7 @@ components: contextValueRange: type: array items: - $ref: "TS541_5GcNrm.yaml#/components/schemas/NFType" + $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext -- GitLab From 9a4a13f062ad8bf6f3964d5a6fcae61744896465 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 27 May 2024 07:10:31 +0000 Subject: [PATCH 69/82] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 74 ++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 05f7895e9..15ab43bbc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3157,7 +3157,7 @@ components: mdtUserConsentReqList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MdtUserConsentReqList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N2: @@ -3271,7 +3271,7 @@ components: items: $ref: '#/components/schemas/dnaiSatelliteMapping' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N4: @@ -3328,7 +3328,7 @@ components: upfInfo: $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3356,7 +3356,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3: @@ -3392,7 +3392,7 @@ components: predefinedPccRuleSetRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -3431,7 +3431,7 @@ components: ausfInfo: $ref: '#/components/schemas/AusfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N12: @@ -3463,7 +3463,7 @@ components: udmInfo: $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N8: @@ -3497,7 +3497,7 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3517,7 +3517,7 @@ components: udsfInfo: $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' NrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3539,7 +3539,7 @@ components: nrfInfo: $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N27: @@ -3569,7 +3569,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N22: @@ -3599,7 +3599,7 @@ components: smsfInfo: $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N20: @@ -3633,7 +3633,7 @@ components: mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NLS: @@ -3659,7 +3659,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N17: @@ -3685,7 +3685,7 @@ components: seppInfo: $ref: '#/components/schemas/SeppInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N32: @@ -3731,7 +3731,7 @@ components: AnLFFunction: $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3749,7 +3749,7 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM13: @@ -3777,7 +3777,7 @@ components: nefInfo: $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N33: @@ -3810,7 +3810,7 @@ components: nsacfInfo: $ref: '#/components/schemas/NsacfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N60: @@ -3835,7 +3835,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_Npc4: @@ -3868,7 +3868,7 @@ components: easdfInfo: $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N88: @@ -3924,7 +3924,7 @@ components: amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNrfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3938,7 +3938,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalNssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3952,7 +3952,7 @@ components: plmnIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ExternalSeppFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3970,7 +3970,7 @@ components: fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4735,7 +4735,7 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N5: @@ -4770,7 +4770,7 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' EP_N58-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4822,7 +4822,7 @@ components: dccfInfo: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MfafFunction-Single: allOf: @@ -4845,7 +4845,7 @@ components: mfafInfo: $ref: '#/components/schemas/MfafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' ChfFunction-Single: allOf: @@ -4868,7 +4868,7 @@ components: chfInfo: $ref: '#/components/schemas/ChfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N28: @@ -5031,7 +5031,7 @@ components: gmlcInfo: $ref: '#/components/schemas/GmlcInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_NL2: @@ -5065,7 +5065,7 @@ components: tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N84: @@ -5189,7 +5189,7 @@ components: bsfInfo: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' MbSmfFunction-Single: allOf: @@ -5210,7 +5210,7 @@ components: mbSmfInfo: $ref: '#/components/schemas/MbSmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N11mb: @@ -5284,7 +5284,7 @@ components: mbUpfInfo: $ref: '#/components/schemas/MbUpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_N3mb: @@ -5315,7 +5315,7 @@ components: mnpfInfo: $ref: '#/components/schemas/MnpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/Managed5GCFunction-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object properties: EP_SM12: @@ -5438,7 +5438,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of abstract IOCs -------------------------------------------- - Managed5GCFunction-nc0: + ManagedFunction5GC-nc0: type: object properties: ManagedNFService: -- GitLab From 4cc595553c4d05d987aae0d717001f0d1ad1d7fa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:08:40 +0000 Subject: [PATCH 70/82] Update 2 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 19 +++++++++++++++++++ OpenAPI/TS28623_GenericNrm.yaml | 10 ++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe33..688d98bf7 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -12,6 +12,25 @@ externalDocs: paths: {} components: schemas: + + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + ManagedElement-ncO-FileManagementNrm: + type: object + properties: + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' + Files: + $ref: '#/components/schemas/Files-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- FileDownloadJobProcessMonitor: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e641de95a..3f2d61006 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -365,10 +365,6 @@ components: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' MnsRegistry: $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: @@ -395,10 +391,6 @@ components: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - FileDownloadJob: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple' - Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -581,6 +573,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' ManagedElement-Single: allOf: @@ -592,6 +585,7 @@ components: - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' NrmRoot: oneOf: -- GitLab From 25c9d5e8373ba79ebb9be16cc7d4015ed14ebff8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:15:14 +0000 Subject: [PATCH 71/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3f2d61006..5e6bcd5f3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -585,7 +585,7 @@ components: - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' NrmRoot: oneOf: -- GitLab From 5b9fa935825b6d69d528738d8acaf85d240df228 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:19:59 +0000 Subject: [PATCH 72/82] Update file TS28623_FileManagementNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 688d98bf7..bd3881d20 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -21,7 +21,7 @@ components: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: $ref: '#/components/schemas/Files-Multiple' - ManagedElement-ncO-FileManagementNrm: + ManagedElement-ncO-FileManagementNrm: type: object properties: FileDownloadJob: -- GitLab From ae9d1271fe1f9100e472d1f6c27b7a1ed23b8d4f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:38:25 +0000 Subject: [PATCH 73/82] Update 4 files - /OpenAPI/TS28623_ManagementDataCollectionNrm.yaml - /OpenAPI/TS28623_MnSRegistryNrm.yaml - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 19 +++++++++---------- .../TS28623_ManagementDataCollectionNrm.yaml | 9 +++++++++ OpenAPI/TS28623_MnSRegistryNrm.yaml | 9 +++++++++ OpenAPI/TS28623_PmControlNrm.yaml | 13 +++++++++++++ 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5e6bcd5f3..d88217da3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -353,20 +353,14 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - ManagementDataCollection: - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple' NtfSubscriptionControl: $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' - MnsRegistry: - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single' Scheduler: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: @@ -381,8 +375,6 @@ components: properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - PerfMetricJob: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' TraceJob: @@ -563,6 +555,12 @@ components: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/SubNetwork-Attr' - $ref: '#/components/schemas/SubNetwork-ncO' + - $ref: '#/components/schemas/SubNetwork-Multiple' + - $ref: '#/components/schemas/ManagedElement-Multiple' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' + - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' @@ -573,19 +571,20 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' + ManagedElement-Single: allOf: - $ref: '#/components/schemas/Top' - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' + - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm' - - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' NrmRoot: oneOf: diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 185272364..63710ca79 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ManagementDataCollectionNrm: + type: object + properties: + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ManagementData: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 2877c918c..bb5d1a1a8 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -12,6 +12,15 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-MnSRegistryNrm: + type: object + properties: + MnsRegistry: + $ref: '#/components/schemas/MnsRegistry-Single' + + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..6db2ed41e 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + ManagedElement-PmControlNrm: + type: object + properties: + PerfMetricJob: + $ref: '#/components/schemas/PerfMetricJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- -- GitLab From 86f333f30acb386ecafb5a700f1415e5810a5d0d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 02:42:26 +0000 Subject: [PATCH 74/82] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index d88217da3..203dba6c8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -561,6 +561,7 @@ components: - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' + - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/SubNetwork-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/SubNetwork-ncO-AiMlNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/SubNetwork-ncO-IntentNrm' -- GitLab From 9c4804807069f4fbb2efa0c29510f2d7a2b204ae Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 May 2024 03:02:59 +0000 Subject: [PATCH 75/82] Update 5 files - /OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml - /OpenAPI/TS28623_SubscriptionControlNrm.yaml - /OpenAPI/TS28623_ThresholdMonitorNrm.yaml - /OpenAPI/TS28623_TraceControlNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 30 ++++++++----------- .../TS28623_QoEMeasurementCollectionNrm.yaml | 14 +++++++++ OpenAPI/TS28623_SubscriptionControlNrm.yaml | 13 ++++++++ OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 13 ++++++++ OpenAPI/TS28623_TraceControlNrm.yaml | 13 ++++++++ 5 files changed, 65 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 203dba6c8..0772245fe 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -353,12 +353,6 @@ components: $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' Scheduler: @@ -367,20 +361,13 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: MnsAgent: $ref: '#/components/schemas/MnsAgent-Multiple' - ThresholdMonitor: - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - TraceJob: - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' - NtfSubscriptionControl: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmList-Single' Scheduler: @@ -389,8 +376,7 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' - QMCJobs: - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/QMCJob-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- @@ -558,7 +544,11 @@ components: - $ref: '#/components/schemas/SubNetwork-Multiple' - $ref: '#/components/schemas/ManagedElement-Multiple' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/SubNetwork-ncO-FileManagementNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/SubNetwork-ncO-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/SubNetwork-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/SubNetwork-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-ManagementDataCollectionNrm' - $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' - $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/SubNetwork-ncO-MnSRegistryNrm' @@ -580,7 +570,11 @@ components: - $ref: '#/components/schemas/ManagedElement-Attr' - $ref: '#/components/schemas/ManagedElement-ncO' - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/ManagedElement-ncO-FileManagementNrm' - - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/ManagedElement-PmControlNrm' + - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/ManagedElement-ncO-SubscriptionControlNrm' + - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ManagedElement-ncO-ThresholdMonitorNrm' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/SubNetwork-ncO-TraceControlNrm' + - $ref: 'TS28623_QoEMeasurementCollectionNrm.yaml#/components/schemas/ManagedElement-ncO-QoEMeasurementCollectionNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/ManagedElement-ncO-MdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/ManagedElement-ncO-AiMlNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/ManagedElement-ncO-CoslaNrm' diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index 0ec934f55..82c7939c3 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -12,6 +12,20 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO-QoEMeasurementCollectionNrm: + type: object + properties: + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + #-------Definition of generic IOCs ----------# + + #-------- Definition of types----------------------------------------------------- #-------- Definition of concrete IOCs -------------------------------------------- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 5d4932626..4c283391b 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + ManagedElement-ncO-SubscriptionControlNrm: + type: object + properties: + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- Scope: type: object diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index d4fd1aac1..711ce416c 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + ManagedElement-ncO-ThresholdMonitorNrm: + type: object + properties: + ThresholdMonitor: + $ref: '#/components/schemas/ThresholdMonitor-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types----------------------------------------------------- ThresholdInfo: type: object diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 6c2532108..481035422 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -12,6 +12,19 @@ externalDocs: paths: {} components: schemas: + #-------- Definition of types for name-containments ------ + SubNetwork-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + ManagedElement-ncO-TraceControlNrm: + type: object + properties: + TraceJob: + $ref: '#/components/schemas/TraceJob-Multiple' + #-------Definition of generic IOCs ----------# + #-------- Definition of types used in Trace control NRM fragment------------------ jobType-Type: -- GitLab From b243f03ffc7e791cd4bdfbccc3a99683b410ddbe Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 16 May 2024 09:29:29 +0000 Subject: [PATCH 76/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15ab43bbc..06de6afde 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3430,6 +3430,8 @@ components: $ref: '#/components/schemas/CommModelList' ausfInfo: $ref: '#/components/schemas/AusfInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3462,6 +3464,8 @@ components: $ref: '#/components/schemas/ECSAddrConfigInfo' udmInfo: $ref: '#/components/schemas/UdmInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3496,6 +3500,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udrInfo: $ref: '#/components/schemas/UdrInfo' + hniList: + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: -- GitLab From 54eac0d48c62b9204e4bd4763553b7bf3e65c14b Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 12:57:00 +0000 Subject: [PATCH 77/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 06de6afde..da453951b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -215,6 +215,9 @@ components: ManagedNFProfile: type: object properties: + hniList: + type: array + items: string nfInstanceID: type: string nfType: @@ -3430,8 +3433,6 @@ components: $ref: '#/components/schemas/CommModelList' ausfInfo: $ref: '#/components/schemas/AusfInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3464,8 +3465,6 @@ components: $ref: '#/components/schemas/ECSAddrConfigInfo' udmInfo: $ref: '#/components/schemas/UdmInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3500,8 +3499,6 @@ components: $ref: '#/components/schemas/ManagedNFProfile' udrInfo: $ref: '#/components/schemas/UdrInfo' - hniList: - type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' UdsfFunction-Single: -- GitLab From 7a519f65124245d3387853e63c299d64c44c6b14 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 13:11:56 +0000 Subject: [PATCH 78/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index da453951b..7ce1bcf68 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -218,6 +218,7 @@ components: hniList: type: array items: string + type: string nfInstanceID: type: string nfType: -- GitLab From c30847b710fac45629bdf5cbd5e904b01f738165 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 29 May 2024 13:13:40 +0000 Subject: [PATCH 79/82] 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 7ce1bcf68..501a9d21e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -217,7 +217,7 @@ components: properties: hniList: type: array - items: string + items: type: string nfInstanceID: type: string -- GitLab From 2268492df160c91a6bd0f346a242ac4c160cf1ea Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 30 May 2024 03:10:42 +0000 Subject: [PATCH 80/82] Update TS28541_5GcNrm.yaml --- 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 501a9d21e..355d85fd8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -217,8 +217,8 @@ components: properties: hniList: type: array - items: - type: string + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' nfInstanceID: type: string nfType: -- GitLab From 18822e4980bb897d30c67cb1d2a9284705f7ad90 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 16 May 2024 08:15:29 +0000 Subject: [PATCH 81/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 355d85fd8..0177c413f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3265,7 +3265,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' + $ref: '#/components/schemas/SmfInfo' + SmfInfoList: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3330,7 +3332,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' + $ref: '#/components/schemas/UpfInfo' + upfInfoList: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3388,7 +3392,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' + $ref: '#/components/schemas/PcfInfo' + PcfInfoList: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -5192,6 +5198,8 @@ components: $ref: '#/components/schemas/CommModelList' bsfInfo: $ref: '#/components/schemas/BsfInfo' + bsfInfoList: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' -- GitLab From 06f3838981540f39416c89e72d01c5eb61ca8bc0 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Thu, 30 May 2024 02:18:11 +0000 Subject: [PATCH 82/82] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0177c413f..03c6dc225 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3265,9 +3265,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' SmfInfo: - $ref: '#/components/schemas/SmfInfo' - SmfInfoList: - $ref: '#/components/schemas/SmfInfo' + type: array + items: + $ref: '#/components/schemas/SmfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -3332,9 +3332,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' upfInfo: - $ref: '#/components/schemas/UpfInfo' - upfInfoList: - $ref: '#/components/schemas/UpfInfo' + type: array + items: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -3392,9 +3392,9 @@ components: supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' PcfInfo: - $ref: '#/components/schemas/PcfInfo' - PcfInfoList: - $ref: '#/components/schemas/PcfInfo' + type: array + items: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: @@ -5197,9 +5197,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' bsfInfo: - $ref: '#/components/schemas/BsfInfo' - bsfInfoList: - $ref: '#/components/schemas/BsfInfo' + type: array + items: + $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' -- GitLab