Commit bf8d3de0 authored by ruiyue's avatar ruiyue
Browse files

Update 2 files

- /OpenAPI/TS28312_IntentNrm.yaml
- /OpenAPI/TS28312_IntentExpectations.yaml
parent 20d622fc
Loading
Loading
Loading
Loading
Loading
+0 −16
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ components:
          type: array
          items:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
      required:
        - expectationId
    ServiceSupportExpectation:
@@ -82,8 +80,6 @@ components:
              - $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 ----------#    
@@ -154,8 +150,6 @@ components:
          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
@@ -190,8 +184,6 @@ components:
          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
@@ -222,8 +214,6 @@ components:
            - IS_GREATER_THAN
        targetValueRange:
          type: integer
        targetFulfilmentInfo:
          $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
    AveDLRANUEThptTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget    
@@ -239,8 +229,6 @@ components:
            - IS_GREATER_THAN
        targetValueRange:
          type: integer
        targetFulfilmentInfo:
          $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"
    LowULRANUEThptRatioTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget        
@@ -260,8 +248,6 @@ components:
          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    
@@ -296,8 +282,6 @@ components:
          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      
+150 −8
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ components:
        properties:
          SubNetwork:
            $ref: '#/components/schemas/SubNetwork-Multiple'
          Intent:
            $ref: '#/components/schemas/Intent-Multiple'
          IntentHandlingFunction:
            $ref: '#/components/schemas/IntentHandlingFunction-Multiple'

    Intent-Single:
      allOf:
@@ -49,8 +49,45 @@ components:
            type: array
            items:
              $ref: "#/components/schemas/IntentContext"
          intentFulfilmentInfo:
            $ref: "#/components/schemas/FulfilmentInfo"
          observationPeriod:
            type: integer
          intentReportReference:
            $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"

    IntentReport-Single:
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'    
      - type: object
        properties:
          intentFulfilmentReport:
            type: array
            items:
              $ref: "#/components/schemas/IntentFulfilmentReport"
          intentConflictReports:
            type: array
            items:
              $ref: "#/components/schemas/IntentConflictReport"
          intentFeasibilityCheckReport:
            type: array
            items:
              $ref: "#/components/schemas/IntentFeasibilityCheckReport"            
          intentReference:
            $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"	

    IntentHandlingFunction-Single:
      allOf:
      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
      - type: object
        properties:
          intentHandlingCapabilityList:
            type: array
            items:
              $ref: "/components/schemas/IntentHandlingCapability"
          Intent:
            $ref: '#/components/schemas/Intent-Multiple'
          IntentReport:  
            $ref: '#/components/schemas/IntentReport-Multiple'

   #-------Definition of generic IOCs ----------#  

   #-------Definition of the generic IntentExpectation dataType ----------#    
@@ -75,8 +112,6 @@ components:
          type: array
          items:
            $ref: "#/components/schemas/ExpectationContext"
        expectationfulfilmentInfo:
            $ref: "#/components/schemas/FulfilmentInfo" 
      required:
        - expectationId
   #-------Definition of the generic IntentExpectation dataType ----------#    
@@ -229,6 +264,101 @@ components:
          items:
            type: number 
   #-------Definition of the concrete ExpectionContext dataType----------------#
   #-------Definition of the generic IntentFulfilmentReport dataType----------------#
    IntentFulfilmentReport:
      description: >-
        This data type is the "IntentFulfilmentReport" data type without specialisations       
      type: object
      properties:
        intentFulfilmentInfo:
          $ref: "#/components/schemas/FulfilmentInfo"
        expectationFulfilmentResult:
          type: array
          items: 
            $ref: "#/components/schemas/ExpectationFulfilmentResult"
   #-------Definition of the concrete IntentFulfilmentReport dataType----------------#

   #-------Definition of the generic ExpectationFulfilmentResult dataType----------------#
    ExpectationFulfilmentResult:
      description: >-
        This data type is the "ExpectationFulfilmentResult" data type without specialisations       
      type: object
      properties:
        expectaitonId:
          type: string
        expectationFulfilmentInfo:
          $ref: "#/components/schemas/FulfilmentInfo"
        targetFulfilmentResult:
          type: array
          items: 
            $ref: "#/components/schemas/TargetFulfilmentResult"
   #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------#

   #-------Definition of the generic TargetFulfilmentResult dataType----------------#
    TargetFulfilmentResult:
      description: >-
        This data type is the "TargetFulfilmentResult" data type without specialisations       
      type: object
      properties:
        targetName:
          type: string
        targetFulfilmentInfo:
          $ref: "#/components/schemas/FulfilmentInfo"
        targetAchievedValue:
          type: number
   #-------Definition of the concrete TargetFulfilmentResult dataType----------------#

   #-------Definition of the generic IntentConflictReport dataType----------------#
    IntentConflictReport:
      description: >-
        This data type is the "IntentConflictReport" data type without specialisations       
      type: object
      properties:
        conflictType:
          type: string
          enum:
              - INTENT_CONFLICT
              - EXPECTATION_CONFLICT
              - TARGET_CONFLICT
        conflictField:
          type: string
   #-------Definition of the concrete IntentConflictReport dataType----------------#

   #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------#
    IntentFeasibilityCheckReport:
      description: >-
        This data type is the "IntentFeasibilityCheckReport" data type without specialisations       
      type: object
      properties:
        feasibilityCheckResult:
          type: string
          enum:
              - FEASIBLE
              - INFEASIBLE
        infeasibilityReason:
          description: ->
            An attribute which is used when feasibilityCheckResult is INFEASIBLE
          type: string
   #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------#

   #-------Definition of the generic IntentHandlingCapability dataType----------------#
    IntentHandlingCapability:
      description: >-
        This data type is the "IntentHandlingCapability" data type without specialisations       
      type: object
      properties:
        intentHandlingCapabilityId:
          type: string
        supportedExpectationObjectType:
          type: string
          enum: 
            - RAN_SUBNETWORK
            - EDGE_SERVICE_SUPPORT
        supportedExpectationTargetType:
          type: array
          items:
            $ref: "#/components/schemas/ExpectationTarget"
   #-------Definition of the concrete IntentHandlingCapability dataType----------------#

   #------Definition of JSON arrays for name-contained IOCs ---------------#

@@ -241,6 +371,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/Intent-Single'    

    IntentReport-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/IntentReport-Single'
   
    IntentHandlingFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/IntentHandlingFunction-Single'


   #------Definition of JSON arrays for name-contained IOCs ---------------#
   
   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#