diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 886f4461d7f632a23856f11895dfd61e70fd2e40..f641734f3ff2ecf2c4e40da15d24da66f88f247d 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: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -23,10 +23,8 @@ 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: @@ -38,6 +36,7 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: @@ -46,7 +45,7 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 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 @@ -55,10 +54,8 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationObject: + $ref: "#/components/schemas/EdgeServiceSupportExpectationObject" expectationTargets: type: array items: @@ -97,7 +94,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# + - RAN_SubNetwork objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -110,16 +107,16 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" - ServiceSupportExpectationObject: + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" + EdgeServiceSupportExpectationObject: 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--# + - Service_Support objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -127,10 +124,10 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/EdgeIdentificationIdContext" + - $ref: "#/components/schemas/EdgeIdentificationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -525,9 +522,9 @@ components: - UTRAN - EUTRAN - NR - EdgeIdenfiticationIdContext: + EdgeIdentificationIdContext: 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 +539,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: @@ -580,7 +577,7 @@ components: type: integer #-------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 +592,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 +607,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 +620,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 +635,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 d310f894a5a0ecddb97c576dd815a145d889384a..1ad10359a37007e1abd61284cce0630fc63d53c1 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -44,7 +44,7 @@ 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: @@ -63,10 +63,8 @@ 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: @@ -91,8 +89,7 @@ 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-# + - EdgeService_Support #value for Service Support Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -228,7 +225,7 @@ components: type: array items: type: number - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index fdb9a540a55dabff3bc9b458f1a937fc02098858..2891cb22181abf7097022dea2f68f0af7887c5be 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.2.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -135,7 +135,7 @@ paths: patch: summary: 'Clear, acknowledge or unacknowledge a single alarm' description: >- - Clears, acknowledges or uncknowldeges a single alarm by patching the alarm + Clears, acknowledges or unacknowldeges a single alarm by patching the alarm information. A conditional acknowledge request based on the perceived severity is not supported. parameters: @@ -792,6 +792,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -834,6 +835,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -961,7 +963,7 @@ components: MergePatchAcknowledgeAlarm: description: >- Patch document acknowledging or unacknowledging a single alarm. For - acknowleding an alarm the value of ackState is ACKNOWLEDGED, for unacknowleding + acknowledging an alarm the value of ackState is ACKNOWLEDGED, for unacknowledging an alarm the value of ackState is UNACKNOWLEDGED. type: object required: diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 0690f006480c8e3018e022bfd5c27f15c057785c..27c5a23b06c4ef4e453fedc83fb888aec23477d7 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 17.1.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -179,7 +179,7 @@ components: enum: - Performance - Trace - - Anatytics + - Analytics - Proprietary FileNotificationTypes: type: string diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index f2cacf0ed384748356d3356929c7d658e9a7ee77..2bac3706e8bb5c65593ce1474623824b41040fde 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -52,7 +52,7 @@ paths: This status code shall be returned when the resource is replaced, and when the replaced resource representation is not identical to the resource representation in the request. - This status code may be retourned when the resource is updated and when the + This status code may be returned when the resource is updated and when the updated resource representation is identical to the resource representation in the request. The representation of the updated resource is returned in the response @@ -205,7 +205,7 @@ paths: description: >- This parameter specifies the attributes of the scoped resources that are returned. - required: true + required: false schema: type: array items: diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2acfb7a7e69829807a5aaf2d920bf02e77bb72a1..343062cfc1c0809ba05874aaecad28e751e45bc1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -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 UdmInfo: @@ -146,7 +146,7 @@ components: type: string SupportedDataSetId: type: string - description: any of enumrated value + description: any of enumerated value enum: - SUBSCRIPTION - POLICY @@ -187,7 +187,7 @@ components: type: string n1MessageClass: type: boolean - n2InfroamtionClass: + n2InformationClass: type: boolean versions: type: string @@ -268,7 +268,7 @@ components: type: string SEPPType: type: string - description: any of enumrated value + description: any of enumerated value enum: - CSEPP - PSEPP @@ -285,7 +285,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 @@ -528,9 +528,9 @@ components: enum: - INACTIVE - ACTIVE - activeEacThreshhold: + activeEacThreshold: type: integer - deactiveEacThreshhold: + deactiveEacThreshold: type: integer numberofUEs: type: integer @@ -648,7 +648,7 @@ components: TaiList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3907bc83568c2aef24bddcef9667379554f2bf0c..8c7a4a8a89a491bb64fc60cc62ec9c9bc1bc9470 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.11.0 + version: 17.12.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: @@ -930,7 +922,7 @@ components: nrPci: $ref: '#/components/schemas/NrPci' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer arfcnUL: @@ -1009,7 +1001,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: allOf: @@ -1160,10 +1152,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: @@ -1388,10 +1389,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: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 903cf07ff933316e3e50b93d0460ec3d27d687fb..beb653b0bf36b316384b3de1e961e336fcdca97b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.11.0 + version: 17.12.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,27 @@ 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 +53,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 +95,7 @@ components: Support: type: string enum: - - NOT SUPPORTED + - NOT_SUPPORTED - SUPPORTED DelayTolerance: type: object @@ -189,8 +186,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 +195,8 @@ components: properties: availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' UserMgmtOpen: @@ -209,7 +206,7 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' - V2XCommModels: + V2XCommMode: type: object properties: servAttrCom: @@ -322,7 +319,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: @@ -353,7 +350,7 @@ components: type: object properties: coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' dLLatency: type: number uLLatency: @@ -446,7 +443,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: @@ -519,10 +516,12 @@ components: $ref: '#/components/schemas/Positioning' userMgmtOpen: $ref: '#/components/schemas/UserMgmtOpen' - v2XCommModels: - $ref: '#/components/schemas/V2XCommModels' + v2XCommMode: + $ref: '#/components/schemas/V2XCommMode' coverageArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: @@ -574,7 +573,7 @@ components: enum: - VLAN - MPLS - - Segment + - SEGMENT logicalInterfaceId: type: string @@ -608,7 +607,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: >- @@ -620,7 +619,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: >- @@ -753,7 +752,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'