From 8bd9d4fba88971054b46c7329d7b8855daf712ac Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 6 May 2025 13:09:10 +0000 Subject: [PATCH 1/4] Edit TS28312_IntentNrm.yaml, adding IntentUtilityFormula and associated datatypes. --- OpenAPI/TS28312_IntentNrm.yaml | 87 +++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2048c8d88..1f7931e90 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -47,6 +47,8 @@ components: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" + consumerSatisfactionIndexThreshold: + type: integer expectationSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -76,6 +78,8 @@ components: $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + intentUtilityFormulaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -93,6 +97,8 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentUtilityReport: + $ref: '#/components/schemas/IntentUtilityReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -117,11 +123,38 @@ components: $ref: '#/components/schemas/SupportedExpectationTargetInfo' uniqueItems: true minItems: 1 + supportedUtilityList: + type: array + items: + $ref: '#/components/schemas/UtilityDefinition' + uniqueItems: true Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: $ref: '#/components/schemas/IntentReport-Multiple' - + IntentUtilityFormula-Single: + description: >- + It represents an intent utility function instance. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + utilityFunctionId: + type: string + uniqueItems: true + minItems: 1 + utilityParameterList: + type: array + items: + $ref: '#/components/schemas/UtilityParameter' + uniqueItems: true + minItems: 1 + utilityScale: + type: number + minItems: 1 + utilityOffset: + type: number + minItems: 1 #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -653,6 +686,51 @@ components: - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# + + #-------Definition of the generic UtilityParameter dataType----------------# + UtilityParameter: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + parameterName: + type: string + parameterWeight: + type: number + #-------Definition of the concrete UtilityParameter dataType----------------# + + #-------Definition of the generic UtilityResult dataType----------------# + UtilityResult: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityFunctionId: + type: string + utilityResult: + type: number + #-------Definition of the concrete UtilityResult dataType----------------# + + #-------Definition of the generic UtilityDefinition dataType----------------# + UtilityDefinition: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityDefinitionId: + type: string + utilityDescription: + type: string + utilityParameterList: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/UtilityParameter' + - $ref: '#/components/schemas/UtilityParameter' + #-------Definition of the concrete UtilityDefinition dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# Intent-Multiple: @@ -670,6 +748,10 @@ components: items: $ref: '#/components/schemas/IntentHandlingFunction-Single' + IntentUtilityFormula-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentUtilityFormula-Single' #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -678,6 +760,7 @@ components: oneOf: - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentUtilityFormula-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 78ebd66d9f5ba6c653bfb856e4ba5f804ae53f10 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 6 May 2025 13:26:37 +0000 Subject: [PATCH 2/4] Edit TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 1f7931e90..7e48dc16a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -560,6 +560,20 @@ components: #-------Definition of the concrete IntentConflictReport dataType----------------# + +#-------Definition of the generic IntentUtilityReport dataType----------------# + IntentUtilityReport: + description: >- + It represents the utility function results. + type: object + properties: + utilityResults: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/UtilityResult' + #-------Definition of the concrete IntentUtilityReport dataType----------------# + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# IntentFeasibilityCheckReport: description: >- -- GitLab From 8eaced2afb71d080749a79eabc045ade81407b35 Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 6 May 2025 13:35:13 +0000 Subject: [PATCH 3/4] Edit TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 7e48dc16a..946639656 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -131,30 +131,30 @@ components: Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: - $ref: '#/components/schemas/IntentReport-Multiple' - IntentUtilityFormula-Single: - description: >- - It represents an intent utility function instance. - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - utilityFunctionId: - type: string - uniqueItems: true - minItems: 1 - utilityParameterList: - type: array - items: - $ref: '#/components/schemas/UtilityParameter' - uniqueItems: true - minItems: 1 - utilityScale: - type: number - minItems: 1 - utilityOffset: - type: number - minItems: 1 + $ref: '#/components/schemas/IntentReport-Multiple' + IntentUtilityFormula-Single: + description: >- + It represents an intent utility function instance. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + utilityFunctionId: + type: string + uniqueItems: true + minItems: 1 + utilityParameterList: + type: array + items: + $ref: '#/components/schemas/UtilityParameter' + uniqueItems: true + minItems: 1 + utilityScale: + type: number + minItems: 1 + utilityOffset: + type: number + minItems: 1 #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# -- GitLab From d07cefaefb13385dc894b21f67613f75fb63c78c Mon Sep 17 00:00:00 2001 From: scottma Date: Tue, 6 May 2025 14:05:11 +0000 Subject: [PATCH 4/4] Edit TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 946639656..4a758c4ea 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -420,6 +420,7 @@ components: - INTENT_FULFILMENT_REPORT - INTENT_CONFLICT_REPORT - INTENT_FEASIBILITY_CHECK_REPORT + - INTENT_UTILITY_REPORT reportingConditions: description: >- It indicates the specified conditions for intent reporting. @@ -567,7 +568,7 @@ components: It represents the utility function results. type: object properties: - utilityResults: + utilityResultList: type: array uniqueItems: true items: -- GitLab