diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 2ceebaf6162f646eda67146763c7d56cb2c1cba8..943f6aebf00bbb6ccde002f308ba4974745a4478 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.4.0 + version: 18.1.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,27 +15,6 @@ components: #-------- Definition of types----------------------------------------------------- - MLEntityList: - type: array - items: - $ref: '#/components/schemas/MLEntity' - - MLEntity: - type: object - properties: - mLEntityId: - type: string - inferenceType: - type: string - mLEntityVersion: - type: string - expectedRunTimeContext: - $ref: '#/components/schemas/MLContext' - trainingContext: - $ref: '#/components/schemas/MLContext' - runTimeContext: - $ref: '#/components/schemas/MLContext' - MLContext: type: object properties: @@ -122,6 +101,8 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' ManagedElement-Single: allOf: @@ -135,6 +116,8 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' MLTrainingFunction-Single: allOf: @@ -146,8 +129,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRepositoryRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -169,6 +152,8 @@ components: properties: mLEntityId: type: string + inferenceType: + type: string candidateTrainingDataSource: type: array items: @@ -188,6 +173,8 @@ components: type: boolean suspendRequest: type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -249,6 +236,42 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLEntityId: + type: string + inferenceType: + type: string + mLEntityVersion: + type: string + expectedRunTimeContext: + $ref: '#/components/schemas/MLContext' + trainingContext: + $ref: '#/components/schemas/MLContext' + runTimeContext: + $ref: '#/components/schemas/MLContext' + + MLEntityRepository-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLRepositoryId: + type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -276,7 +299,14 @@ components: type: array items: $ref: '#/components/schemas/MLTrainingReport-Single' - + MLEntity-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntity-Single' + MLEntityRepository-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -289,3 +319,5 @@ components: - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2ad556b3fb8a4d160f2d783c50b946d0d..5423a87adec8a3c0528b08c5843c3b45ea8bda89 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.0.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -23,33 +23,72 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationObject: + $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/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' + - $ref: '#/components/schemas/HighULPrbLoadRatioTarget' + - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget' + - $ref: '#/components/schemas/AveULPrbLoadTarget' + - $ref: '#/components/schemas/AveDLPrbLoadTarget' + - $ref: "#/components/schemas/RANEnergyConsumptionTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId - ServiceSupportExpectation: + EdgeServiceSupportExpectation: 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: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' + expectationObject: + $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: 'TS28312_IntentNrm.yaml#/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: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + required: + - expectationId + 5GCNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for 5GC network delivering + type: object properties: expectationId: type: string @@ -58,34 +97,23 @@ components: expectationObjects: type: array items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + $ref: "#/components/schemas/5GCNetworkExpectationObject" 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/MaxNumberofPDUsessionsTarget" + - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" - $ref: "TS28312_IntentNrm.yaml#/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: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - - expectationId + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -97,29 +125,50 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# + - RAN_SubNetwork objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: 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" + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/PLMNContext' + - $ref: '#/components/schemas/NRFqBandContext' + - $ref: '#/components/schemas/RATContext' + - $ref: "#/components/schemas/UEGroupContext" + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' ServiceSupportExpectationObject: description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation type: object properties: objectType: type: string enum: - - Service_Support #value for Service Support Expectation--# + - EdgeService_Support #value for Edge Service Support Expectation--# + objectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' + - $ref: '#/components/schemas/EdgeIdentificationLocContext' + - $ref: '#/components/schemas/CoverageAreaTAContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + 5GCNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation + type: object + properties: + objectType: + type: string + enum: + - 5GC_SubNetwork #value for 5GC Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -127,10 +176,11 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "#/components/schemas/NfTypeContext" + - $ref: "#/components/schemas/NfInstanceLocationContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/TaiContext" + - $ref: "#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -153,9 +203,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/WeakRSRPContext' WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -189,9 +237,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/LowSINRContext' LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -222,8 +268,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget @@ -239,8 +283,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget @@ -259,9 +301,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/LowULRANUEThptContext' LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -295,9 +335,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/LowDLRANUEThptContext' LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext @@ -313,6 +351,142 @@ components: - IS_LESS_THAN contextValueRange: type: number + HighULPrbLoadRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget + type: object + properties: + targetName: + type: string + enum: + - HighULPrbLoadRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: '#/components/schemas/HighULPrbLoadContext' + HighULPrbLoadContext: + description: >- + This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext + type: object + properties: + contextAttribute: + type: string + enum: + - HighULPrbLoadThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + minimum: 0 + maximum: 100 + HighDLPrbLoadRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget + type: object + properties: + targetName: + type: string + enum: + - HighDLPrbLoadRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: '#/components/schemas/HighDLPrbLoadContext' + HighDLPrbLoadContext: + description: >- + This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext + type: object + properties: + contextAttribute: + type: string + enum: + - HighDLPrbLoadThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + minimum: 0 + maximum: 100 + AveULPrbLoadTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget + type: object + properties: + targetName: + type: string + enum: + - AveULPrbLoad + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + AveDLPrbLoadTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget + type: object + properties: + targetName: + type: string + enum: + - AveDLPrbLoad + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + RANEnergyConsumptionTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget + type: object + properties: + targetName: + type: string + enum: + - RANEnergyConsumption + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + RANEnergyEfficiencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget + type: object + properties: + targetName: + type: string + enum: + - RANEnergyEfficiency + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget @@ -327,7 +501,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget @@ -342,7 +516,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget @@ -418,6 +592,37 @@ components: - IS_LESS_THAN targetValueRange: type: integer + MaxNumberofPDUsessionsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget + type: object + properties: + targetName: + type: string + enum: + - MaxNumberofPDUsessions + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + MaxNumberofRegisteredsubscribersTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget + type: object + properties: + targetName: + type: string + enum: + - MaxNumberofRegisteredsubscribers + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# @@ -429,7 +634,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition' contextValueRange: type: array items: @@ -450,7 +655,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageArea" + $ref: '#/components/schemas/CoverageArea' CoverageArea: type: string CoverageTACContext: @@ -469,7 +674,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -486,7 +691,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_ComDefs.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 @@ -525,9 +730,33 @@ components: - UTRAN - EUTRAN - NR + UEGroupContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI]) + type: object + properties: + contextAttribute: + type: string + enum: + - UEGroup + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/UEGroup" + UEGroup: + type: object + properties: + fiveQI: + type: integer + sNssai: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' EdgeIdenfiticationIdContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext type: object properties: contextAttribute: @@ -542,9 +771,9 @@ components: type: array items: type: string - EdgeIdenfiticationLocContext: + EdgeIdentificationLocContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext type: object properties: contextAttribute: @@ -575,12 +804,64 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageAreaTAList" + $ref: '#/components/schemas/CoverageAreaTAList' CoverageAreaTAList: type: integer + NfTypeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NfTypeContext + type: object + properties: + contextAttribute: + type: string + enum: + - NfType + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + NfInstanceLocationContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext + type: object + properties: + contextAttribute: + type: string + enum: + - NfInstanceLocation + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + TaiContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TaiContext + type: object + properties: + contextAttribute: + type: string + enum: + - Tai + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" + #-------Definition of the scenario specific ObjectTarget dataType----------------# - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# ServiceStartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext @@ -595,7 +876,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' ServiceEndTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext @@ -610,7 +891,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' UEMobilityLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext @@ -623,11 +904,9 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" ResourceSharingLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext @@ -640,9 +919,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28bf7581e821439a186ee55e554dba9bd..9001674128e535c73f2c92791ac14acaea4c99d9 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.0.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -27,8 +27,8 @@ components: properties: SubNetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - Intent: - $ref: '#/components/schemas/Intent-Multiple' + IntentHandlingFunction: + $ref: '#/components/schemas/IntentHandlingFunction-Multiple' Intent-Single: allOf: @@ -44,13 +44,56 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" intentContexts: type: array items: - $ref: "#/components/schemas/IntentContext" - intentFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/IntentContext' + intentAdminState: + type: string + enum: + - ACTIVATED + - DEACTIVATED + intentPriority: + type: integer + observationPeriod: + type: integer + intentReportReference: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + IntentReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentFulfilmentReport: + type: array + items: + $ref: '#/components/schemas/IntentFulfilmentReport' + intentConflictReports: + type: array + items: + $ref: '#/components/schemas/IntentConflictReport' + intentFeasibilityCheckReport: + type: array + items: + $ref: '#/components/schemas/IntentFeasibilityCheckReport' + intentReference: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + IntentHandlingFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentHandlingCapabilityList: + type: array + items: + $ref: '#/components/schemas/IntentHandlingCapability' + Intent: + $ref: '#/components/schemas/Intent-Multiple' + IntentReport: + $ref: '#/components/schemas/IntentReport-Multiple' + #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -63,20 +106,16 @@ components: type: string expectationVerb: $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ExpectationObject" + expectationObject: + $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array items: - $ref: "#/components/schemas/ExpectationTarget" + $ref: '#/components/schemas/ExpectationTarget' expectationContexts: type: array items: - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/ExpectationContext' required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -91,14 +130,13 @@ components: type: string enum: - 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-# + - Edge_Service_Support #value for Edge Service Support Expectation--# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" + $ref: '#/components/schemas/ObjectContext' #-------Definition of the generic ExpectationObject dataType ----------# @@ -136,7 +174,7 @@ components: type: object properties: fulfilStatus: - $ref: "#/components/schemas/FulfilStatus" + $ref: '#/components/schemas/FulfilStatus' notFullfilledState: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo @@ -151,6 +189,17 @@ components: enum: - DELIVER - ENSURE + ValueRangeType: + oneOf: + - type: number + - type: string + - type: boolean + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# @@ -162,11 +211,13 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: - type: array - items: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic IntentContext dataType --------------# #-------Definition of the generic ExpectationTarget dataType----------# @@ -178,13 +229,17 @@ components: targetName: type: string targetCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' targetValueRange: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" targetContexts: type: array items: - $ref: "#/components/schemas/TargetContext" + $ref: '#/components/schemas/TargetContext' TargetContext: description: >- This data type is the "TargetContext" data type without specialisations @@ -193,9 +248,13 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic ExpectationTarget dataType----------# #-------Definition of the generic ObjectContext dataType----------------# @@ -207,11 +266,13 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: - type: array - items: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic ObjectContext dataType----------------# #-------Definition of the generic ExpectionContext dataType----------------# @@ -223,13 +284,108 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" + #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the generic IntentFulfilmentReport dataType----------------# + IntentFulfilmentReport: + description: >- + This data type is the "IntentFulfilmentReport" data type without specialisations + type: object + properties: + intentFulfilmentInfo: + $ref: '#/components/schemas/FulfilmentInfo' + expectationFulfilmentResult: + type: array + items: + $ref: '#/components/schemas/ExpectationFulfilmentResult' + #-------Definition of the concrete IntentFulfilmentReport dataType----------------# + + #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# + ExpectationFulfilmentResult: + description: >- + This data type is the "ExpectationFulfilmentResult" data type without specialisations + type: object + properties: + expectaitonId: + type: string + expectationFulfilmentInfo: + $ref: '#/components/schemas/FulfilmentInfo' + targetFulfilmentResult: + type: array + items: + $ref: '#/components/schemas/TargetFulfilmentResult' + #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# + + #-------Definition of the generic TargetFulfilmentResult dataType----------------# + TargetFulfilmentResult: + description: >- + This data type is the "TargetFulfilmentResult" data type without specialisations + type: object + properties: + targetName: + type: string + targetFulfilmentInfo: + $ref: '#/components/schemas/FulfilmentInfo' + targetAchievedValue: + type: number + #-------Definition of the concrete TargetFulfilmentResult dataType----------------# + + #-------Definition of the generic IntentConflictReport dataType----------------# + IntentConflictReport: + description: >- + This data type is the "IntentConflictReport" data type without specialisations + type: object + properties: + conflictType: + type: string + enum: + - INTENT_CONFLICT + - EXPECTATION_CONFLICT + - TARGET_CONFLICT + conflictField: + type: string + #-------Definition of the concrete IntentConflictReport dataType----------------# + + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# + IntentFeasibilityCheckReport: + description: >- + This data type is the "IntentFeasibilityCheckReport" data type without specialisations + type: object + properties: + feasibilityCheckResult: + type: string + enum: + - FEASIBLE + - INFEASIBLE + infeasibilityReason: + description: -> + An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: string + #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# + IntentHandlingCapability: + type: object + properties: + intentHandlingCapabilityId: + type: string + supportedExpectationObjectType: + type: string + enum: + - RAN_SUBNETWORK + - EDGE_SERVICE_SUPPORT + supportedExpectationTargetType: type: array items: - type: number - #-------Definition of the concrete ExpectionContext dataType----------------# - + $ref: "#/components/schemas/ExpectationTarget" + #-------Definition of the concrete IntentHandlingCapability dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# SubNetwork-Multiple: @@ -240,7 +396,19 @@ components: Intent-Multiple: type: array items: - $ref: '#/components/schemas/Intent-Single' + $ref: '#/components/schemas/Intent-Single' + + IntentReport-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentReport-Single' + + IntentHandlingFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentHandlingFunction-Single' + + #------Definition of JSON arrays for name-contained IOCs ---------------# #----- Definitions in TS 28.312 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7eeb11a6cfe9cb268d3fc6bc7477cadc63645662..4cf5ec97673269b19fed094ee5cc553f07bed11c 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -112,7 +112,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' NFStatus: type: string - description: any of enumrated value + description: any of enumerated value enum: - REGISTERED - SUSPENDED @@ -126,7 +126,7 @@ components: TACList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: type: integer AusfInfo: @@ -152,7 +152,7 @@ components: minItems: 1 SupportedDataSet: type: string - description: any of enumrated value + description: any of enumerated value enum: - SUBSCRIPTION - POLICY @@ -190,7 +190,7 @@ components: type: string n1MessageClass: type: boolean - n2InfroamtionClass: + n2InformationClass: type: boolean versions: type: string @@ -273,7 +273,7 @@ components: type: string SEPPType: type: string - description: any of enumrated value + description: any of enumerated value enum: - CSEPP - PSEPP @@ -290,7 +290,7 @@ components: $ref: '#/components/schemas/SupportedFunc' CommModelType: type: string - description: any of enumrated value + description: any of enumerated value enum: - DIRECT_COMMUNICATION_WO_NRF - DIRECT_COMMUNICATION_WITH_NRF @@ -533,9 +533,9 @@ components: enum: - INACTIVE - ACTIVE - activeEacThreshhold: + activeEacThreshold: type: integer - deactiveEacThreshhold: + deactiveEacThreshold: type: integer numberofUEs: type: integer @@ -594,7 +594,7 @@ components: items: type: string - SNssaiSmfInfoItem: + SnssaiSmfInfoItem: type: object properties: sNSSAI: @@ -653,7 +653,7 @@ components: TaiList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: @@ -675,7 +675,7 @@ components: ProseCapability: type: object properties: - proseDirectDiscovey: + proseDirectDiscovery: type: boolean proseDirectCommunication: type: boolean @@ -1494,6 +1494,264 @@ components: secondaryChfInstance: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + AmfInfo: + description: Information of an AMF NF Instance + type: object + # required: + # - amfSetId + # - amfRegionId + # - guamiList + properties: + # amfSetId: + # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' + # amfRegionId: + # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' + guamiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + 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 + backupInfoAmfFailure: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + minItems: 1 + backupInfoAmfRemoval: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + minItems: 1 + # n2InterfaceAmfInfo: + # $ref: '#/components/schemas/N2InterfaceAmfInfo' + # amfOnboardingCapability: + # type: boolean + # default: false + # highLatencyCom: + # type: boolean + + SmfInfo: + description: Information of an SMF NF Instance + type: object + required: + - sNssaiSmfInfoList + properties: + sNssaiSmfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiSmfInfoItem' + 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 + pgwFqdn: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' + pgwIpAddrList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + minItems: 1 + accessType: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + priority: + type: integer + minimum: 0 + maximum: 65535 + vsmfSupportInd: + type: boolean + pgwFqdnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' + minItems: 1 + # smfOnboardingCapability: + # type: boolean + # default: false + # deprecated: true + # ismfSupportInd: + # type: boolean + # smfUPRPCapability: + # type: boolean + # default: false + + UpfInfo: + description: Information of an UPF NF Instance + type: object + # required: + # - sNssaiUpfInfoList + properties: + # sNssaiUpfInfoList: + # type: array + # items: + # $ref: '#/components/schemas/SnssaiUpfInfoItem' + # minItems: 1 + smfServingArea: + type: array + items: + type: string + minItems: 1 + interfaceUpfInfoList: + type: array + items: + $ref: '#/components/schemas/InterfaceUpfInfoItem' + minItems: 1 + iwkEpsInd: + type: boolean + default: false + # sxaInd: + # type: boolean + pduSessionTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' + minItems: 1 + atsssCapability: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AtsssCapability' + ueIpAddrInd: + type: boolean + default: false + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + wAgfInfo: + # $ref: '#/components/schemas/WAgfInfo' + $ref: '#/components/schemas/IpInterface' + tngfInfo: + # $ref: '#/components/schemas/TngfInfo' + $ref: '#/components/schemas/IpInterface' + twifInfo: + # $ref: '#/components/schemas/TwifInfo' + $ref: '#/components/schemas/IpInterface' + priority: + type: integer + minimum: 0 + maximum: 65535 + redundantGtpu: + type: boolean + default: false + ipups: + type: boolean + default: false + dataForwarding: + type: boolean + default: false + supportedPfcpFeatures: + type: string + # upfEvents: + # type: array + # items: + # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' + # minItems: 1 + + PcfInfo: + description: Information of a PCF NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + v2xSupportInd: + type: boolean + default: false + proseSupportInd: + type: boolean + default: false + proseCapability: + $ref: '#/components/schemas/ProseCapability' + v2xCapability: + $ref: '#/components/schemas/V2xCapability' + + NefInfo: + description: Information of an NEF NF Instance + type: object + properties: + nefId: + # $ref: '#/components/schemas/NefId' + type: string + pfdData: + $ref: '#/components/schemas/PfdData' + afEeData: + $ref: '#/components/schemas/AfEventExposureData' + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + servedFqdnList: + type: array + items: + type: string + minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + unTrustAfInfoList: + type: array + items: + $ref: '#/components/schemas/UnTrustAfInfo' + minItems: 1 + uasNfFunctionalityInd: + type: boolean + default: false + NrfInfo: description: Information of an NRF NF Instance, used in hierarchical NRF deployments type: object @@ -1506,6 +1764,18 @@ components: - $ref: '#/components/schemas/UdrInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedUdrInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 servedUdmInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1514,6 +1784,18 @@ components: - $ref: '#/components/schemas/UdmInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedUdmInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 servedAusfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1522,6 +1804,146 @@ components: - $ref: '#/components/schemas/AusfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedAusfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedAmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAmfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedSmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedSmfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedUpfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UpfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUpfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UpfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedPcfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/PcfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedPcfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/PcfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + # servedBsfInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/BsfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # servedBsfInfoList: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # description: A map (list of key-value pairs) where a valid JSON string serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/BsfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 + servedChfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedChfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedNefInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NefInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 servedNwdafInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1530,6 +1952,36 @@ components: - $ref: '#/components/schemas/NwdafInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedNwdafInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/NwdafInfo' + minProperties: 1 + minProperties: 1 + # servedPcscfInfoList: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # description: A map (list of key-value pairs) where a valid JSON string serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/PcscfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 + # servedGmlcInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/GmlcInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 servedLmfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1538,6 +1990,24 @@ components: - $ref: '#/components/schemas/LmfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + # servedNfInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # $ref: '#/components/schemas/NfInfo' + # minProperties: 1 + # servedHssInfoList: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # description: A map (list of key-value pairs) where a valid JSON string serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/HssInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 servedUdsfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1546,6 +2016,34 @@ components: - $ref: '#/components/schemas/UdsfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedUdsfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedScpInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ScpInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedSeppInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SeppInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 servedTrustAfInfo: type: object description: A map (list of key-value pairs) where NF Instance Id serves as key @@ -1558,6 +2056,150 @@ components: additionalProperties: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + NTNPLMNRestrictionsInfo: + description: restrictions per PLMN that relates to non-terrestrial network access + type: object + properties: + pLMNId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + blockedLocationInfoList: + type: array + items: + $ref: '#/components/schemas/BlockedLocationInfoList' + minItems: 1 + BlockedLocationInfoList: + description: location for which the PLMN access restrictions are to be applied in case of NTN + type: object + properties: + blockedLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + blockedDur: + $ref: '#/components/schemas/TimeDuration' + blockedSlice: + type: string + TimeDuration: + description: location for which the PLMN access restrictions are to be applied in case of NTN + type: object + properties: + blockedDurStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + blockedDurEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + + GmlcInfo: + description: Information of a GMLC NF Instance + type: object + properties: + servingClientTypes: + type: array + items: + $ref: '#/components/schemas/ExternalClientType' + gmlcNumbers: + type: array + items: + type: string + pattern: '^[0-9]{5,15}$' + + SnssaiTsctsfInfoItem: + description: Set of parameters supported by TSCTSF for a given S-NSSAI + type: object + required: + - sNssai + - dnnInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnInfoList: + type: array + items: + $ref: '#/components/schemas/DnnTsctsfInfoItem' + minItems: 1 + DnnTsctsfInfoItem: + description: Parameters supported by an TSCTSF 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' + TsctsfInfo: + description: Information of a TSCTSF NF Instance + type: object + properties: + sNssaiInfoList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/SnssaiTsctsfInfoItem' + minProperties: 0 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + + BsfInfo: + description: Information of a BSF NF Instance + type: object + properties: + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 0 + ipDomainList: + type: array + items: + type: string + minItems: 0 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 0 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 0 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + + AanfInfo: + description: Represents the information relative to an AAnF NF Instance. + type: object + properties: + routingIndicators: + type: array + items: + type: string + pattern: '^[0-9]{1,4}$' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1668,6 +2310,14 @@ components: $ref: '#/components/schemas/ChfFunction-Multiple' MFAFFunction: $ref: '#/components/schemas/MfafFunction-Multiple' + GMLCFunction: + $ref: '#/components/schemas/GmlcFunction-Multiple' + TSCTSFFunction: + $ref: '#/components/schemas/TsctsfFunction-Multiple' + AANFFunction: + $ref: '#/components/schemas/AanfFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' AmfFunction-Single: allOf: @@ -1687,34 +2337,20 @@ components: type: string interPlmnFQDN: type: string - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - gUAMIdList: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' - backupInfoAmfFailure: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' - backupInfoAmfRemoval: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' amfSetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + nTNPLMNInfoList: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + amfInfo: + $ref: '#/components/schemas/AmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1740,14 +2376,16 @@ components: $ref: '#/components/schemas/EP_N26-Multiple' EP_NLS: $ref: '#/components/schemas/EP_NLS-Multiple' - EP_NLG: - $ref: '#/components/schemas/EP_NLG-Multiple' + EP_NL2: + $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: $ref: '#/components/schemas/EP_N58-Multiple' EP_N41: $ref: '#/components/schemas/EP_N41-Multiple' EP_N42: $ref: '#/components/schemas/EP_N42-Multiple' + EP_N89: + $ref: '#/components/schemas/EP_N89-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1806,43 +2444,18 @@ components: $ref: '#/components/schemas/TACList' sBIFqdn: type: string - sNssaiSmfInfoList: - type: array - items: - $ref: '#/components/schemas/SNssaiSmfInfoItem' - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - pwgFqdn: - type: string - pgwAddrList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' - accessType: - $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' - priority: - type: integer cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - vsmfSupportInd: - type: boolean - pwgFqdnList: - type: array - items: - type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + SmfInfo: + $ref: '#/components/schemas/SmfInfo' 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: @@ -1860,6 +2473,8 @@ components: $ref: '#/components/schemas/EP_S5C-Multiple' EP_N40: $ref: '#/components/schemas/EP_N40-Multiple' + EP_N88: + $ref: '#/components/schemas/EP_N88-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -1885,52 +2500,12 @@ components: $ref: '#/components/schemas/TACList' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - smfServingArea: - type: string - interfaceUpfInfoList: - type: array - items: - $ref: '#/components/schemas/InterfaceUpfInfoItem' - iwkEpsInd: - type: boolean - pduSessionTypes: - type: string - enum: - - IPV4 - - IPV6 - - IPV4V6 - - UNSTRUCTURED - - ETHERNET - atsssCapability: - $ref: '#/components/schemas/AtsssCapability' - ueIpAddrInd: - type: boolean - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - wAgfInfo: - $ref: '#/components/schemas/IpInterface' - tngfInfo: - $ref: '#/components/schemas/IpInterface' - twifInfo: - $ref: '#/components/schemas/IpInterface' - priority: - type: integer - redundantGtpu: - type: boolean - ipups: - type: boolean - dataForwarding: - type: boolean - supportedPfcpFeatures: - type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' + upfInfo: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1983,34 +2558,14 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - groupId: - type: string - dnnList: - type: array - items: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - rxDiamHost: - type: string - rxDiamRealm: - type: string - v2xSupportInd: - type: boolean - proseSupportInd: - type: boolean - proseCapability: - $ref: '#/components/schemas/ProseCapability' - v2xCapability: - $ref: '#/components/schemas/V2xCapability' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' + PcfInfo: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - supportedBMOList: - $ref: '#/components/schemas/SupportedBMOList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2026,6 +2581,8 @@ components: $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' + EP_N84: + $ref: '#/components/schemas/EP_N84-Multiple' PredefinedPccRuleSet: $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -2056,6 +2613,8 @@ components: $ref: '#/components/schemas/EP_N12-Multiple' EP_N13: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N61: + $ref: '#/components/schemas/EP_N61-Multiple' UdmFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2089,6 +2648,10 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' EP_N59: $ref: '#/components/schemas/EP_N13-Multiple' + EP_NL6: + $ref: '#/components/schemas/EP_NL6-Multiple' + EP_N87: + $ref: '#/components/schemas/EP_N87-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2152,6 +2715,8 @@ components: properties: EP_N27: $ref: '#/components/schemas/EP_N27-Multiple' + EP_N96: + $ref: '#/components/schemas/EP_N96-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2307,7 +2872,17 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' nwdafInfo: $ref: '#/components/schemas/NwdafInfo' - + nwdafLogicalFuncSupported: + type: string + enum: + - NWDAF_WITH_ANLF + - NWDAF_WITH_MTLF + - NWDAF_WITH_ANLF_MTLF + - type: object + properties: + EP_NL3: + $ref: '#/components/schemas/EP_NL3-Multiple' + ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2345,53 +2920,22 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - dnai: - type: string - nefId: - type: string - pfdData: - $ref: '#/components/schemas/PfdData' - afEeData: - $ref: '#/components/schemas/AfEventExposureData' - gpsiRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 - externalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 - servedFqdnList: - type: array - items: - type: string - minItems: 1 - dnaiList: - type: array - items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 - unTrustAfInfoList: - type: array - items: - $ref: '#/components/schemas/UnTrustAfInfo' - minItems: 1 - uasNfFunctionalityInd: - type: boolean - default: false + nefInfo: + $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: EP_N33: $ref: '#/components/schemas/EP_N33-Multiple' + EP_NL5: + $ref: '#/components/schemas/EP_NL5-Multiple' + EP_N85: + $ref: '#/components/schemas/EP_N85-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + NsacfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2914,7 +3458,49 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_S5C-Single: + EP_S5C-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_S5U-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_Rx-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_MAP_SMSC-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2928,7 +3514,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_S5U-Single: + EP_NLS-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2942,7 +3528,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_Rx-Single: + EP_NL2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2956,7 +3542,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_MAP_SMSC-Single: + EP_NL3-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2970,7 +3556,21 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLS-Single: + EP_NL5-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_NL6-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2984,7 +3584,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLG-Single: + EP_NL9-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -3260,6 +3860,12 @@ components: properties: EP_N5: $ref: '#/components/schemas/EP_N5-Multiple' + EP_N86: + $ref: '#/components/schemas/EP_N86-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' NssaafFunction-Single: allOf: @@ -3447,6 +4053,257 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + AanfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + aanfInfo: + $ref: '#/components/schemas/AanfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N61: + $ref: '#/components/schemas/EP_N61-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + EP_N61-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_N62-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_N63-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' + + + GmlcFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + gmlcInfo: + $ref: '#/components/schemas/GmlcInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_NL2: + $ref: '#/components/schemas/EP_NL2-Multiple' + EP_NL3: + $ref: '#/components/schemas/EP_NL3-Multiple' + EP_NL5: + $ref: '#/components/schemas/EP_NL5-Multiple' + EP_NL6: + $ref: '#/components/schemas/EP_NL6-Multiple' + EP_NL9: + $ref: '#/components/schemas/EP_NL9-Multiple' + TsctsfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + tsctsfInfo: + $ref: '#/components/schemas/TsctsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N84: + $ref: '#/components/schemas/EP_N84-Multiple' + EP_N85: + $ref: '#/components/schemas/EP_N85-Multiple' + EP_N86: + $ref: '#/components/schemas/EP_N86-Multiple' + EP_N87: + $ref: '#/components/schemas/EP_N87-Multiple' + EP_N89: + $ref: '#/components/schemas/EP_N89-Multiple' + EP_N96: + $ref: '#/components/schemas/EP_N96-Multiple' + + EP_N84-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_N85-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_N86-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_N87-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_N89-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_N96-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' + + BsfFunction-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' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + bsfInfo: + $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3702,14 +4559,42 @@ components: type: array items: $ref: '#/components/schemas/EP_NLS-Single' - EP_NLG-Multiple: + EP_NL2-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL2-Single' + EP_NL3-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL3-Single' + EP_NL5-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL5-Single' + EP_NL6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL6-Single' + EP_NL9-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLG-Single' + $ref: '#/components/schemas/EP_NL9-Single' EP_N60-Multiple: type: array items: $ref: '#/components/schemas/EP_N60-Single' + EP_N61-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N61-Single' + EP_N62-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N62-Single' + EP_N63-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N63-Single' EP_Npc4-Multiple: type: array items: @@ -3726,10 +4611,34 @@ components: type: array items: $ref: '#/components/schemas/EP_Npc8-Single' + EP_N84-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N84-Single' + EP_N85-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N85-Single' + EP_N86-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N86-Single' + EP_N87-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N87-Single' EP_N88-Multiple: type: array items: $ref: '#/components/schemas/EP_N88-Single' + EP_N89-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N89-Single' + EP_N96-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N96-Single' Configurable5QISet-Multiple: type: array items: @@ -3770,6 +4679,22 @@ components: type: array items: $ref: '#/components/schemas/MfafFunction-Single' + GmlcFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/GmlcFunction-Single' + TsctsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/TsctsfFunction-Single' + AanfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AanfFunction-Single' + BsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/BsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3844,7 +4769,16 @@ components: - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_N61-Single' + - $ref: '#/components/schemas/EP_N62-Single' + - $ref: '#/components/schemas/EP_N63-Single' + - $ref: '#/components/schemas/EP_N84-Single' + - $ref: '#/components/schemas/EP_N85-Single' + - $ref: '#/components/schemas/EP_N86-Single' + - $ref: '#/components/schemas/EP_N87-Single' - $ref: '#/components/schemas/EP_N88-Single' + - $ref: '#/components/schemas/EP_N89-Single' + - $ref: '#/components/schemas/EP_N96-Single' - $ref: '#/components/schemas/EP_Npc4-Single' - $ref: '#/components/schemas/EP_Npc6-Single' @@ -3856,7 +4790,12 @@ components: - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - $ref: '#/components/schemas/EP_NLS-Single' - - $ref: '#/components/schemas/EP_NLG-Single' + - $ref: '#/components/schemas/EP_NL2-Single' + - $ref: '#/components/schemas/EP_NL3-Single' + - $ref: '#/components/schemas/EP_NL5-Single' + - $ref: '#/components/schemas/EP_NL6-Single' + - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -3868,3 +4807,7 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/MfafFunction-Single' + - $ref: '#/components/schemas/GmlcFunction-Single' + - $ref: '#/components/schemas/TsctsfFunction-Single' + - $ref: '#/components/schemas/AanfFunction-Single' + - $ref: '#/components/schemas/BsfFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9ba9997e349b90e669584e923945deb9308022b8..0a5099749bf10fe4a5bc4d9822e93cb26e749a92 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the NR NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -97,30 +97,22 @@ components: type: integer maximum: 503 NrTac: - type: integer - maximum: 16777215 + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NrTacList: type: array items: - $ref: '#/components/schemas/NrTac' - Tai: - type: object - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: type: array items: - $ref: '#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: gnbId: $ref: '#/components/schemas/GnbId' tai: - $ref: "#/components/schemas/Tai" + $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" MappingSetIDBackhaulAddress: type: object properties: @@ -182,7 +174,7 @@ components: timeDuration: type: integer - UeAccProbilityDist: + UeAccProbabilityDist: type: object properties: targetProbability: @@ -190,7 +182,7 @@ components: numberofpreamblessent: type: integer - UeAccDelayProbilityDist: + UeAccDelayProbabilityDist: type: object properties: targetProbability: @@ -599,6 +591,75 @@ components: type: integer minValue: type: integer + NTNTAClist: + type: array + items: + $ref: '#/components/schemas/NrTac' + Ephemeris: + type: object + oneOf: + - $ref: '#/components/schemas/PositionVelocity' + - $ref: '#/components/schemas/Orbital' + properties: + satelliteId: + type: integer + + PositionVelocity: + type: object + properties: + positionX: + type: integer + minimum: 0 + maximum: 604800 + positionY: + type: integer + minimum: 0 + maximum: 604800 + positionZ: + type: integer + minimum: 0 + maximum: 604800 + velocityVX: + type: integer + minimum: -131072 + maximum: 131071 + velocityVY: + type: integer + minimum: -131072 + maximum: 131071 + velocityVZ: + type: integer + minimum: -131072 + maximum: 131071 + + Orbital: + type: object + properties: + semiMajorAxis: + type: integer + minimum: 0 + maximum: 8589934591 + eccentricity: + type: integer + minimum: -524288 + maximum: 524287 + periapsis: + type: integer + minimum: 0 + maximum: 16777215 + longitude: + type: integer + minimum: 0 + maximum: 2097151 + inclination: + type: integer + minimum: -524288 + maximum: 524287 + meanAnomaly: + type: integer + minimum: 0 + maximum: 16777215 + #-------- Definition of abstract IOCs -------------------------------------------- RrmPolicy_-Attr: @@ -949,7 +1010,7 @@ components: nrPci: $ref: '#/components/schemas/NrPci' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer arfcnUL: @@ -1025,7 +1086,11 @@ components: - type: object properties: bWPlist: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + maxItems: 12 + NrOperatorCellDu-Single: allOf: @@ -1039,7 +1104,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: allOf: @@ -1190,10 +1255,19 @@ components: properties: rRMPolicyMaxRatio: type: integer + default: 100 + minimum: 0 + maximum: 100 rRMPolicyMinRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 rRMPolicyDedicatedRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 NRCellRelation-Single: allOf: @@ -1418,10 +1492,10 @@ components: properties: drachOptimizationControl: type: boolean - ueAccProbilityDist: - $ref: "#/components/schemas/UeAccProbilityDist" - ueAccDelayProbilityDist: - $ref: "#/components/schemas/UeAccDelayProbilityDist" + ueAccProbabilityDist: + $ref: "#/components/schemas/UeAccProbabilityDist" + ueAccDelayProbabilityDist: + $ref: "#/components/schemas/UeAccDelayProbabilityDist" - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' DMROFunction-Single: @@ -1869,6 +1943,45 @@ components: allOf: - $ref: '#/components/schemas/CCOParameters-Attr' - type: object + + NTNFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + nTNpLMNInfoList: + $ref: '#/components/schemas/PlmnInfoList' + nTNTAClist: + $ref: '#/components/schemas/NrTacList' + EphemerisInfoSet: + $ref: '#/components/schemas/EphemerisInfoSet-Multiple' + + EphemerisInfoSet-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + EphemerisInfos: + $ref: '#/components/schemas/Ephemeris-Multiple' + + Ephemeris-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + oneOf: + - $ref: '#/components/schemas/PositionVelocity' + - $ref: '#/components/schemas/Orbital' + properties: + satelliteId: + type: integer + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2032,7 +2145,15 @@ components: type: array items: $ref: '#/components/schemas/EP_S1U-Single' + EphemerisInfoSet-Multiple: + type: array + items: + $ref: '#/components/schemas/EphemerisInfoSet-Single' + Ephemeris-Multiple: + type: array + items: + $ref: '#/components/schemas/Ephemeris-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- resources-nrNrm: @@ -2099,3 +2220,7 @@ components: - $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + - $ref: '#/components/schemas/NTNFunction-Single' + - $ref: '#/components/schemas/EphemerisInfoSet-Single' + - $ref: '#/components/schemas/Ephemeris-Single' + diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2803d6d87b501cc81bed62b5c5b84b3d61a95765..88eeb770233bade81c8bda7185d172e2d9ce0894 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -23,26 +23,26 @@ components: enum: - STATIONARY - NOMADIC - - RESTRICTED MOBILITY - - FULLY MOBILITY + - RESTRICTED_MOBILITY + - FULL_MOBILITY SynAvailability: type: string enum: - - NOT SUPPORTED - - BETWEEN BS AND UE - - BETWEEN BS AND UE & UE AND UE + - NOT_SUPPORTED + - BETWEEN_BS_AND_UE + - BETWEEN_BS_AND_UE_AND_UE_AND_UE PositioningAvailability: type: array items: type: string enum: - - CIDE-CID + - CIDE_CID - OTDOA - - RF FINGERPRINTING + - RF_FINGERPRINTING - AECID - - HYBRID POSITIONING - - NET-RTK - Predictionfrequency: + - HYBRID_POSITIONING + - NET_RTK + PredictionFrequency: type: string enum: - PERSEC @@ -52,22 +52,18 @@ components: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED NetworkSliceSharingIndicator: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED SliceSimultaneousUse: - type: string - enum: - - ZERO - - ONE - - TWO - - THREE - - FOUR + type: integer + minimum: 0 + maximum: 4 Category: type: string enum: @@ -98,7 +94,7 @@ components: Support: type: string enum: - - NOT SUPPORTED + - NOT_SUPPORTED - SUPPORTED DelayTolerance: type: object @@ -107,6 +103,13 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' + NonIPSupport: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + support: + $ref: '#/components/schemas/Support' DeterministicComm: type: object properties: @@ -189,8 +192,8 @@ components: $ref: '#/components/schemas/ServAttrCom' availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' PositioningRANSubnet: @@ -198,8 +201,8 @@ components: properties: availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' UserMgmtOpen: @@ -322,7 +325,7 @@ components: maxNumberOfPDUSessions: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' dLMaxPktSize: @@ -348,12 +351,15 @@ components: nssaaSupport: $ref: '#/components/schemas/NSSAASupport' n6Protection: - $ref: '#/components/schemas/N6Protection' + $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' + RANSliceSubnetProfile: type: object properties: coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' dLLatency: type: number uLLatency: @@ -404,6 +410,8 @@ components: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' TopSliceSubnetProfile: type: object properties: @@ -446,7 +454,7 @@ components: activityFactor: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' uEMobilityLevel: @@ -465,6 +473,8 @@ components: $ref: '#/components/schemas/NSSAASupport' n6Protection: $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' ServiceProfile: type: object @@ -522,7 +532,9 @@ components: v2XCommModels: $ref: '#/components/schemas/V2XCommModels' coverageArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: @@ -547,6 +559,8 @@ components: $ref: '#/components/schemas/NSSAASupport' n6Protection: $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' SliceProfile: type: object properties: @@ -574,7 +588,7 @@ components: enum: - VLAN - MPLS - - Segment + - SEGMENT logicalInterfaceId: type: string systemName: @@ -590,7 +604,8 @@ components: - EGP - EIGRP - BGP - - IS-IS + - IS_IS + - STATIC ConnectionPointInfo: type: object @@ -641,7 +656,7 @@ components: type: boolean RequestedReservationExpiration: description: >- - An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. + An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. type: string ResourceReservationStatus: description: >- @@ -653,7 +668,7 @@ components: - USED ReservationExpiration: description: >- - An attribute which specifes the actual validity period of the resource reservation.. + An attribute which specifies the actual validity period of the resource reservation.. type: string ReservationFailureReason: description: >- @@ -796,7 +811,7 @@ components: uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -815,6 +830,8 @@ components: $ref: '#/components/schemas/RecommendationRequest' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' + feasibilityTimeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' feasibilityResult: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f6522edc47ac1c36d41c394ede7e4e1db57fbfb1..e0434044475f90a85a411b2cd152e877fe9a13f5 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.3.0 + version: 18.4.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -1359,6 +1359,70 @@ components: - 32 - 64 - INFINITY + reportAmountM1LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.x. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM4LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.y. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM5LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.z. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM6LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.a. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM7LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.b. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY reportingTrigger-Type: description: See details in 3GPP TS 32.422 clause 5.10.4. @@ -1488,6 +1552,118 @@ components: minItems: 0 maxItems: 255 + traceConfig-Type: + description: Trace configuration parameters for NR. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfInterfaces: + $ref: '#/components/schemas/listOfInterfaces-Type' + listOfNeTypes: + $ref: '#/components/schemas/listOfNeTypes-Type' + traceDepth: + $ref: '#/components/schemas/traceDepth-Type' + triggeringEvents: + $ref: '#/components/schemas/triggeringEvents-Type' + + immediateMDTConfig-Type: + description: Immediate MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfMeasurements: + $ref: '#/components/schemas/listOfMeasurements-Type' + reportingTrigger: + $ref: '#/components/schemas/reportingTrigger-Type' + reportAmount: + $ref: '#/components/schemas/reportAmount-Type' + reportAmountM1LTE: + $ref: '#/components/schemas/reportAmountM1LTE-Type' + reportAmountM4LTE: + $ref: '#/components/schemas/reportAmountM4LTE-Type' + reportAmountM5LTE: + $ref: '#/components/schemas/reportAmountM5LTE-Type' + reportAmountM6LTE: + $ref: '#/components/schemas/reportAmountM6LTE-Type' + reportAmountM7LTE: + $ref: '#/components/schemas/reportAmountM7LTE-Type' + reportInterval: + $ref: '#/components/schemas/reportInterval-Type' + eventThreshold: + $ref: '#/components/schemas/eventThreshold-Type' + 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' + eventThresholdUphUmts: + $ref: '#/components/schemas/eventThresholdUphUmts-Type' + measurementPeriodUmts: + $ref: '#/components/schemas/measurementPeriodUmts-Type' + measurementPeriodLte: + $ref: '#/components/schemas/measurementPeriodLte-Type' + measurementQuantity: + $ref: '#/components/schemas/measurementQuantity-Type' + beamLevelMeasurement: + $ref: '#/components/schemas/beamLevelMeasurement-Type' + positioningMethod: + $ref: '#/components/schemas/positioningMethod-Type' + excessPacketDelayThresholds: + $ref: '#/components/schemas/excessPacketDelayThresholds-Type' + + loggedMDTConfig-Type: + description: Logged MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + traceCollectionEntityId: + $ref: '#/components/schemas/traceCollectionEntityId-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' + reportType: + $ref: '#/components/schemas/reportType-Type' + plmnList: + $ref: '#/components/schemas/plmnList-Type' + eventListForEventTriggeredMeasurement: + $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' + areaConfigurationForNeighCell: + $ref: '#/components/schemas/AreaConfig' + + mdtConfig-Type: + description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + anonymizationOfMdtData: + $ref: '#/components/schemas/anonymizationOfMdtData-Type' + areaScope: + type: array + items: + $ref: '#/components/schemas/AreaScope' + sensorInformation: + $ref: '#/components/schemas/sensorInformation-Type' + immediateMDTConfig: + $ref: '#/components/schemas/immediateMDTConfig-Type' + loggedMDTConfig: + $ref: '#/components/schemas/loggedMDTConfig-Type' + #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1671,18 +1847,12 @@ components: properties: 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: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: $ref: '#/components/schemas/IpAddr' - traceDepth: - $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' jobId: @@ -1691,78 +1861,10 @@ components: $ref: '#/components/schemas/traceReportingFormat-Type' traceTarget: $ref: '#/components/schemas/traceTarget-Type' - triggeringEvents: - $ref: '#/components/schemas/triggeringEvents-Type' - anonymizationOfMdtData: - $ref: '#/components/schemas/anonymizationOfMdtData-Type' - areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' - areaScope: - type: array - items: - $ref: '#/components/schemas/AreaScope' - beamLevelMeasurement: - $ref: '#/components/schemas/beamLevelMeasurement-Type' - 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' - 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' - excessPacketDelayThresholds: - $ref: '#/components/schemas/excessPacketDelayThresholds-Type' + traceConfig: + $ref: '#/components/schemas/traceConfig-Type' + mdtConfig: + $ref: '#/components/schemas/mdtConfig-Type' ManagedFunction-ncO: type: object