From e26ba2aa03673944c2bbf44d1cbc5fa112dcc99c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 11:27:09 +0000 Subject: [PATCH 1/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 537d212d6..6e41a58e0 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -243,6 +243,10 @@ components: type: integer dscp: type: integer + SnssaiList: + type: array + items: + $ref: '#/components/schemas/Snssai' PacketErrorRate: type: object @@ -540,7 +544,7 @@ components: weightFactor: $ref: '#/components/schemas/WeightFactor' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' amfSetRef: $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: @@ -591,7 +595,7 @@ components: amfSetId: $ref: '#/components/schemas/AmfSetId' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' aMFRegionRef: $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: @@ -613,7 +617,7 @@ components: amfRegionId: $ref: '#/components/schemas/AmfRegionId' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' aMFSetListRef: $ref: 'comDefs.yaml#/components/schemas/DnList' SmfFunction-Single: @@ -633,7 +637,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -682,7 +686,7 @@ components: nRTACList: $ref: '#/components/schemas/TACList' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -736,7 +740,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -777,7 +781,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -804,7 +808,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -833,7 +837,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' UdsfFunction-Single: @@ -851,7 +855,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' NrfFunction-Single: @@ -873,7 +877,7 @@ components: nFProfileList: $ref: '#/components/schemas/NFProfileList' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -898,7 +902,7 @@ components: nFProfileList: $ref: '#/components/schemas/NFProfileList' snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -971,7 +975,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -1019,7 +1023,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: @@ -1052,7 +1056,7 @@ components: sBIFqdn: type: string snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + $ref: '#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' capabilityList: -- GitLab From ee5c820f81635da226a7c56889cd10b0c86748e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 11:28:59 +0000 Subject: [PATCH 2/7] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index a850d5f91..cf520bde0 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -43,10 +43,6 @@ components: $ref: '#/components/schemas/Sst' sd: type: string - SnssaiList: - type: array - items: - $ref: '#/components/schemas/Snssai' Mnc: type: string -- GitLab From 7edee968a9e4bac45b51e85c0730efde4a7a8929 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 11:37:43 +0000 Subject: [PATCH 3/7] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 6e41a58e0..d086a6424 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -246,7 +246,7 @@ components: SnssaiList: type: array items: - $ref: '#/components/schemas/Snssai' + $ref: 'nrNrm.yaml#/components/schemas/Snssai' PacketErrorRate: type: object -- GitLab From 54eec9b77d3ec276f2c2aca3baa1d27792f12b25 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 25 Mar 2022 11:15:46 +0000 Subject: [PATCH 4/7] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index cf520bde0..1710001ee 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -242,11 +242,7 @@ components: - INITIAL - OTHER - SUL - QuotaType: - type: string - enum: - - STRICT - - FLOAT + IsESCoveredBy: type: string enum: @@ -1262,11 +1258,11 @@ components: esNotAllowedTimePeriod: $ref: "#/components/schemas/EsNotAllowedTimePeriod" interRatEsActivationOriginalCellParameters: - $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + $ref: "#/components/schemas/InterRatEsActivationOriginalCellParameters" interRatEsActivationCandidateCellParameters: - $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + $ref: "#/components/schemas/InterRatEsActivationCandidateCellParameters" interRatEsDeactivationCandidateCellParameters: - $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + $ref: "#/components/schemas/InterRatEsDeactivationCandidateCellParameters" isProbingCapable: type: string enum: -- GitLab From e7faff2eb555dc608e4424534f91afe34ef342e6 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 27 Mar 2022 08:19:38 +0000 Subject: [PATCH 5/7] align parameter names --- OpenAPI/genericNrm.yaml | 234 ++++++++++++++++++++-------------------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index d9a5eddc7..1413ee128 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -249,7 +249,7 @@ components: #-------- Definition of types used in Trace control NRM fragment------------------ - tjJobType-Type: + jobType-Type: type: string description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details. enum: @@ -261,7 +261,7 @@ components: - RCEF_REPORT_ONLY - LOGGED_MBSFN_MDT - tjListOfInterfaces-Type: + listOfInterfaces-Type: description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. type: object properties: @@ -593,7 +593,7 @@ components: enum: - F1-C - tjListOfNeTypes-Type: + listOfNeTypes-Type: description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details. type: array items: @@ -622,7 +622,7 @@ components: - HSS - UDM - tjPLMNTarget-Type: + plmnTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: @@ -634,7 +634,7 @@ components: - mcc - mnc - tjTraceDepth-Type: + 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 enum: @@ -645,7 +645,7 @@ components: - VENDORMEDIUM - VENDORMAXIMUM - tjTraceReference-Type: + traceReference-Type: type: object description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. properties: @@ -660,14 +660,14 @@ components: - mnc - traceId - tjTraceReportingFormat-Type: + traceReportingFormat-Type: type: string description: Specifies whether file-based or streaming reporting shall be used for this Trace Session. See 3GPP TS 32.422 clause 5.11 for additional details. enum: - FILE-BASED - STREAMING - tjTraceTarget-Type: + traceTarget-Type: type: object description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 properties: @@ -691,7 +691,7 @@ components: - TargetIdType - TargetIdValue - tjTriggeringEvent-Type: + triggeringEvents-Type: type: object description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. properties: @@ -722,14 +722,14 @@ components: - NetworkElement - EventBitmap - tjMDTAnonymizationOfData-Type: + anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. type: string enum: - NO_IDENTITY - TAC_OF_IMEI - tjMDTCollectionPeriodRrmLte-Type: + collectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -744,7 +744,7 @@ components: - 10240ms - 60000ms - tjMDTCollectionPeriodM6Lte-Type: + collectionPeriodM6Lte-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -753,13 +753,13 @@ components: - 5120ms - 10240ms - tjMDTCollectionPeriodM7Lte-Type: + collectionPeriodM7Lte-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - tjMDTCollectionPeriodRrmUmts-Type: + collectionPeriodRrmUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -772,7 +772,7 @@ components: - 4000ms - 6000ms - tjMDTCollectionPeriodRrmNR-Type: + collectionPeriodRrmNr-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -782,7 +782,7 @@ components: - 10240ms - 60000ms - tjMDTCollectionPeriodM6NR-Type: + collectionPeriodM6Nr-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -801,20 +801,20 @@ components: - 12min - 30min - tjMDTCollectionPeriodM7NR-Type: + collectionPeriodM7Nr-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 maximum: 60 - tjMDTEventListForTriggeredMeasurement-Type: + eventListForEventTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string enum: - OUT_OF_COVERAGE - A2_EVENT - tjMDTEventThreshold-Type: + eventThreshold-Type: description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. type: object properties: @@ -854,7 +854,7 @@ components: minimum: -120 maximum: 25 - tjMDTListOfMeasurements-Type: + listOfMeasurements-Type: description: See details in 3GPP TS 32.422 clause 5.10.3 for details. type: object properties: @@ -903,7 +903,7 @@ components: - M8 - M9 - tjMDTLoggingDuration-Type: + loggingDuration-Type: description: See details in 3GPP TS 32.422 clause 5.10.9. type: string enum: @@ -914,7 +914,7 @@ components: - 5400s - 7200s - tjMDTLoggingInterval-Type: + loggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. type: object properties: @@ -961,7 +961,7 @@ components: - 61.44s - INFINITY - tjMDTLoggingEventThreshold-Type: + eventThresholdL1-Type: description: See details in 3GPP TS 32.422 clause 5.10.X. type: object properties: @@ -974,13 +974,13 @@ components: minimum: 0 maximum: 127 - tjMDTLoggingHysteresis-Type: + hysteresisL1-Type: description: See details in 3GPP TS 32.422 clause 5.10.Y. type: integer minimum: 0 maximum: 30 - tjMDTLoggingTimeToTrigger-Type: + timeToTriggerL1-Type: description: See details in 3GPP TS 32.422 clause 5.10.Z. type: string enum: @@ -1001,7 +1001,7 @@ components: - 2560ms - 5120ms - tjMDTMeasurementPeriodLTE-Type: + measurementPeriodLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -1011,7 +1011,7 @@ components: - 10240ms - 1min - tjMDTMeasurementPeriodUMTS-Type: + measurementPeriodUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -1029,7 +1029,7 @@ components: - 32000ms - 64000ms - tjMDTMeasurementQuantity-Type: + measurementQuantity-Type: description: See details in 3GPP TS 32.422 clause 5.10.15. type: string enum: @@ -1037,13 +1037,13 @@ components: - CPICH_RSCP - PathLoss - tjMDTM4ThresholdUmts-Type: + eventThresholdUphUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. type: integer minimum: 0 maximum: 31 - tjMDTPLMNList-Type: + plmnList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: @@ -1058,14 +1058,14 @@ components: - mnc maxItems: 16 - tjMDTPositioningMethod-Type: + positioningMethod-Type: description: See details in 3GPP TS 32.422 clause 5.10.19. type: string enum: - GNSS - E-CELL_ID - tjMDTReportAmount-Type: + reportAmount-Type: description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: @@ -1078,7 +1078,7 @@ components: - 64 - INFINITY - tjMDTReportingTrigger-Type: + reportingTrigger-Type: description: See details in 3GPP TS 32.422 clause 5.10.4. type: array items: @@ -1092,7 +1092,7 @@ components: - ALL_CONFIGURED_RRM_FOR_LTE_NR - ALL_CONFIGURED_RRM_FOR_UMTS - tjMDTReportInterval-Type: + reportInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.5. type: object properties: @@ -1154,14 +1154,14 @@ components: - 720000ms - 1800000ms - tjMDTReportType-Type: + reportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. type: string enum: - PERIODICAL - EVENT_TRIGGERED - tjMDTSensorInformation-Type: + sensorInformation-Type: description: See details in 3GPP TS 32.422 clause 5.10.29. type: array items: @@ -1171,7 +1171,7 @@ components: - UE_SPEED - UE_ORIENTATION - tjMDTTraceCollectionEntityID-Type: + traceCollectionEntityId-Type: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. type: integer @@ -1333,96 +1333,96 @@ components: type: object description: abstract class used as a container of all TraceJob attributes properties: - tjJobType: - $ref: '#/components/schemas/tjJobType-Type' - tjListOfInterfaces: - $ref: '#/components/schemas/tjListOfInterfaces-Type' - tjListOfNeTypes: - $ref: '#/components/schemas/tjListOfNeTypes-Type' - tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTarget-Type' - tjStreamingTraceConsumerURI: + jobType: + $ref: '#/components/schemas/jobType-Type' + listOfInterfaces: + $ref: '#/components/schemas/listOfInterfaces-Type' + listOfNeTypes: + $ref: '#/components/schemas/listOfNeTypes-Type' + plmnTarget: + $ref: '#/components/schemas/plmnTarget-Type' + traceReportingConsumerUri: $ref: 'comDefs.yaml#/components/schemas/Uri' - tjTraceCollectionEntityAddress: + traceCollectionEntityIpAddress: $ref: '#/components/schemas/IpAddr' - tjTraceDepth: - $ref: '#/components/schemas/tjTraceDepth-Type' - tjTraceReference: - $ref: '#/components/schemas/tjTraceReference-Type' - tjTraceRecordSessionReference: + traceDepth: + $ref: '#/components/schemas/traceDepth-Type' + traceReference: + $ref: '#/components/schemas/traceReference-Type' + traceRecordingSessionReference: type: string - tjTraceReportingFormat: - $ref: '#/components/schemas/tjTraceReportingFormat-Type' - tjTraceTarget: - $ref: '#/components/schemas/tjTraceTarget-Type' - tjTriggeringEvent: - $ref: '#/components/schemas/tjTriggeringEvent-Type' - tjMDTAnonymizationOfData: - $ref: '#/components/schemas/tjMDTAnonymizationOfData-Type' - tjMDTAreaConfigurationForNeighCell: + traceReportingFormat: + $ref: '#/components/schemas/traceReportingFormat-Type' + traceTarget: + $ref: '#/components/schemas/traceTarget-Type' + triggeringEvent: + $ref: '#/components/schemas/triggeringEvent-Type' + anonymizationOfMdtData: + $ref: '#/components/schemas/anonymizationOfMdtData-Type' + areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' - tjMDTAreaScope: + areaScope: type: array items: $ref: '#/components/schemas/AreaScope' - tjMDTCollectionPeriodRrmLte: - $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' - tjMDTCollectionPeriodM6Lte: - $ref: '#/components/schemas/tjMDTCollectionPeriodM6Lte-Type' - tjMDTCollectionPeriodM7Lte: - $ref: '#/components/schemas/tjMDTCollectionPeriodM7Lte-Type' - tjMDTCollectionPeriodRrmUmts: - $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type' - tjMDTCollectionPeriodRrmNR: - $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type' - tjMDTCollectionPeriodM6NR: - $ref: '#/components/schemas/tjMDTCollectionPeriodM6NR-Type' - tjMDTCollectionPeriodM7NR: - $ref: '#/components/schemas/tjMDTCollectionPeriodM7NR-Type' - tjMDTEventListForTriggeredMeasurement: - $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type' - tjMDTEventThreshold: - $ref: '#/components/schemas/tjMDTEventThreshold-Type' - tjMDTListOfMeasurements: - $ref: '#/components/schemas/tjMDTListOfMeasurements-Type' - tjMDTLoggingDuration: - $ref: '#/components/schemas/tjMDTLoggingDuration-Type' - tjMDTLoggingInterval: - $ref: '#/components/schemas/tjMDTLoggingInterval-Type' - tjMDTLoggingEventThreshold: - $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' - tjMDTLoggingHysteresis: - $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' - tjMDTLoggingTimeToTrigger: - $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' - tjMDTMBSFNAreaList: + collectionPeriodRrmLte: + $ref: '#/components/schemas/collectionPeriodRrmLte-Type' + collectionPeriodM6Lte: + $ref: '#/components/schemas/collectionPeriodM6Lte-Type' + collectionPeriodM7Lte: + $ref: '#/components/schemas/collectionPeriodM7Lte-Type' + collectionPeriodRrmUmts: + $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' + collectionPeriodRrmNr: + $ref: '#/components/schemas/collectionPeriodRrmNr-Type' + collectionPeriodM6Nr: + $ref: '#/components/schemas/collectionPeriodM6Nr-Type' + collectionPeriodM7Nr: + $ref: '#/components/schemas/collectionPeriodM7Nr-Type' + eventListForEventTriggeredMeasurement: + $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' + eventThreshold: + $ref: '#/components/schemas/eventThreshold-Type' + listOfMeasurements: + $ref: '#/components/schemas/listOfMeasurements-Type' + loggingDuration: + $ref: '#/components/schemas/loggingDuration-Type' + loggingInterval: + $ref: '#/components/schemas/loggingInterval-Type' + eventThresholdL1: + $ref: '#/components/schemas/eventThresholdL1-Type' + hysteresisL1: + $ref: '#/components/schemas/hysteresisL1-Type' + timeToTriggerL1: + $ref: '#/components/schemas/timeToTriggerL1-Type' + mbsfnAreaList: type: array items: $ref: '#/components/schemas/MbsfnArea' - tjMDTMeasurementPeriodLTE: - $ref: '#/components/schemas/tjMDTMeasurementPeriodLTE-Type' - tjMDTMeasurementPeriodUMTS: - $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' - tjMDTMeasurementQuantity: - $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' - tjMDTM4ThresholdUmts: - $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' - tjMDTPLMNList: - $ref: '#/components/schemas/tjMDTPLMNList-Type' - tjMDTPositioningMethod: - $ref: '#/components/schemas/tjMDTPositioningMethod-Type' - tjMDTReportAmount: - $ref: '#/components/schemas/tjMDTReportAmount-Type' - tjMDTReportingTrigger: - $ref: '#/components/schemas/tjMDTReportingTrigger-Type' - tjMDTReportInterval: - $ref: '#/components/schemas/tjMDTReportInterval-Type' - tjMDTReportType: - $ref: '#/components/schemas/tjMDTReportType-Type' - tjMDTSensorInformation: - $ref: '#/components/schemas/tjMDTSensorInformation-Type' - tjMDTTraceCollectionEntityID: - $ref: '#/components/schemas/tjMDTTraceCollectionEntityID-Type' + measurementPeriodLte: + $ref: '#/components/schemas/measurementPeriodLte-Type' + measurementPeriodUmts: + $ref: '#/components/schemas/measurementPeriodUmts-Type' + measurementQuantity: + $ref: '#/components/schemas/measurementQuantity-Type' + eventThresholdUphUmts: + $ref: '#/components/schemas/eventThresholdUphUmts-Type' + plmnList: + $ref: '#/components/schemas/plmnList-Type' + positioningMethod: + $ref: '#/components/schemas/positioningMethod-Type' + reportAmount: + $ref: '#/components/schemas/reportAmount-Type' + reportingTrigger: + $ref: '#/components/schemas/reportingTrigger-Type' + reportInterval: + $ref: '#/components/schemas/reportInterval-Type' + reportType: + $ref: '#/components/schemas/reportType-Type' + sensorInformation: + $ref: '#/components/schemas/sensorInformation-Type' + traceCollectionEntityId: + $ref: '#/components/schemas/traceCollectionEntityId-Type' ManagedFunction-ncO: type: object -- GitLab From 5f92dab939d779f3a6f2764ddbc109d64c058739 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 27 Mar 2022 08:23:03 +0000 Subject: [PATCH 6/7] correct triggeringEvent to triggeringEvents --- OpenAPI/genericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 1413ee128..52587f016 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1355,8 +1355,8 @@ components: $ref: '#/components/schemas/traceReportingFormat-Type' traceTarget: $ref: '#/components/schemas/traceTarget-Type' - triggeringEvent: - $ref: '#/components/schemas/triggeringEvent-Type' + triggeringEvents: + $ref: '#/components/schemas/triggeringEvents-Type' anonymizationOfMdtData: $ref: '#/components/schemas/anonymizationOfMdtData-Type' areaConfigurationForNeighCell: -- GitLab From 7649c809005f1686b32241c2589b2efc23e28584 Mon Sep 17 00:00:00 2001 From: allwang Date: Sun, 27 Mar 2022 08:30:02 +0000 Subject: [PATCH 7/7] enum triggeringEvents --- OpenAPI/genericNrm.yaml | 179 ++++++++++++++++++++++++++++++++++------ 1 file changed, 153 insertions(+), 26 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 52587f016..464b69f1b 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -695,32 +695,159 @@ components: type: object description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. properties: - NetworkElement: - type: string - enum: - - MSC_SERVER - - SGSN - - MGW - - GGSN - - BM_SC - - MME - - SGW - - PGW - - AMF - - SMF - - PCF - - UPF - - AUSF - - NEF - - NRF - - NSSF - - SMSF - - UDM - EventBitmap: - type: integer - required: - - NetworkElement - - EventBitmap + MSC_SERVER: + type: array + items: + type: string + enum: + - MO_MT_CALLS + - MO_MT_SMS + - LU_IMSIattach_IMSIdetach + - HANDOVER + - SS + SGSN: + type: array + items: + type: string + enum: + - PDPcontext + - MO_MT_SMS + - RAU_GPRSattach_GPRSdetach + - MBMScontext + MGW: + type: array + items: + type: string + enum: + - CONTEXT + GGSN: + type: array + items: + type: string + enum: + - PDPcontext + - MBMScontext + IMS: + type: array + items: + type: string + enum: + - SIPsession_StandaloneTransaction + BM_SC: + type: array + items: + type: string + enum: + - MBMSactivation + MME: + type: array + items: + type: string + enum: + - UEinitiatedPDNconnectivityRequest + - ServiceRequest + - InitialAttach_TAU_Detach + - UEinitiatedPDNdisconnection + - BearerActivationModificationDeletion + - Handover + SGW: + type: array + items: + type: string + enum: + - PDNconnectionCreation + - PDNconnectionTermination + - BearerActivationModificationDeletion + PGW: + type: array + items: + type: string + enum: + - PDNconnectionCreation + - PDNconnectionTermination + - BearerActivationModificationDeletion + AMF: + type: array + items: + type: string + enum: + - Registration + - ServiceRequest + - Handover + - UEderegistration + - NetworkDeregistration + - UEMobilityFromEPC + - UEMobilityToEPC + SMF: + type: array + items: + type: string + enum: + - PDUsessionEstablishment + - PDUsessionModification + - PDUsessionRelease + - PDUsessionUPactivationDeactivation + - MobilityBtw3gppAndN3gppTo5GC + - MobilityFromEpc + PCF: + type: array + items: + type: string + enum: + - AMpolicy + - SMpolicy + - Authorization + - BDTpolicy + UPF: + type: array + items: + type: string + enum: + - N4Session + AUSF: + type: array + items: + type: string + enum: + - UEauthentication + NEF: + type: array + items: + type: string + enum: + - EventExposure + - PFDmanagement + - ParameterProvision + - Trigger + NRF: + type: array + items: + type: string + enum: + - NFmanagement + - NFdiscovery + NSSF: + type: array + items: + type: string + enum: + - NSSelection + - NSSAI + SMSF: + type: array + items: + type: string + enum: + - SMservice + UDM: + type: array + items: + type: string + enum: + - UEcontext + - SubscriberData + - UEauthentication + - EventExposure anonymizationOfMdtData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. -- GitLab