Commit 574329fe authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.312_Rel-18_CR0102_Add_the_solution_for_5GC_Network_Expectation-v2' into 'Integration_Rel18_SA5_150_YAML'

Ts28.312 rel 18 cr0102 add the solution for 5 gc network expectation v2

See merge request !727
parents 8aa0ad73 5a37b375

OpenAPI/TS28312_IntentExpectations.yaml

+135 −2
Original line number Diff line number Diff line
@@ -85,6 +85,35 @@ components: 
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'

      required:

        - expectationId   

    5GCNetworkExpectation:

      description: >-

        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for 5GC network delivering   

      type: object

      properties:

        expectationId:

          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

            $ref: "#/components/schemas/5GCNetworkExpectationObject"

        expectationTargets:

          type: array

          items:

            type: object

            oneOf:

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

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

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

        expectationContexts:

          type: array

          items:

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

        expectationfulfilmentInfo:

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

      required:

        - expectationId                   

   #-------Definition of the IntentExpectation dataType ----------#    



   #-------Definition of the scenario specific ExpectationObject dataType ----------#
@@ -131,6 +160,27 @@ components: 
              - $ref: '#/components/schemas/EdgeIdentificationLocContext'

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

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

    5GCNetworkExpectationObject:

      description: >-

        This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation

      type: object

      properties:

        objectType:

          type: string

          enum:

            - 5GC_SubNetwork #value for 5GC Network Expectation--#

        objectInstance:

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

        objectContexts:

          type: array

          items:

            type: object

            oneOf:

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

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

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

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

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

   #-------Definition of the ExpectationObject dataType ----------#
@@ -542,6 +592,37 @@ components: 
            - IS_LESS_THAN

        targetValueRange:

          type: integer

    MaxNumberofPDUsessionsTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget     

      type: object

      properties:

        targetName:

          type: string

          enum:

            - MaxNumberofPDUsessions

        targetCondition:

          type: string

          enum:

            - IS_LESS_THAN

        targetValueRange:

          type: integer

    MaxNumberofRegisteredsubscribersTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget     

      type: object

      properties:

        targetName:

          type: string

          enum:

            - MaxNumberofRegisteredsubscribers

        targetCondition:

          type: string

          enum:

            - IS_LESS_THAN

        targetValueRange:

          type: integer



   #-------Definition of the concrete ExpectationTarget  dataType----------#  

   

   #-------Definition of the concrete ObjectTarget dataType----------------#
@@ -726,6 +807,58 @@ components: 
            $ref: '#/components/schemas/CoverageAreaTAList'

    CoverageAreaTAList:

          type: integer

    NfTypeContext:          

      description: >-

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

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - NfType

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:

            $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType"

    NfInstanceLocationContext:          

      description: >-

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

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - NfInstanceLocation

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:

            type: string

    TaiContext:          

      description: >-

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

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - Tai

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:

            $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"



   #-------Definition of the scenario specific  ObjectTarget dataType----------------#

   

   #-------Definition of the concrete ExpectationContext dataType----------------#