Commit cf73052c authored by sunse's avatar sunse
Browse files

Integration rel18 sa5 151 yaml (Rel18 TS28.312 CR0121)

parent 85f318b3
Loading
Loading
Loading
Loading
+9 −22
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ components:
            type: object
            oneOf:
             - $ref: '#/components/schemas/TargetAssuranceTimeContext'
             - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
             - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
      required:
        - expectationId
    RadioServiceExpectation:
@@ -76,7 +76,7 @@ components:
        expectationContexts:
          type: array
          items:
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
      required:
        - expectationId                   
    EdgeServiceSupportExpectation:
@@ -112,7 +112,7 @@ components:
              - $ref: '#/components/schemas/ServiceEndTimeContext'
              - $ref: '#/components/schemas/UEMobilityLevelContext'
              - $ref: '#/components/schemas/ResourceSharingLevelContext'
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
      required:
        - expectationId   
    5GCNetworkExpectation:
@@ -145,7 +145,7 @@ components:
            oneOf:
              - $ref: '#/components/schemas/StartTimeContext'
              - $ref: '#/components/schemas/ResourceSharingLevelContext'
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
      required:
@@ -176,7 +176,7 @@ components:
              - $ref: '#/components/schemas/UlFrequencyContext'              
              - $ref: '#/components/schemas/RATContext'
              - $ref: "#/components/schemas/UEGroupContext"
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'                                
    RadioServiceExpectationObject:
      description: >-
        This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation
@@ -195,7 +195,7 @@ components:
            oneOf:
              - $ref: '#/components/schemas/CoverageAreaPolygonContext'
              - $ref: '#/components/schemas/ServiceTypeContext'
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'
    ServiceSupportExpectationObject: 
      description: >-
        This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
@@ -215,7 +215,7 @@ components:
              - $ref: '#/components/schemas/EdgeIdenfiticationIdContext'
              - $ref: '#/components/schemas/EdgeIdentificationLocContext'
              - $ref: '#/components/schemas/CoverageAreaTAContext'   
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'   
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'   
    5GCNetworkExpectationObject:
      description: >-
        This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation
@@ -238,7 +238,7 @@ components:
              - $ref: "#/components/schemas/TaiContext"
              - $ref: "#/components/schemas/ServingScopeContext"
              - $ref: "#/components/schemas/DnnContext"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"        
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
   #-------Definition of the ExpectationObject dataType ----------#    


@@ -731,19 +731,6 @@ components:
   #-------Definition of the concrete ExpectationTarget  dataType----------#  
   
   #-------Definition of the concrete ObjectTarget dataType----------------#
    ObjectContext:
      description: >-
        This data type is the "ObjectContext" data type without specialisations        
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition'
        contextValueRange:
          type: array
          items:
            type: number 
    CoverageAreaPolygonContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext          
+11 −62
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ components:
          intentContexts:
            type: array
            items:
              $ref: '#/components/schemas/IntentContext'
              $ref: '#/components/schemas/Context'
            description: >-
              It describes the list of IntentContext(s) which represents the constraints and conditions that should apply 
              It describes the list of Context(s) which represents the constraints and conditions that should apply 
              for the entire intent even if there may be specific contexts defined for specific parts of the intent  
          intentAdminState:
            type: string
@@ -143,7 +143,7 @@ components:
        expectationContexts:
          type: array
          items:
            $ref: '#/components/schemas/ExpectationContext'
            $ref: '#/components/schemas/Context'
      required:
        - expectationId
   #-------Definition of the generic IntentExpectation dataType ----------#    
@@ -168,11 +168,10 @@ components:
        objectContexts:
          type: array
          items:
            $ref: '#/components/schemas/ObjectContext'
            $ref: '#/components/schemas/Context'
          description: >-
           It describes the list of ObjectContext(s) which represents the constraints and conditions to be 
           It describes the list of Context(s) which represents the constraints and conditions to be 
           used as filter information to identify the object(s) to which a given intentExpectation should apply.

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

   #-------Definition of the generic dataType --------------#    
@@ -282,24 +281,6 @@ components:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'                      
   #-------Definition of the generic dataType --------------#    
   
   #-------Definition of the generic IntentContext dataType --------------#    
    IntentContext:
      description: >-
        This data type is the "IntentContext" data type without specialisations
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: '#/components/schemas/Condition'
        contextValueRange:
            oneOf:
              - type: array
                items:
                  $ref: "#/components/schemas/ValueRangeType"
              - $ref: "#/components/schemas/ValueRangeType"
   #-------Definition of the generic IntentContext dataType --------------#   
   
   #-------Definition of the generic ExpectationTarget dataType----------#     
    ExpectationTarget:
      description: >-
@@ -322,29 +303,14 @@ components:
        targetContexts:
          type: array
          items:
            $ref: '#/components/schemas/TargetContext'
            $ref: '#/components/schemas/Context'
          description: It describes the list of constraints and conditions that should apply for a specific expectationTarget.
    TargetContext:
      description: >-
        This data type is the "TargetContext" data type without specialisations
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: '#/components/schemas/Condition'
        contextValueRange:
            oneOf:
              - type: array
                items:
                  $ref: "#/components/schemas/ValueRangeType"
              - $ref: "#/components/schemas/ValueRangeType"      
   #-------Definition of the generic ExpectationTarget  dataType----------#  
   
   #-------Definition of the generic ObjectContext dataType----------------#
    ObjectContext:
   #-------Definition of the generic Context dataType----------------#
    Context:
      description: >-
        This data type is the "ObjectContext" data type without specialisations        
        This data type is the "Context" data type without specialisations        
      type: object
      properties:
        contextAttribute:
@@ -357,25 +323,8 @@ components:
                items:
                  $ref: "#/components/schemas/ValueRangeType"
              - $ref: "#/components/schemas/ValueRangeType" 
   #-------Definition of the generic ObjectContext dataType----------------#
   #-------Definition of the generic Context dataType----------------#

   #-------Definition of the generic ExpectionContext dataType----------------#
    ExpectationContext:
      description: >-
        This data type is the "ExpectationContext" data type without specialisations       
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: '#/components/schemas/Condition'
        contextValueRange:
            oneOf:
              - type: array
                items:
                  $ref: "#/components/schemas/ValueRangeType"
              - $ref: "#/components/schemas/ValueRangeType" 
   #-------Definition of the concrete ExpectionContext dataType----------------#
   #-------Definition of the generic IntentFulfilmentReport dataType----------------#
    IntentFulfilmentReport:
      description: >-