Commit 770fb1eb authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.312_Rel18_CR0184_update_5GC_Expectation' into 'Integration_Rel18_SA5_152_YAML'

TS28.312_Rel18_CR0184_update_5GC_Expectation

See merge request !899
parents 1647d04b 428c7875
Loading
Loading
Loading
Loading
Loading
+106 −4
Original line number Diff line number Diff line
@@ -135,11 +135,17 @@ components:
            oneOf:
              - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget"
              - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget"
              - $ref: "#/components/schemas/IncomingDataTarget"
              - $ref: "#/components/schemas/OutgoingDataTarget"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
        expectationContexts:
          type: array
          items:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
            type: object
            oneOf:
              - $ref: '#/components/schemas/StartTimeContext'
              - $ref: '#/components/schemas/ResourceSharingLevelContext'
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
      required:
@@ -230,7 +236,9 @@ components:
              - $ref: "#/components/schemas/NfInstanceLocationContext"
              - $ref: "#/components/schemas/PLMNContext"
              - $ref: "#/components/schemas/TaiContext"
              - $ref: "#/components/schemas/ObjectContext"            
              - $ref: "#/components/schemas/ServingScopeContext"    
              - $ref: "#/components/schemas/DnnContext"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"        
   #-------Definition of the ExpectationObject dataType ----------#    


@@ -657,6 +665,23 @@ components:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
        targetContexts:
          $ref: '#/components/schemas/5GSessionContext'
    5GSessionContext:
      description: >-
        This data type is the "TargetContext" data type with specialisations for 5GSessionContext      
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - 5GSession
        contextCondition:
          type: string
          enum:
            - IS_less_THAN
        contextValueRange:
          type: integer
    MaxNumberofRegisteredsubscribersTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget     
@@ -672,6 +697,36 @@ components:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
    IncomingDataTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget     
      type: object
      properties:
        targetName:
          type: string
          enum:
            - IncomingData
        targetCondition:
          type: string
          enum:
            - IS_LESS_THAN
        targetValueRange:
          type: integer
    OutgoingDataTarget:
      description: >-
        This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget     
      type: object
      properties:
        targetName:
          type: string
          enum:
            - OutgoingData
        targetCondition:
          type: string
          enum:
            - IS_LESS_THAN
        targetValueRange:
          type: integer

   #-------Definition of the concrete ExpectationTarget  dataType----------#  
   
@@ -912,7 +967,40 @@ components:
          type: array
          items:
            $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai"

    ServingScopeContext:          
      description: >-
        This data type is the "ObjectContext" data type with specialisations for ServingScopeContext   
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - ServingScope
        contextCondition:
          type: string
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            type: string
    DnnContext:          
      description: >-
        This data type is the "ObjectContext" data type with specialisations for DnnContext   
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - Dnn
        contextCondition:
          type: string
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            type: string
   #-------Definition of the scenario specific  ObjectTarget dataType----------------#
   
   #-------Definition of the concrete ExpectationContext dataType----------------#
@@ -1008,5 +1096,19 @@ components:
            - IS_EQUAL_TO
        contextValueRange:
          $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"

    StartTimeContext:
      description: >-
        This data type is the "ExpectationContext" data type with specialisations for StartTimeContext       
      type: object
      properties:
        contextAttribute:
          type: string
          enum:
            - StartTime
        contextCondition:
          type: string
          enum:
            - IS_EQUAL_TO
        contextValueRange:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
   #-------Definition of the concrete ExpectionContext dataType----------------#