Commit f6a779db authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.312_Rel18_CR_Rapporteur_clean_up' into 'Integration_Rel18_SA5_153_YAML' 

TS28.312 Rel18 CR0206 Rapporteur clean up

See merge request !993
parents b2f364fb 3d467d48

OpenAPI/TS28312_IntentExpectations.yaml

+5 −7
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ components: 
        expectationVerb:

           $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb'

        expectationObject:

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

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

        expectationTargets:

          type: array

          items:
@@ -146,8 +146,6 @@ components: 
              - $ref: '#/components/schemas/StartTimeContext'

              - $ref: '#/components/schemas/ResourceSharingLevelContext'

              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"

        expectationfulfilmentInfo:

            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 

      required:

        - expectationId                   

   #-------Definition of the IntentExpectation dataType ----------#
@@ -196,7 +194,7 @@ components: 
              - $ref: '#/components/schemas/CoverageAreaPolygonContext'

              - $ref: '#/components/schemas/ServiceTypeContext'

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'

    ServiceSupportExpectationObject: 

    EdgeServiceSupportExpectationObject: 

      description: >-

        This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation

      type: object
@@ -212,7 +210,7 @@ components: 
          items:

            type: object

            oneOf:

              - $ref: '#/components/schemas/EdgeIdenfiticationIdContext'

              - $ref: '#/components/schemas/EdgeIdentificationIdContext'

              - $ref: '#/components/schemas/EdgeIdentificationLocContext'

              - $ref: '#/components/schemas/CoverageAreaTAContext'   

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
@@ -801,7 +799,7 @@ components: 
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency'

    UlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext".

        This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".

        It describes the uplink frequency information (RF reference frequencies and/ or the frequency 

        operating band) supported by the RAN SubNetwork that the intent expectation is applied.       

      type: object
@@ -856,7 +854,7 @@ components: 
          type: array

          items:

            $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup"              

    EdgeIdenfiticationIdContext:

    EdgeIdentificationIdContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext      

      type: object

OpenAPI/TS28312_IntentNrm.yaml

+7 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ components: 
   #-------Definition of the generic ExpectationFulfilmentResult dataType----------------#

    ExpectationFulfilmentResult:

      description: >-

        It includes the expectationFulfilmentInfo and targetFulfilmetResults for each IntentExpectation.   

        It includes the expectationFulfilmentInfo and targetFulfilmentResults for each IntentExpectation.   

      type: object

      properties:

        expectaitonId:
@@ -389,6 +389,12 @@ components: 
          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  

        recommendedSolutions:

          type: string  

          enum:

              - MODIFY

              - DELETE



   #-------Definition of the concrete IntentConflictReport dataType----------------#



   #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------#