diff --git a/OpenAPI/README.md b/OpenAPI/README.md index d1b602dc18bfbcf2ce6987b0f7339e34371d0671..5a86008c5d7c149b834a6ac7a8e1f679c95a6840 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -1,6 +1,6 @@ # 3GPP SA5 models and MnS OpenAPI definitions -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. +(c) 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML file of each API: diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 0250ccdd0da1e321c735747b06870c4c24c94a27..758a190c8cb220a24bb0409fab189743adbe4778 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 17.2.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 8e0f871b2d39421f11a364c2798b9abc14ccb268..670f57a030cd9a96454681703affd35d37709fca 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 17.2.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report @@ -26,6 +26,11 @@ components: $ref: '#/components/schemas/MDAOutputEntry' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + analyticsWindow: + $ref: '#/components/schemas/TimeWindow' + confidenceDegree: + type: number + format: float MDAOutputEntry: type: object @@ -33,11 +38,6 @@ components: mDAOutputIEName: type: string mdaOutputIEValue: {} - analyticsWindow: - $ref: '#/components/schemas/TimeWindow' - confidenceDegree: - type: number - format: float TimeWindow: diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 77b62f5305477d6532f74ea3e3945cd49b3983be..ee7d24d299c81b0c7ce54f23bac790204528f472 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 17.3.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management @@ -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,6 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..971302e2ad556b3fb8a4d160f2d783c50b946d0d --- /dev/null +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -0,0 +1,648 @@ +openapi: 3.0.1 +info: + title: Scenario specific Intent Expectations + version: 18.0.0 + description: >- + OAS 3.0.1 definition of scenario specific Intent Expectations + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.312; Intent driven management services for mobile networks + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.312/ +paths: {} +components: + schemas: + + #-------Definition of the Scenario specific IntentExpectation dataType ----------# + RadioNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + expectationContexts: + type: array + items: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + required: + - expectationId + ServiceSupportExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/DLThptPerUETarget" + - $ref: "#/components/schemas/ULThptPerUETarget" + - $ref: "#/components/schemas/DLLatencyTarget" + - $ref: "#/components/schemas/ULLatencyTarget" + - $ref: "#/components/schemas/MaxNumberofUEsTarget" + - $ref: "#/components/schemas/ActivityFactorTarget" + - $ref: "#/components/schemas/UESpeedTarget" + - $ref: "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" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + required: + - expectationId + #-------Definition of the IntentExpectation dataType ----------# + + #-------Definition of the scenario specific ExpectationObject dataType ----------# + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation + type: object + properties: + objectType: + type: string + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $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" + ServiceSupportExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + type: object + properties: + objectType: + type: string + enum: + - Service_Support #value for 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/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/CoverageAreaTAContext" + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + + + #-------Definition of the Scenario specific ExpectationTarget dataType----------# + WeakRSRPRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget + type: object + properties: + targetName: + type: string + enum: + - WeakRSRPRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/WeakRSRPContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + WeakRSRPContext: + description: >- + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext + type: object + properties: + contextAttribute: + type: string + enum: + - WeakRSRPThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowSINRRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowSINRContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowSINRContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowSINRContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowSINRThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget + type: object + properties: + targetName: + type: string + enum: + - AveULRANUEThpt + targetCondition: + type: string + enum: + - 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 + type: object + properties: + targetName: + type: string + enum: + - AveDLRANUEThpt + targetCondition: + type: string + enum: + - 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 + type: object + properties: + targetName: + type: string + enum: + - LowULRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowULRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowULRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowULRANUEThptThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowDLRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowDLRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowDLRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowDLRANUEThptThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - DlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + ULThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - UlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + DLLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - DlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - UlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget + type: object + properties: + targetName: + type: string + enum: + - maxNumberofUEs + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget + type: object + properties: + targetName: + type: string + enum: + - activityFactor + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget + type: object + properties: + targetName: + type: string + enum: + - uESpeed + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# + + #-------Definition of the concrete ObjectTarget dataType----------------# + ObjectContext: + description: >- + This data type is the "ObjectContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + CoverageAreaPolygonContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaPolygon + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageArea" + CoverageArea: + type: string + CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaTac + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + PLMNContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for PLMNContext + type: object + properties: + contextAttribute: + type: string + enum: + - PLMN + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" + NRFqBandContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NRFqBandContext + type: object + properties: + contextAttribute: + type: string + enum: + - NRFqBand + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + RATContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for RATContext + type: object + properties: + contextAttribute: + type: string + enum: + - RAT + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + enum: + - UTRAN + - EUTRAN + - NR + EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationId + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + EdgeIdenfiticationLocContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationTarget + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + CoverageAreaTAContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext + type: object + properties: + contextAttribute: + type: string + enum: + - coverageAreaTA + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageAreaTAList" + CoverageAreaTAList: + type: integer + #-------Definition of the scenario specific ObjectTarget dataType----------------# + + #-------Definition of the concrete ExpectionContext dataType----------------# + ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceStartTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceEndTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - UEMobilityLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + ResourceSharingLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - ResourceSharingLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $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 a9fb33655fe972207551e75300cbe3b1d85b5f18..bd3c83c28bf7581e821439a186ee55e554dba9bd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Intent NRM - version: 17.3.0 + version: 18.0.0 description: >- OAS 3.0.1 definition of the Intent NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks @@ -13,7 +13,7 @@ paths: {} components: schemas: - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# SubNetwork-Single: allOf: @@ -43,17 +43,17 @@ components: type: object oneOf: - $ref: "#/components/schemas/IntentExpectation" - - $ref: "#/components/schemas/RadioNetworkExpectation" - - $ref: "#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# - #-------Definition of the IntentExpectation dataType ----------# + #-------Definition of the generic IntentExpectation dataType ----------# IntentExpectation: description: >- This data type is the "IntentExpectation" data type without specialisations @@ -76,79 +76,12 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - RadioNetworkExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - ServiceSupportExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of the IntentExpectation dataType ----------# + $ref: "#/components/schemas/FulfilmentInfo" + required: + - expectationId + #-------Definition of the generic IntentExpectation dataType ----------# - #-------Definition of the ExpectationObject dataType ----------# + #-------Definition of the generic ExpectationObject dataType ----------# ExpectationObject: description: >- This data type is the "ExpectationObject" data type without specialisations @@ -166,49 +99,8 @@ components: type: array items: $ref: "#/components/schemas/ObjectContext" - RadioNetworkExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation - type: object - properties: - objectType: - type: string - enum: - - RAN_SubNetwork #value for Radio Network Expectation--# - objectInstance: - $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" - ServiceSupportExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation - type: object - properties: - objectType: - type: string - enum: - - Service_Support #value for Radio Network Expectation--# - objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" - objectContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" - #-------Definition of the ExpectationObject dataType ----------# + + #-------Definition of the generic ExpectationObject dataType ----------# #-------Definition of the generic dataType --------------# Condition: @@ -223,13 +115,16 @@ components: - IS_NOT_ONE_OF - IS_EQUAL_TO_OR_LESS_THAN - IS_EQUAL_TO_OR_GREATER_THAN + - IS_ALL_OF FulfilStatus: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED NotFulfilledState: type: string + readOnly: true enum: - ACKNOWLEDGED - COMPLIANT @@ -250,6 +145,7 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string + readOnly: true ExpectationVerb: type: string enum: @@ -257,7 +153,7 @@ components: - ENSURE #-------Definition of the generic dataType --------------# - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# IntentContext: description: >- This data type is the "IntentContext" data type without specialisations @@ -271,9 +167,9 @@ components: type: array items: type: number - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# - #-------Definition of the ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: description: >- This data type is the "ExpectationTarget" data type without specialisations @@ -300,292 +196,9 @@ components: $ref: "#/components/schemas/Condition" contextValueRange: type: number - WeakRSRPRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget - type: object - properties: - targetName: - type: string - enum: - - WeakRSRPRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - WeakRSRPContext: - description: >- - This data type is the "TargetContext" data type with specialisations for WeakRSRPContext - type: object - properties: - contextAttribute: - type: string - enum: - - WeakRSRPThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - LowSINRRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowSINRRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowSINRContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowSINRContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowSINRThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: integer - AveULRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveULRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - AveDLRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveDLRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowULRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowULRANUEThptThreshold - contextCondition: - type: string - enum: - - Is_less_than - contextValueRange: - type: number - LowDLRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowDLRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowDLRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowDLRANUEThptThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - DLThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - DlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - ULThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - UlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - DLLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - DlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ULLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - UlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - MaxNumberofUEsTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget - type: object - properties: - targetName: - type: string - enum: - - maxNumberofUEs - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ActivityFactorTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget - type: object - properties: - targetName: - type: string - enum: - - activityFactor - targetCondition: - type: string - enum: - - IS_EQUAL_TO - targetValueRange: - type: integer - UESpeedTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget - type: object - properties: - targetName: - type: string - enum: - - uESpeed - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# ObjectContext: description: >- This data type is the "ObjectContext" data type without specialisations @@ -599,153 +212,9 @@ components: type: array items: type: number - CoverageAreaPolygonContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaPolygon - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageArea" - CoverageArea: - type: string - CoverageTACContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageTACContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaTac - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" - PLMNContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for PLMNContext - type: object - properties: - contextAttribute: - type: string - enum: - - PLMN - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" - NRFqBandContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for NRFqBandContext - type: object - properties: - contextAttribute: - type: string - enum: - - NRFqBand - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - RATContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for RATContext - type: object - properties: - contextAttribute: - type: string - enum: - - RAT - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - enum: - - UTRAN - - EUTRAN - - NR - EdgeIdenfiticationIdContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationId - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - EdgeIdenfiticationLocContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationTarget - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - CoverageAreaTAContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext - type: object - properties: - contextAttribute: - type: string - enum: - - coverageAreaTA - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageAreaTAList" - CoverageAreaTAList: - type: integer - #-------Definition of the concrete ObjectTarget dataType----------------# - - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# + + #-------Definition of the generic ExpectionContext dataType----------------# ExpectationContext: description: >- This data type is the "ExpectationContext" data type without specialisations @@ -759,72 +228,7 @@ components: type: array items: type: number - ServiceStartTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceStartTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - ServiceEndTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceEndTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - UEMobilityLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - UEMobilityLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" - ResourceSharingLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - ResourceSharingLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" #-------Definition of the concrete ExpectionContext dataType----------------# - #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -845,3 +249,4 @@ components: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# + diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index 62d44a536f1a003bed4be8186f5229b57a478faf..fdb9a540a55dabff3bc9b458f1a937fc02098858 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 7bf7ba0c8fc6c63fca864e8068ab201ccb8ef8e2..0690f006480c8e3018e022bfd5c27f15c057785c 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_HeartbeatNtf.yaml b/OpenAPI/TS28532_HeartbeatNtf.yaml index 4fb1f6d29f4edc6988b2485fc04895dfeebcd6bd..4d10cac8a24f9d4acf7cdd3d259d712db6037bd8 100755 --- a/OpenAPI/TS28532_HeartbeatNtf.yaml +++ b/OpenAPI/TS28532_HeartbeatNtf.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the heartbeat notification - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_PerfMnS.yaml b/OpenAPI/TS28532_PerfMnS.yaml index d75bcdc22ecd2ea00b1f39f3995e05af6a17c316..c2eabb541c760d2965edd6871d0c2cbac1c92329 100644 --- a/OpenAPI/TS28532_PerfMnS.yaml +++ b/OpenAPI/TS28532_PerfMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the Performance Threshold Monitoring MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 959349fdcad51794a629f4c659484aa7c64802fd..f2cacf0ed384748356d3356929c7d658e9a7ee77 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 17.2.0 + version: 17.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -396,6 +396,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' Scope: type: object properties: @@ -507,4 +508,8 @@ components: type: string path: type: string - value: {} + value: + nullable: true + required: + - op + - path diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index 3d1e82ef2baab8d5ba71713c50f9c0a9873601c8..ef587dac1330f300b2088274aee085c5bea06c97 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. servers: - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 7545b12823df2b22a5b1b15047fe0f38f66fed60..3ae269c54bb08b5d48092f98b2de857407da6868 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -5,7 +5,7 @@ info: version: 17.3.0 description: >- OAS 3.0.1 specification of the Cosla NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 75dc8c0d16f9a4495c21b57eecb587bb255d811b..8500267e734bb01379e90e8caa48d119ac5803de 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Edge NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.538; Edge NRM diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f80a355ed66a6b6d7e201b471df4c79e..7eeb11a6cfe9cb268d3fc6bc7477cadc63645662 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM @@ -972,6 +972,32 @@ components: items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + nwdafCapability: + $ref: '#/components/schemas/NwdafCapability' + analyticsDelay: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + mlAnalyticsList: + type: array + items: + $ref: '#/components/schemas/MlAnalyticsInfo' + minItems: 1 ScpInfo: description: Information of an SCP Instance @@ -1399,6 +1425,140 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + DccfInfo: + description: Specific Data for DCCF + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + + MfafInfo: + description: Information of a MFAF NF Instance + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + + ChfInfo: + description: Information of a CHF NF Instance + type: object + not: + required: [ primaryChfInstance, secondaryChfInstance ] + properties: + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + plmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 0 + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + primaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + secondaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + + NrfInfo: + description: Information of an NRF NF Instance, used in hierarchical NRF deployments + type: object + properties: + servedUdrInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdmInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAusfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $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 + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NwdafInfo' + - $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 + additionalProperties: + anyOf: + - $ref: '#/components/schemas/LmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdsfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $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 + additionalProperties: + $ref: '#/components/schemas/TrustAfInfo' + minProperties: 1 + servedNssaafInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/NssaafInfo' + minProperties: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1502,6 +1662,12 @@ components: $ref: '#/components/schemas/NssaafFunction-Multiple' AFFunction: $ref: '#/components/schemas/AfFunction-Multiple' + DCCFFunction: + $ref: '#/components/schemas/DccfFunction-Multiple' + ChfFunction: + $ref: '#/components/schemas/ChfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' AmfFunction-Single: allOf: @@ -1577,7 +1743,11 @@ components: EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: - $ref: '#/components/schemas/EP_N13-Multiple' + $ref: '#/components/schemas/EP_N58-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1688,6 +1858,8 @@ components: $ref: '#/components/schemas/EP_N16-Multiple' EP_S5C: $ref: '#/components/schemas/EP_S5C-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -1850,6 +2022,8 @@ components: $ref: '#/components/schemas/EP_N15-Multiple' EP_N16: $ref: '#/components/schemas/EP_N16-Multiple' + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' PredefinedPccRuleSet: @@ -1963,16 +2137,16 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + plmnInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' sBIFqdn: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' nFProfileList: $ref: '#/components/schemas/NFProfileList' - snssaiList: - $ref: '#/components/schemas/SnssaiList' + nrfInfo: + $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -3140,6 +3314,139 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + DccfFunction-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' + dccfInfo: + $ref: '#/components/schemas/DccfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + + MfafFunction-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' + mfafInfo: + $ref: '#/components/schemas/MfafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + + ChfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + chfInfo: + $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' + + EP_N28-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N40-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N41-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N42-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3345,6 +3652,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N27-Single' + EP_N28-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N28-Single' EP_N31-Multiple: type: array @@ -3358,6 +3669,19 @@ components: type: array items: $ref: '#/components/schemas/EP_N33-Single' + EP_N40-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N40-Single' + EP_N41-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N41-Single' + EP_N42-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N42-Single' + EP_S5C-Multiple: type: array items: @@ -3434,6 +3758,18 @@ components: type: array items: $ref: '#/components/schemas/AfFunction-Single' + DccfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/DccfFunction-Single' + ChfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ChfFunction-Single' + MfafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MfafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3496,10 +3832,15 @@ components: - $ref: '#/components/schemas/EP_N26-Single' - $ref: '#/components/schemas/EP_N27-Single' + - $ref: '#/components/schemas/EP_N28-Single' - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N40-Single' + - $ref: '#/components/schemas/EP_N41-Single' + - $ref: '#/components/schemas/EP_N42-Single' + - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' @@ -3524,4 +3865,6 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - + - $ref: '#/components/schemas/DccfFunction-Single' + - $ref: '#/components/schemas/ChfFunction-Single' + - $ref: '#/components/schemas/MfafFunction-Single' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 973445b5028ddd842daca3ec1dcd535ad736ab26..9ba9997e349b90e669584e923945deb9308022b8 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM @@ -199,16 +199,18 @@ components: type: integer NRPciList: - type: object - properties: - NRPci: - type: integer + type: array + items: + $ref: '#/components/schemas/NrPci' + minItems: 0 + maxItems: 1007 CSonPciList: - type: object - properties: - NRPci: - type: integer + type: array + items: + $ref: '#/components/schemas/NrPci' + minItems: 1 + maxItems: 100 MaximumDeviationHoTrigger: type: integer diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 3f363913da80b6007b50e5632b987afb47471209..2803d6d87b501cc81bed62b5c5b84b3d61a95765 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the Slice NRM - @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, Slice NRM @@ -163,7 +163,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' nROperatingBands: - type: string + type: array + items: + type: string Synchronicity: type: object properties: @@ -228,6 +230,8 @@ components: type: string nsName: type: string + description: + type: string EmbbEEPerfReq: type: object properties: @@ -379,7 +383,9 @@ components: uLMaxPktSize: type: integer nROperatingBands: - type: string + type: array + items: + type: string delayTolerance: $ref: '#/components/schemas/DelayTolerance' positioning: @@ -422,7 +428,9 @@ components: maxNumberOfPDUSessions: type: integer nROperatingBands: - type: string + type: array + items: + type: string sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: @@ -513,10 +521,8 @@ components: $ref: '#/components/schemas/UserMgmtOpen' v2XCommModels: $ref: '#/components/schemas/V2XCommModels' - coverageAreas: - type: array - items: - type: string + coverageArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: @@ -544,7 +550,7 @@ components: SliceProfile: type: object properties: - serviceProfileId: + sliceProfileId: type: string plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' @@ -571,6 +577,35 @@ components: - Segment logicalInterfaceId: type: string + systemName: + type: string + portName: + type: string + routingProtocol: + type: string + enum: + - RIP + - IGMP + - OSPF + - EGP + - EIGRP + - BGP + - IS-IS + + ConnectionPointInfo: + type: object + properties: + connectionPointId: + type: string + connectionPointIdType: + type: string + enum: + - VLAN + - MPLS + - SEGMENT + - IPV4 + - IPV6 + - ATTACHMENT_CIRCUIT ServiceProfileList: type: array @@ -663,6 +698,10 @@ components: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' FeasibilityCheckAndReservationJob: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' + NetworkSliceController: + $ref: '#/components/schemas/NetworkSliceController-Multiple' + NetworkSliceSubnetController: + $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' NetworkSlice-Single: @@ -682,6 +721,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' + networkSliceControllerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceSubnet-Single: allOf: @@ -714,6 +755,8 @@ components: - TOP_SLICESUBNET - RAN_SLICESUBNET - CN_SLICESUBNET + networkSliceSubnetControllerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_Transport-Single: allOf: @@ -725,15 +768,17 @@ components: properties: ipAddress: $ref: '#/components/schemas/IpAddress' - logicalInterfaceInfo: + localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' - nextHopInfo: - type: string qosProfile: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + connectionPointRefList: + type: array + items: + $ref: '#/components/schemas/ConnectionPointInfo' + NetworkSliceSubnetProviderCapabilities-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -786,6 +831,52 @@ components: recommendedRequirements: $ref: '#/components/schemas/RecommendedRequirements' + NetworkSliceController-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inputServiceProfile: + $ref: '#/components/schemas/ServiceProfile' + serviceProfileId: + type: string + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + NetworkSliceSubnetController-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inputSliceProfile: + $ref: '#/components/schemas/SliceProfile' + sliceProfileId: + type: string + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array @@ -815,7 +906,17 @@ components: type: array items: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' - + + NetworkSliceController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceController-Single' + + NetworkSliceSubnetController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: @@ -827,4 +928,7 @@ components: - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/NetworkSliceController-Single' + - $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 973f2820b95902601ac93fb0876af44d5cf8aa17..7de08a785a3903f40d8dbeab67b17d5fac4a8e02 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 17.1.0 + version: 18.1.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service - @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.550 Performance assurance diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c54fc8107a76d8cee08335863364061804cf7e3c..eb9723510a593a8eb9e5b994626292eb9ec237ba 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions @@ -166,6 +166,18 @@ components: - IDEL - ACTIVE - BUSY + AvailabilityStatus: + type: string + enum: + - IN_TEST + - FAILED + - POWER_OFF + - OFF_LINE + - OFF_DUTY + - DEPENDENCY + - DEGRADED + - NOT_INSTALLED + - LOG_FULL AttributeNameValuePairSet: description: >- diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b0d7caec8f6d95c30e7c17e015cd173dabed2ef8..f6522edc47ac1c36d41c394ede7e4e1db57fbfb1 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM @@ -1485,6 +1485,8 @@ components: - 150ms - 300ms - 500ms + minItems: 0 + maxItems: 255 #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1774,13 +1776,6 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry-Single: - type: object - properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' - - #-------- Definition of concrete IOCs -------------------------------------------- VsDataContainer-Single: @@ -2077,32 +2072,42 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' jobId: type: string + MnsRegistry-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + MnsInfo-Single: - type: object - properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - description: Resource URI as defined in the relevant Technical Specification - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - mnsScope: - description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may contain the - DN of the SubNetwork instead of the DNs of the individual managed entities within the - SubNetwork. - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + mnsScope: + description: >- + List of the managed object instances that can be accessed using the MnS. + If a complete SubNetwork can be accessed using the MnS, this attribute may + contain the DN of the SubNetwork instead of the DNs of the individual managed + entities within the SubNetwork. + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of YAML arrays for name-contained IOCs ----------------------