Commit 72cacc21 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.312_Rel-17_CR0096_Update_satge3_to_align_with_stage2' into... 

Merge branch 'TS28.312_Rel-17_CR0096_Update_satge3_to_align_with_stage2' into 'Integration_Rel17_SA5_150_YAML'

Update satge3 to align with stage2

See merge request !728
parents 0e4fab74 b15ba5db

OpenAPI/TS28312_IntentExpectations.yaml

+9 −12
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

        expectationObject:

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

        expectationTargets:

          type: array
@@ -38,6 +36,7 @@ components: 
              - $ref: "#/components/schemas/AveDLRANUEThptTarget"

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

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

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

        expectationContexts:

          type: array

          items:
@@ -55,9 +54,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:
@@ -110,7 +107,7 @@ components: 
              - $ref: "#/components/schemas/PLMNContext"

              - $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 +116,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 +127,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

+2 −5
Original line number Diff line number Diff line
@@ -63,9 +63,7 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

        expectationObject:

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

        expectationTargets:

          type: array
@@ -92,7 +90,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: