diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 052f0fdc81b274ceeb533cfe1daf1b8e3871c209..0295a0ff7d099ba79de6bd6d9ee8b9e43b15144f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -26,7 +26,7 @@ components: description: >- This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer. allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: userLabel: @@ -38,20 +38,20 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/IntentExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation" + - $ref: '#/components/schemas/IntentExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation' intentMgmtPurpose: - $ref: "#/components/schemas/IntentMgmtPurpose" + $ref: '#/components/schemas/IntentMgmtPurpose' contextSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: '#/components/schemas/Selectivity' consumerSatisfactionIndexThreshold: type: integer expectationSelectivity: - $ref: "#/components/schemas/Selectivity" + $ref: '#/components/schemas/Selectivity' intentContexts: type: array uniqueItems: true @@ -65,6 +65,7 @@ components: enum: - ACTIVATED - DEACTIVATED + default: ACTIVATED description: >- It describes the intent administrative state. This attribute is used when MnS consumer-suspension mechanism is supported @@ -76,7 +77,10 @@ components: intentPreemptionCapability: type: boolean intentReportControl: - $ref: '#/components/schemas/IntentReportControl' + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/IntentReportControl' implicitIntentIndex: type: boolean default: false @@ -85,9 +89,9 @@ components: intentUtilityFormulaRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: - description: It represents intent report information from MnS producer to MnS consumer. + description: It represents intent report information from MnS producer to MnS consumer. allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: intentFulfilmentReport: @@ -101,8 +105,11 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' - intentUtilityReport: - $ref: '#/components/schemas/IntentUtilityReport' + intentUtilityReports: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/IntentUtilityReport' intentFulfilmentNegotiationReport: $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: @@ -132,6 +139,8 @@ components: $ref: '#/components/schemas/Intent-Multiple' IntentReport: $ref: '#/components/schemas/IntentReport-Multiple' + IntentUtilityFormula: + $ref: '#/components/schemas/IntentUtilityFormula-Multiple' IntentUtilityFormula-Single: description: >- It represents an intent utility function instance. @@ -146,14 +155,11 @@ components: items: $ref: '#/components/schemas/UtilityParameter' uniqueItems: true - minItems: 1 utilityScale: type: number - minItems: 1 - default: 0 + default: 1 utilityOffset: type: number - minItems: 1 default: 0 #-------Definition of generic IOCs ----------# @@ -235,7 +241,7 @@ components: - IS_NOT_ONE_OF - IS_EQUAL_TO_OR_LESS_THAN - IS_EQUAL_TO_OR_GREATER_THAN - - IS_ALL_OF + - IS_ALL_OF Selectivity: type: string enum: @@ -244,7 +250,7 @@ components: - ANY_OF IntentMgmtPurpose: description: >- - It describes the MnS consumer requirements for the management purpose (required procedures) + It describes the MnS consumer requirements for the management purpose (required procedures) of the created or modified intent instance type: string enum: @@ -303,7 +309,7 @@ components: description: >- It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) and/or the frequency operating band used for a given direction (UL or DL) in FDD or - for both UL and DL directions in TDD. + for both UL and DL directions in TDD. type: object properties: arfcn: @@ -421,18 +427,15 @@ components: expectedReportTypes: description: >- It indicates the type of IntentReports. - type: string - enum: - - INTENT_FULFILMENT_REPORT - - INTENT_CONFLICT_REPORT - - INTENT_FEASIBILITY_CHECK_REPORT - - INTENT_EXPLORATION_REPORT - - INTENT_FULFILMENT_NEGOTIATION_REPORT - - INTENT_UTILITY_REPORT + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ExpectedReportType' reportingConditions: description: >- It indicates the specified conditions for intent reporting. type: array + uniqueItems: true items: $ref: '#/components/schemas/ReportingCondition' reportingTargets: @@ -444,6 +447,15 @@ components: required: - reportRecipientAddress - observationPeriod + ExpectedReportType: + type: string + enum: + - INTENT_FULFILMENT_REPORT + - INTENT_CONFLICT_REPORT + - INTENT_FEASIBILITY_CHECK_REPORT + - INTENT_EXPLORATION_REPORT + - INTENT_FULFILMENT_NEGOTIATION_REPORT + - INTENT_UTILITY_REPORT ReportingCondition: description: >- It describes the specified conditions for intent reporting. @@ -466,8 +478,8 @@ components: - type: array uniqueItems: true items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" + $ref: '#/components/schemas/ValueRangeType' + - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentReportControl dataType----------------# @@ -475,7 +487,7 @@ components: IntentFulfilmentReport: description: >- It includes the intentFulfilmentInfo and expectationFulfilmetResult. - This attribute shall be supported when intent fulfilment information is supported by IntentReport + This attribute shall be supported when intent fulfilment information is supported by IntentReport type: object properties: intentFulfilmentInfo: @@ -514,7 +526,7 @@ components: #-------Definition of the generic TargetFulfilmentResult dataType----------------# TargetFulfilmentResult: description: >- - This data type includes targetFulfilmentInfo and targetAchievedValue for each ExpectationTarget. + This data type includes targetFulfilmentInfo and targetAchievedValue for each ExpectationTarget. type: object properties: targetName: @@ -524,7 +536,7 @@ components: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: description: >- - It describes the value that has been achieved for the expectation target at the time at which + It describes the value that has been achieved for the expectation target at the time at which the report is generated. $ref: "#/components/schemas/ValueRangeType" targetContexts: @@ -534,7 +546,7 @@ components: $ref: '#/components/schemas/Context' required: - targetName - - targetFulfilmentInfo + - targetFulfilmentInfo #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -562,7 +574,7 @@ components: description: >- This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent type: string - readOnly: true + readOnly: true conflictingTarget: description: >- This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation @@ -570,7 +582,7 @@ components: readOnly: true recommendedSolutions: type: string - readOnly: true + readOnly: true enum: - MODIFY - DELETE @@ -609,6 +621,7 @@ components: infeasibilityReasons: description: An attribute which is used when feasibilityCheckResult is INFEASIBLE type: array + uniqueItems: true items: type: string readOnly: true @@ -633,6 +646,7 @@ components: readOnly: true inFeasibleTargets: type: array + uniqueItems: true items: type: string readOnly: true @@ -796,7 +810,7 @@ components: required: - intentHandlingCapabilityId - supportedExpectationObjectType - - supportedExpectationTargetInfoList + - supportedExpectationTargetInfoList SupportedExpectationTargetInfo: description: >- It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. @@ -816,7 +830,7 @@ components: $ref: '#/components/schemas/ValueRangeType' - $ref: '#/components/schemas/ValueRangeType' required: - - supportedTargetName + - supportedTargetName #-------Definition of the concrete IntentHandlingCapability dataType----------------# @@ -847,7 +861,7 @@ components: #-------Definition of the concrete UtilityResult dataType----------------# #-------Definition of the generic UtilityDefinition dataType----------------# - UtilityDefinition: + UtilityDefinition: description: >- It represents the inputs for the specified Intent Utility Function. type: object @@ -892,7 +906,7 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: - - $ref: '#/components/schemas/IntentHandlingFunction-Single' + - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - $ref: '#/components/schemas/IntentReport-Single' - $ref: '#/components/schemas/IntentUtilityFormula-Single'