Commit aa65a5a4 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.312_Rel18_CR0097_Update_satge3_to_align_with_stage2' into... 

Merge branch 'TS28.312_Rel18_CR0097_Update_satge3_to_align_with_stage2' into 'Integration_Rel18_SA5_150_YAML'

Update 2 files

See merge request !721
parents 64b00a74 4b25a30d

OpenAPI/TS28312_IntentExpectations.yaml

+17 −19
Original line number Diff line number Diff line
@@ -22,26 +22,25 @@ components: 
        expectationId:

          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

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

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

        expectationObject:

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

        expectationTargets:

          type: array

          items:

            type: object

            oneOf:

              - $ref: "#/components/schemas/WeakRSRPRatioTarget"

              - $ref: "#/components/schemas/LowSINRRatioTarget"

              - $ref: "#/components/schemas/AveULRANUEThptTarget"

              - $ref: "#/components/schemas/AveDLRANUEThptTarget"

              - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"

              - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 

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

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

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

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

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

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

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

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

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

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

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

        expectationContexts:

          type: array

          items:
@@ -57,9 +56,7 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

        expectationObject:

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

        expectationTargets:

          type: array
@@ -97,7 +94,7 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwork #value for Radio Network Expectation--#

            - RAN_SubNetwork

        objectInstance:

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

        objectContexts:
@@ -111,6 +108,7 @@ components: 
              - $ref: '#/components/schemas/NRFqBandContext'

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

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

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

    ServiceSupportExpectationObject: 

      description: >-

        This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
@@ -119,7 +117,7 @@ components: 
        objectType:

          type: string

          enum:

            - Service_Support #value for Service Support Expectation--#

            - Service_Support 

        objectInstance:

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

        objectContexts:
@@ -130,7 +128,7 @@ components: 
              - $ref: '#/components/schemas/EdgeIdentificationIdContext'

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

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

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

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

   #-------Definition of the ExpectationObject dataType ----------#

OpenAPI/TS28312_IntentNrm.yaml

+3 −6
Original line number Diff line number Diff line
@@ -99,11 +99,9 @@ components: 
        expectationId:

          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

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

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

        expectationObject:

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

        expectationTargets:

          type: array

          items:
@@ -127,7 +125,6 @@ components: 
          enum:

            - RAN_SubNetwork  #value for Radio Network Expectation--#

            - Service_Support  #value for Service Support Expectation--#

            - TBD    #-This will be added based on defined scenario specific intent expectation-#

        objectInstance:

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

        objectContexts: