diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index b74804c5e46cb48357410b41d6c2c9612b4ecbae..0250ccdd0da1e321c735747b06870c4c24c94a27 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,11 +43,9 @@ components: filterValue: type: string threshold: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/AnalyticsSchedule' timeOut: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' @@ -61,7 +59,7 @@ components: ReportingTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - AnalyticsScope: + AnalyticsScopeType: oneOf: - type: object properties: @@ -70,32 +68,43 @@ components: - type: object properties: areaScope: - $ref: '#/components/schemas/GeoAreaList' - - GeoAreaList: - type: array - items: - $ref: '#/components/schemas/GeoArea' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - GeoArea: - type: object - properties: - coordinates: - type: array - items: - $ref: '#/components/schemas/Coordinate' - altitude: - type: number - format: float + AnalyticsSchedule: + oneOf: + - type: object + properties: + timeDurations: + type: array + items: + $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + - type: object + properties: + granularityPeriod: + type: integer - Coordinate: + ThresholdInfo: type: object properties: - latitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' - longitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude' - + monitoredMDAOutputIE: + type: string + thresholdDirection: + type: string + enum: + - UP + - DOWN + - UP_AND_DOWN + thresholdValue: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + hysteresis: + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 #-------- Definition of abstract IOCs -------------------------------------------- @@ -170,7 +179,7 @@ components: reportingTarget: $ref: '#/components/schemas/ReportingTarget' analyticsScope: - $ref: '#/components/schemas/AnalyticsScope' + $ref: '#/components/schemas/AnalyticsScopeType' startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' stopTime: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 3f8dcf23709d25f1601bf93a9c3335d48d8ebf04..8e0f871b2d39421f11a364c2798b9abc14ccb268 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,9 +43,9 @@ components: TimeWindow: type: object properties: - startTime: + mDAOutputStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: + mDAOutputEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index a4afbb61980a9559233a8694183f95ddd92ff75f..77b62f5305477d6532f74ea3e3945cd49b3983be 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 17.0.0 + version: 17.3.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,26 +15,34 @@ components: #-------- Definition of types----------------------------------------------------- - AIMLEntityList: + MLEntityList: type: array items: - $ref: '#/components/schemas/AIMLEntity' + $ref: '#/components/schemas/MLEntity' - AIMLEntity: + MLEntity: type: object properties: - aIMLEntityId: + mLEntityId: type: string inferenceType: type: string - aIMLEntityVersion: + mLEntityVersion: type: string expectedRunTimeContext: - type: string + $ref: '#/components/schemas/MLContext' trainingContext: - type: string + $ref: '#/components/schemas/MLContext' runTimeContext: - type: string + $ref: '#/components/schemas/MLContext' + + MLContext: + type: object + properties: + inferenceEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + dataProviderRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' RequestStatus: type: string @@ -66,10 +74,10 @@ components: TrainingProcessMonitor: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess". + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess". type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string status: type: string @@ -112,8 +120,8 @@ components: $ref: '#/components/schemas/SubNetwork-Multiple' ManagedElement: $ref: '#/components/schemas/ManagedElement-Multiple' - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' ManagedElement-Single: allOf: @@ -125,10 +133,10 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - type: object properties: - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' - AIMLTrainingFunction-Single: + MLTrainingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -138,19 +146,19 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - aIMLEntityList: - $ref: '#/components/schemas/AIMLEntityList' + mLEntityList: + $ref: '#/components/schemas/MLEntityList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - AIMLTrainingRequest: - $ref: '#/components/schemas/AIMLTrainingRequest-Multiple' - AIMLTrainingProcess: - $ref: '#/components/schemas/AIMLTrainingProcess-Multiple' - AIMLTrainingReport: - $ref: '#/components/schemas/AIMLTrainingReport-Multiple' + MLTrainingRequest: + $ref: '#/components/schemas/MLTrainingRequest-Multiple' + MLTrainingProcess: + $ref: '#/components/schemas/MLTrainingProcess-Multiple' + MLTrainingReport: + $ref: '#/components/schemas/MLTrainingReport-Multiple' - AIMLTrainingRequest-Single: + MLTrainingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -159,21 +167,21 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string - candidateTraingDataSource: + candidateTrainingDataSource: type: array items: type: string - traingDataQualityScore: + trainingDataQualityScore: type: number format: float trainingRequestSource: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/MLContext' performanceRequirements: $ref: '#/components/schemas/PerformanceRequirements' cancelRequest: @@ -181,7 +189,7 @@ components: suspendRequest: type: boolean - AIMLTrainingProcess-Single: + MLTrainingProcess-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -190,7 +198,7 @@ components: allOf: - type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string priority: type: integer @@ -208,7 +216,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - AIMLTrainingReport-Single: + MLTrainingReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -217,7 +225,7 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string areConsumerTrainingDataUsed: type: boolean @@ -233,7 +241,14 @@ components: $ref: '#/components/schemas/ModelPerformance' areNewTrainingDataUsed: type: boolean - + trainingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + trainingProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trainingReportRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + lastTrainingRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -245,22 +260,22 @@ components: type: array items: $ref: '#/components/schemas/ManagedElement-Single' - AIMLTrainingFunction-Multiple: + MLTrainingFunction-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - AIMLTrainingRequest-Multiple: + $ref: '#/components/schemas/MLTrainingFunction-Single' + MLTrainingRequest-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - AIMLTrainingProcess-Multiple: + $ref: '#/components/schemas/MLTrainingRequest-Single' + MLTrainingProcess-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - AIMLTrainingReport-Multiple: + $ref: '#/components/schemas/MLTrainingProcess-Single' + MLTrainingReport-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingReport-Single' + $ref: '#/components/schemas/MLTrainingReport-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -270,7 +285,7 @@ components: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - - $ref: '#/components/schemas/AIMLTrainingReport-Single' + - $ref: '#/components/schemas/MLTrainingFunction-Single' + - $ref: '#/components/schemas/MLTrainingRequest-Single' + - $ref: '#/components/schemas/MLTrainingProcess-Single' + - $ref: '#/components/schemas/MLTrainingReport-Single' diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 54a5bc02897db7b099b1c00c21218af54a66fe62..a9fb33655fe972207551e75300cbe3b1d85b5f18 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 17.0.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,23 @@ externalDocs: paths: {} components: schemas: + + #-------Definition of concrete IOCs ----------# + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + Intent: + $ref: '#/components/schemas/Intent-Multiple' Intent-Single: allOf: @@ -23,14 +40,23 @@ components: intentExpectations: type: array items: - $ref: "#/components/schemas/IntentExpectation" + type: object + oneOf: + - $ref: "#/components/schemas/IntentExpectation" + - $ref: "#/components/schemas/RadioNetworkExpectation" + - $ref: "#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of concrete IOCs ----------# + + #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: + description: >- + This data type is the "IntentExpectation" data type without specialisations type: object properties: expectationId: @@ -50,15 +76,88 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - + $ref: "#/components/schemas/FulfilmentInfo" + RadioNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + $ref: "#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + ServiceSupportExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/DLThptPerUETarget" + - $ref: "#/components/schemas/ULThptPerUETarget" + - $ref: "#/components/schemas/DLLatencyTarget" + - $ref: "#/components/schemas/ULLatencyTarget" + - $ref: "#/components/schemas/MaxNumberofUEsTarget" + - $ref: "#/components/schemas/ActivityFactorTarget" + - $ref: "#/components/schemas/UESpeedTarget" + - $ref: "#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/ServiceStartTimeContext" + - $ref: "#/components/schemas/ServiceEndTimeContext" + - $ref: "#/components/schemas/UEMobilityLevelContext" + - $ref: "#/components/schemas/ResourceSharingLevelContext" + - $ref: "#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of the IntentExpectation dataType ----------# + + #-------Definition of the ExpectationObject dataType ----------# ExpectationObject: + description: >- + This data type is the "ExpectationObject" data type without specialisations type: object properties: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: @@ -66,84 +165,69 @@ components: objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" - - ExpectationTarget: - oneOf: - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - - - ObjectContext: - oneOf: - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - - - ExpectationContext: - oneOf: - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - IntentContext: + $ref: "#/components/schemas/ObjectContext" + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation type: object properties: - contextAttribute: + objectType: type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: type: array items: - type: number + type: object + oneOf: + - $ref: "#/components/schemas/CoverageAreaPolygonContext" + - $ref: "#/components/schemas/CoverageTACContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/NRFqBandContext" + - $ref: "#/components/schemas/RATContext" + - $ref: "#/components/schemas/ObjectContext" + ServiceSupportExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + type: object + properties: + objectType: + type: string + enum: + - Service_Support #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" + - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/CoverageAreaTAContext" + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + + #-------Definition of the generic dataType --------------# Condition: type: string enum: - - Is_equal_to - - Is_less_than - - Is_greater_than - - Is_within_the_range - + - IS_EQUAL_TO + - IS_LESS_THAN + - IS_GREATER_THAN + - IS_WITHIN_RANGE + - IS_OUTSIDE_RANGE + - IS_ONE_OF + - IS_NOT_ONE_OF + - IS_EQUAL_TO_OR_LESS_THAN + - IS_EQUAL_TO_OR_GREATER_THAN FulfilStatus: type: string enum: - FULFILLED - NOT_FULFILLED - NotFulfilledState: type: string enum: @@ -153,7 +237,6 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED - FulfilmentInfo: type: object properties: @@ -167,15 +250,59 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string - ExpectationVerb: type: string enum: - DELIVER - ENSURE + #-------Definition of the generic dataType --------------# - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the IntentContext dataType --------------# + IntentContext: + description: >- + This data type is the "IntentContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + #-------Definition of the IntentContext dataType --------------# + + #-------Definition of the ExpectationTarget dataType----------# + ExpectationTarget: + description: >- + This data type is the "ExpectationTarget" data type without specialisations + type: object + properties: + targetName: + type: string + targetCondition: + $ref: "#/components/schemas/Condition" + targetValueRange: + type: number + targetContexts: + type: array + items: + $ref: "#/components/schemas/TargetContext" + TargetContext: + description: >- + This data type is the "TargetContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: number WeakRSRPRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget type: object properties: targetName: @@ -185,7 +312,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -194,8 +321,9 @@ components: $ref: "#/components/schemas/WeakRSRPContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - WeakRSRPContext: + description: >- + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext type: object properties: contextAttribute: @@ -205,11 +333,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number - LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget type: object properties: targetName: @@ -219,7 +348,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -228,8 +357,9 @@ components: $ref: "#/components/schemas/LowSINRContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowSINRContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowSINRContext type: object properties: contextAttribute: @@ -239,11 +369,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: integer - AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget type: object properties: targetName: @@ -253,13 +384,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - IS_GREATER_THAN targetValueRange: type: integer targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - AveDLRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget type: object properties: targetName: @@ -269,13 +401,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - IS_GREATER_THAN targetValueRange: type: integer targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget type: object properties: targetName: @@ -285,7 +418,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -294,8 +427,9 @@ components: $ref: "#/components/schemas/LowULRANUEThptContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext type: object properties: contextAttribute: @@ -308,8 +442,9 @@ components: - Is_less_than contextValueRange: type: number - LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget type: object properties: targetName: @@ -319,7 +454,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -328,8 +463,9 @@ components: $ref: "#/components/schemas/LowDLRANUEThptContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowDLRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext type: object properties: contextAttribute: @@ -339,10 +475,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget type: object properties: targetName: @@ -352,10 +490,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - IS_GREATER_THAN targetValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" ULThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget type: object properties: targetName: @@ -365,10 +505,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - IS_GREATER_THAN targetValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" DLLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget type: object properties: targetName: @@ -378,10 +520,12 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget type: object properties: targetName: @@ -391,53 +535,73 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget type: object properties: - targetAttribute: + targetName: type: string enum: - maxNumberofUEs targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget type: object properties: - targetAttribute: + targetName: type: string enum: - activityFactor targetCondition: type: string enum: - - Is_equal _than + - IS_EQUAL_TO targetValueRange: type: integer UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget type: object properties: - targetAttribute: + targetName: type: string enum: - uESpeed targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the concrete ObjectTarget dataType----------------# + ObjectContext: + description: >- + This data type is the "ObjectContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number CoverageAreaPolygonContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext type: object properties: contextAttribute: @@ -447,7 +611,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -455,6 +619,8 @@ components: CoverageArea: type: string CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext type: object properties: contextAttribute: @@ -464,13 +630,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" - PLMNContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for PLMNContext type: object properties: contextAttribute: @@ -480,13 +647,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId" - + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" NRFqBandContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NRFqBandContext type: object properties: contextAttribute: @@ -496,13 +664,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: type: string - RATContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for RATContext type: object properties: contextAttribute: @@ -512,7 +681,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -522,6 +691,8 @@ components: - EUTRAN - NR EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext type: object properties: contextAttribute: @@ -531,12 +702,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: array items: type: string EdgeIdenfiticationLocContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext type: object properties: contextAttribute: @@ -546,12 +719,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: array items: type: string CoverageAreaTAContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext type: object properties: contextAttribute: @@ -561,17 +736,32 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: $ref: "#/components/schemas/CoverageAreaTAList" CoverageAreaTAList: type: integer - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the concrete ExpectionContext dataType----------------# + ExpectationContext: + description: >- + This data type is the "ExpectationContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext type: object properties: contextAttribute: @@ -581,10 +771,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext type: object properties: contextAttribute: @@ -594,10 +786,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext type: object properties: contextAttribute: @@ -607,12 +801,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" ResourceSharingLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext type: object properties: contextAttribute: @@ -622,7 +818,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -631,6 +827,11 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' Intent-Multiple: type: array @@ -641,5 +842,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index ff66bf0043095d1d57465068342558bba5b52b88..62d44a536f1a003bed4be8186f5229b57a478faf 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -546,9 +546,7 @@ components: observedMeasurement: type: string observedValue: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + type: number thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index fbe3805380da9e9edab64088d822f2ef87b1d197..959349fdcad51794a629f4c659484aa7c64802fd 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 17.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -237,6 +237,14 @@ paths: application/json: schema: $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-hierarchical+json: + schema: + $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-flat+json: + schema: + type: array + items: + $ref: '#/components/schemas/Resource' default: description: Error case. content: @@ -269,12 +277,12 @@ paths: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' application/3gpp-json-patch+json: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' responses: '200': description: >- @@ -301,52 +309,16 @@ paths: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' delete: - summary: Deletes one or multiple resources + summary: Deletes one resource description: >- - With HTTP DELETE resources are deleted. The resources to be deleted are + With HTTP DELETE one resource is deleted. The resources to be deleted is identified with the target URI. - parameters: - - name: scope - in: query - description: >- - This parameter extends the set of targeted resources beyond the base - resource identified with the path component of the URI. No scoping - mechanism is specified in the present document. - required: false - schema: - $ref: '#/components/schemas/Scope' - style: form - explode: true - - name: filter - in: query - description: >- - This parameter reduces the targeted set of resources by applying a - filter to the scoped set of resource representations. Only resources - representations for which the filter construct evaluates to "true" - are returned. No filter language is specified in the present - document. - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' responses: '200': description: >- Success case ("200 OK"). - This status code shall be returned, when query parameters are present in - the request and one or multiple resources are deleted. - The URIs of the deleted resources are returned in the response message body. - '204': - description: >- - Success case ("204 No Content"). - This status code shall be returned, when no query parameters are present in - the request and only one resource is deleted. - The message body is empty. - content: - application/json: - schema: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + This status code is returned, when the resource has been successfully deleted. + The response body is empty. default: description: Error case. content: @@ -355,18 +327,6 @@ paths: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - CorrelatedNotification: - type: object - properties: - source: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationIds: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - required: - - source - - notificationIds CmNotificationTypes: type: string enum: @@ -381,27 +341,33 @@ components: - MANAGEMENT_OPERATION - SON_OPERATION - UNKNOWN + ScopeType: + type: string + enum: + - BASE_ONLY + - BASE_NTH_LEVEL + - BASE_SUBTREE + - BASE_ALL Operation: type: string enum: - add - remove - replace - ScopeType: + Insert: type: string enum: - - BASE_ONLY - - BASE_NTH_LEVEL - - BASE_SUBTREE - - BASE_ALL - Scope: - type: object - properties: - scopeType: - $ref: '#/components/schemas/ScopeType' - scopeLevel: - type: integer - + - before + - after + PatchOperation: + type: string + enum: + - add + - replace + - remove + - copy + - move + - test Resource: oneOf: @@ -426,8 +392,29 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + Scope: + type: object + properties: + scopeType: + $ref: '#/components/schemas/ScopeType' + scopeLevel: + type: integer + CorrelatedNotification: + type: object + properties: + source: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + notificationIds: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds MoiChange: type: object properties: @@ -445,13 +432,14 @@ components: $ref: '#/components/schemas/Operation' path: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + insert: + $ref: '#/components/schemas/Insert' value: {} oldValue: {} required: - notificationId - op - path - NotifyMoiCreation: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -510,3 +498,13 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + PatchItem: + type: object + properties: + op: + $ref: '#/components/schemas/PatchOperation' + from: + type: string + path: + type: string + value: {} diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 91f638a442dcc070513367450936beea0b067874..75dc8c0d16f9a4495c21b57eecb587bb255d811b 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -31,7 +31,7 @@ components: trackingAreaIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' servingPLMN: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: @@ -86,6 +86,33 @@ components: type: string swImageRef: type: string + Duration: + type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + EASServicePermission: + type: string + description: any of enumrated value + enum: + - TRIAL + - SILVER + - GOLD + EASFeature: + type: string + description: any of enumrated value + enum: + - SINGLE + - MULTIPLE + EASStatus: + type: string + description: any of enumrated value + enum: + - ENABLED + - DISABLED + #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -152,6 +179,35 @@ components: items: type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EASProfile-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + aCID: + type: string + eASProvider: + type: string + eASdescription: + type: string + eASSchedule: + $ref: '#/components/schemas/Duration' + eASGeographicalServiceArea: + $ref: '#/components/schemas/GeoLoc' + eASTopologicalServiceArea: + $ref: '#/components/schemas/TopologicalServiceArea' + eASServicePermissionLevel: + $ref: '#/components/schemas/EASServicePermission' + eASFeature: + $ref: '#/components/schemas/EASFeature' + eASServiceContinuitySupport: + type: boolean + eASDNAI: + type: string + eASAvailabilityReportingPeriod: + type: integer + eASStatus: + $ref: '#/components/schemas/EASStatus' EESFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -223,6 +279,11 @@ components: $ref: '#/components/schemas/VirtualResource' softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' + eASSchedule: + $ref: '#/components/schemas/Duration' + eASFeature: + $ref: '#/components/schemas/EASFeature' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -246,6 +307,10 @@ components: type: array items: $ref: '#/components/schemas/EdgeDataNetwork-Single' + EASProfile-Multiple: + type: array + items: + $ref: '#/components/schemas/EASProfile-Single' #--------------------------------- Definition ------------------------------------ @@ -258,3 +323,4 @@ components: - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' + - $ref: '#/components/schemas/EASProfile-Single' diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0fab8da0a58b19cceb0f78146e8a7b90..aaf8bc79f80a355ed66a6b6d7e201b471df4c79e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -67,7 +67,7 @@ components: nFStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -101,7 +101,7 @@ components: apiPrfix: type: string allowedPlmns: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -212,7 +212,7 @@ components: allowedPLMNs: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: @@ -253,6 +253,22 @@ components: type: array items: type: string + recoveryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + nfServicePersistence: + type: boolean + nfProfileChangesSupportInd: + type: boolean + defaultNotificationSubscriptions: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' + minItems: 1 + serviceSetRecoveryTimeList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + minItems: 1 vendorId: type: string SEPPType: @@ -544,7 +560,7 @@ components: type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: @@ -554,7 +570,7 @@ components: type: object properties: pLMNId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' aMFIdentifier: type: integer @@ -587,16 +603,6 @@ components: type: array items: $ref: '#/components/schemas/DnnSmfInfoItem' - - IpAddr: - type: object - properties: - ipv4Addr: - type: string - ipv6Addr: - type: string - ipv6Prefix: - type: string 5GCNfConnEcmInfoList: type: array @@ -1136,6 +1142,262 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + EasdfInfo: + description: Information of an EASDF NF Instance + type: object + properties: + sNssaiEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiEasdfInfoItem' + minItems: 1 + easdfN6IpAddressList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + minItems: 1 + upfN6IpAddressList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + minItems: 1 + + SnssaiEasdfInfoItem: + description: Set of parameters supported by EASDF for a given S-NSSAI + type: object + required: + - sNssai + - dnnEasdfInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnEasdfInfoItem' + minItems: 1 + + DnnEasdfInfoItem: + description: Set of parameters supported by EASDF for a given DNN + type: object + required: + - dnn + properties: + dnn: + anyOf: + - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + NssaafInfo: + description: Information of a NSSAAF Instance + type: object + properties: + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + minItems: 1 + TrustAfInfo: + description: Information of a trusted AF Instance + type: object + properties: + sNssaiInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiInfoItem' + minItems: 1 + afEvents: + type: array + items: + $ref: '#/components/schemas/AfEvent' + minItems: 1 + appIds: + type: array + items: + type: string + minItems: 1 + internalGroupId: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' + minItems: 1 + mappingInd: + type: boolean + default: False + ExternalClientType: + description: Indicates types of External Clients. + anyOf: + - type: string + enum: + - EMERGENCY_SERVICES + - VALUE_ADDED_SERVICES + - PLMN_OPERATOR_SERVICES + - LAWFUL_INTERCEPT_SERVICES + - PLMN_OPERATOR_BROADCAST_SERVICES + - PLMN_OPERATOR_OM + - PLMN_OPERATOR_ANONYMOUS_STATISTICS + - PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT + - type: string + SupportedGADShapes: + description: Indicates supported GAD shapes. + anyOf: + - type: string + enum: + - POINT + - POINT_UNCERTAINTY_CIRCLE + - POINT_UNCERTAINTY_ELLIPSE + - POLYGON + - POINT_ALTITUDE + - POINT_ALTITUDE_UNCERTAINTY + - ELLIPSOID_ARC + - LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE + - LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID + - type: string + AnNodeType: + description: Access Network Node Type (gNB, ng-eNB...) + anyOf: + - type: string + enum: + - GNB + - NG_ENB + - type: string + + LmfInfo: + description: Information of an LMF NF Instance + type: object + properties: + servingClientTypes: + type: array + items: + $ref: '#/components/schemas/ExternalClientType' + minItems: 1 + lmfId: + type: string + servingAccessTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + servingAnNodeTypes: + type: array + items: + $ref: '#/components/schemas/AnNodeType' + minItems: 1 + servingRatTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' + minItems: 1 + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + supportedGADShapes: + type: array + items: + $ref: '#/components/schemas/SupportedGADShapes' + minItems: 1 + UdrInfo: + description: Information of an UDR NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + $ref: '#/components/schemas/IdentityRangeList' + supportedDataSets: + $ref: '#/components/schemas/SupportedDataSetList' + sharedDataIdRanges: + $ref: '#/components/schemas/SharedDataIdRangeList' + UdmInfo: + description: Information of an UDM NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + routingIndicators: + type: array + items: + type: string + pattern: '^[0-9]{1,4}$' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + minItems: 1 + suciInfos: + type: array + items: + $ref: '#/components/schemas/SuciInfo' + minItems: 1 + PlmnRange: + description: Range of PLMN IDs + type: object + oneOf: + - required: [ start, end ] + - required: [ pattern ] + properties: + start: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + end: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + pattern: + type: string + + SmsfInfo: + description: Specific Data for SMSF + type: object + properties: + roamingUeInd: + type: boolean + remotePlmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1236,6 +1498,10 @@ components: $ref: '#/components/schemas/EcmConnectionInfo-Multiple' EASDFFunction: $ref: '#/components/schemas/EASDFFunction-Multiple' + NSSAAFFunction: + $ref: '#/components/schemas/NssaafFunction-Multiple' + AFFunction: + $ref: '#/components/schemas/AfFunction-Multiple' AmfFunction-Single: allOf: @@ -1310,6 +1576,8 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' + EP_N58: + $ref: '#/components/schemas/EP_N13-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1383,7 +1651,7 @@ components: pgwAddrList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' accessType: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' priority: @@ -1634,22 +1902,8 @@ components: $ref: '#/components/schemas/CommModelList' eCSAddrConfigInfo: $ref: '#/components/schemas/ECSAddrConfigInfo' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - routingIndicators: - type: array - items: - type: string - internalGroupIdentifiersRanges: - $ref: '#/components/schemas/InternalGroupIdRangeList' - suciInfos: - $ref: '#/components/schemas/SuciInfoList' + udmInfo: + $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1659,6 +1913,8 @@ components: $ref: '#/components/schemas/EP_N10-Multiple' EP_N13: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N59: + $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1675,18 +1931,8 @@ components: type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - supportedDataSets: - $ref: '#/components/schemas/SupportedDataSetList' - sharedDataIdRanges: - $ref: '#/components/schemas/SharedDataIdRangeList' + udrInfo: + $ref: '#/components/schemas/UdrInfo' UdsfFunction-Single: allOf: @@ -1777,6 +2023,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + smsfInfo: + $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1802,6 +2050,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + lmfInfo: + $ref: '#/components/schemas/LmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1843,7 +2093,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: @@ -2003,7 +2253,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -2033,13 +2283,15 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' serverAddr: type: string + easdfInfo: + $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2130,7 +2382,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPId: type: integer fqdn: @@ -2463,7 +2715,7 @@ components: - type: object properties: remotePlmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' remoteSeppId: @@ -2810,6 +3062,83 @@ components: type: array items: $ref: '#/components/schemas/PccRule' + + AfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + trustAfInfo: + $ref: '#/components/schemas/TrustAfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N5: + $ref: '#/components/schemas/EP_N5-Multiple' + + NssaafFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + nFProfileList: + $ref: '#/components/schemas/NFProfileList' + commModelList: + $ref: '#/components/schemas/CommModelList' + nssafInfo: + $ref: '#/components/schemas/NssaafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EP_N58-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_N59-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -3089,9 +3418,22 @@ components: type: array items: $ref: '#/components/schemas/EcmConnectionInfo-Single' - - - + NssaafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/NssaafFunction-Single' + EP_N58-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N58-Single' + EP_N59-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N59-Single' + AfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3158,6 +3500,8 @@ components: - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N58-Single' + - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' - $ref: '#/components/schemas/EP_N88-Single' @@ -3178,4 +3522,6 @@ components: - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' + - $ref: '#/components/schemas/NssaafFunction-Single' + - $ref: '#/components/schemas/AfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 54e1117a1fea7dbffb72cfef22cb737e21afe2d4..973445b5028ddd842daca3ec1dcd535ad736ab26 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the NR NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -44,25 +44,15 @@ components: sd: type: string - Mnc: - type: string - pattern: '[0-9]{3}|[0-9]{2}' - PlmnId: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' PlmnIdList: type: array items: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' PlmnInfoList: @@ -77,7 +67,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' nidList: @@ -117,7 +107,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' TaiList: @@ -287,7 +277,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: @@ -587,7 +577,7 @@ components: TceID: type: integer PlmnTarget: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array items: @@ -730,6 +720,10 @@ components: $ref: '#/components/schemas/GnbIdLength' rimRSReportConf: $ref: '#/components/schemas/RimRSReportConf' + configurable5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + dynamic5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -751,6 +745,10 @@ components: $ref: '#/components/schemas/OperatorDu-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' OperatorDu-Single: allOf: @@ -807,6 +805,11 @@ components: $ref: '#/components/schemas/EP_X2U-Multiple' EP_S1U: $ref: '#/components/schemas/EP_S1U-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + GnbCuCpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -824,7 +827,7 @@ components: gnbCuName: $ref: '#/components/schemas/GnbName' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: $ref: '#/components/schemas/GGnbIdList' xnBlockList: @@ -874,6 +877,10 @@ components: $ref: '#/components/schemas/DMROFunction-Single' DLBOFunction: $ref: '#/components/schemas/DLBOFunction-Single' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NrCellCu-Single: allOf: @@ -1601,7 +1608,7 @@ components: gnbIdLength: $ref: '#/components/schemas/GnbIdLength' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index d1d15e7efb3ca6ede9e6100b8cfa6fe16426e14f..3f363913da80b6007b50e5632b987afb47471209 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -374,8 +374,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLMaxPktSize: type: integer uLMaxPktSize: @@ -449,8 +447,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: @@ -517,8 +513,10 @@ components: $ref: '#/components/schemas/UserMgmtOpen' v2XCommModels: $ref: '#/components/schemas/V2XCommModels' - coverageArea: - type: string + coverageAreas: + type: array + items: + type: string termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 70a9630d2fa881d428f6aabc15ff915db85e4230..c54fc8107a76d8cee08335863364061804cf7e3c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -78,6 +78,8 @@ components: $ref: '#/components/schemas/Latitude' longitude: $ref: '#/components/schemas/Longitude' + altitude: + $ref: '#/components/schemas/Float' ConvexGeoPolygon: type: array items: @@ -133,6 +135,7 @@ components: oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Ipv6Prefix' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 98ceba531e0ce7aa9469a8aa15f94922c47ba5c2..b0d7caec8f6d95c30e7c17e015cd173dabed2ef8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -194,7 +194,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - monitorGranularityPeriods: + reportingPeriods: type: array items: type: integer @@ -1683,8 +1683,6 @@ components: $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' - traceRecordingSessionReference: - type: string jobId: type: string traceReportingFormat: diff --git a/OpenAPI/TS29571_CommonData.yaml b/OpenAPI/TS29571_CommonData.yaml index 76cf71d6161d3745e69d2ff48a24c8ff6a674696..86a4a4de68fd8c8c0df1ea99a2aee54c32ea20f7 100644 --- a/OpenAPI/TS29571_CommonData.yaml +++ b/OpenAPI/TS29571_CommonData.yaml @@ -1,4 +1,4 @@ -##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022 +##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022. Updated to sync with 1.5.0 for SA5#147 (17.02.2023) openapi: 3.0.0 info: @@ -217,6 +217,23 @@ components: TimeOfDay: type: string description: String with format partial-time or full-time as defined in clause 5.6 of IETF RFC 3339. Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC). + EmptyObject: + description: Empty JSON object { }, it is defined with the keyword additionalProperties false + type: object + additionalProperties: false + + Fqdn: + description: Fully Qualified Domain Name + 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 + + FqdnRm: + description: Fully Qualified Domain Name, but it also allows the null value + anyOf: + - $ref: '#/components/schemas/Fqdn' + - $ref: '#/components/schemas/NullValue' # # COMMON ENUMERATED DATA TYPES # diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 37e01006b93a0ac5647b0e50fa11ac749db28bc9..b3a6d6911d0d0523448ff2fb0959c5cbf1c1d0b5 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -210,7 +210,7 @@ module _3gpp-common-measurements { min-elements 1; } - leaf-list reportingPeriods { + leaf-list reportingPeriods { type uint32 { range 1..max ; } @@ -462,9 +462,9 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. - The ThresholdMonitor shall be used only when NRM based threshold + The ThresholdMonitor is used only when NRM based threshold monitoring is supported. - + To activate threshold monitoring, a MnS consumer needs to create a ThresholdMonitor instance on the MnS producer. For ultimate deactivation of threshold monitoring, the MnS consumer should delete the monitor to @@ -496,8 +496,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a supported GP for the measurements being monitored. - Threshold crossing behaviour is as defined in [54], Annex F. + The value is a multiple of a supported granularity period for the + measurements being monitored. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , @@ -537,4 +537,4 @@ module _3gpp-common-measurements { } } } -} \ No newline at end of file +}