Commit db5d505d authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.312_Rel18_CR0117_Update_the_stage3_for_intent_report_to_align_with_the_stage2_definition' into 'Integration_Rel18_SA5_151_YAML'

TS28.312_CR0117_Update_stage3_for_Intent_Report

See merge request !764
parents 9b3c4075 c710ed3c

OpenAPI/TS28312_IntentNrm.yaml

+18 −7
Original line number Diff line number Diff line
@@ -74,9 +74,10 @@ components: 
              $ref: '#/components/schemas/IntentConflictReport'

          intentFeasibilityCheckReport:

            $ref: '#/components/schemas/IntentFeasibilityCheckReport'              

          lastUpdated:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

          intentReference:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'



    IntentHandlingFunction-Single:

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -347,7 +348,17 @@ components: 
              - INTENT_CONFLICT

              - EXPECTATION_CONFLICT

              - TARGET_CONFLICT

        conflictField:

        conflictingIntent:

          description: >-

            This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        conflictingExpectation:

          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     

        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           

          type: string  

   #-------Definition of the concrete IntentConflictReport dataType----------------#
@@ -380,9 +391,7 @@ components: 
            - RAN_SUBNETWORK

            - EDGE_SERVICE_SUPPORT

        supportedExpectationTargetType:

          type: array

          items:

            $ref: "#/components/schemas/ExpectationTarget"

          type: string

   #-------Definition of the concrete IntentHandlingCapability dataType----------------#



   #------Definition of JSON arrays for name-contained IOCs ---------------#
@@ -414,6 +423,8 @@ components: 
    resources-intentNrm:

      oneOf:

       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/IntentHandlingFunction-Single'       

       - $ref: '#/components/schemas/Intent-Single'

       - $ref: '#/components/schemas/IntentReport-Single'       

   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#