Commit 6ac91811 authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel17_SA5_152_YAML' into 'Rel-17'

SA5#151 152 OpenAPI SS changes for Rel-17

See merge request !958
parents de521826 db2a6b8c
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: MDA Report
  version: 17.4.0
  version: 17.6.0
  description: >-
    OAS 3.0.1 specification of the MDA Report
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -20,7 +20,7 @@ components:
      properties:
        mDAType:
          type: string
        mdaOutputList:
        mDAOutputList:
          type: array
          items:
            $ref: '#/components/schemas/MDAOutputEntry'
@@ -37,7 +37,7 @@ components:
      properties:
        mDAOutputIEName:
          type: string
        mdaOutputIEValue: {}
        mDAOutputIEValue: {}


    TimeWindow:
+2 −2
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 17.4.0
  version: 17.6.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -233,7 +233,7 @@ components:
                      type: array
                      items:
                        type: string
                    confidenceIndication:
                    modelConfidenceIndication:
                      type: integer
                    modelPerformanceTraining:
                      type: array
+10 −33
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Scenario specific Intent Expectations
  version: 17.5.0
  version: 17.6.0
  description: >-
    OAS 3.0.1 definition of scenario specific Intent Expectations 
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -40,7 +40,7 @@ components:
        expectationContexts:
          type: array
          items:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
      required:
@@ -78,7 +78,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"
        expectationfulfilmentInfo:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"    
      required:
@@ -107,7 +107,7 @@ components:
              - $ref: "#/components/schemas/PLMNContext"
              - $ref: "#/components/schemas/NRFqBandContext"
              - $ref: "#/components/schemas/RATContext"
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"               
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"               
    EdgeServiceSupportExpectationObject: 
      description: >-
        This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
@@ -127,7 +127,7 @@ components:
              - $ref: "#/components/schemas/EdgeIdentificationIdContext"
              - $ref: "#/components/schemas/EdgeIdentificationLocContext"
              - $ref: "#/components/schemas/CoverageAreaTAContext"   
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"   
              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context"   
   #-------Definition of the ExpectationObject dataType ----------#    


@@ -418,19 +418,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          
@@ -447,9 +434,7 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: "#/components/schemas/CoverageArea"
    CoverageArea:
      type: string
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'
    CoverageTACContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for CoverageTACContext     
@@ -466,7 +451,7 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac"
            $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac"
    PLMNContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for PLMNContext       
@@ -536,8 +521,6 @@ components:
          enum:
            - IS_EQUAL_TO
        contextValueRange:
          type: array
          items:
          type: string
    EdgeIdentificationLocContext:
      description: >-
@@ -553,9 +536,7 @@ components:
          enum:
            - IS_EQUAL_TO
        contextValueRange:
          type: array
          items:
            type: string
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate'            
    CoverageAreaTAContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext       
@@ -570,11 +551,7 @@ components:
          enum:
            - IS_ALL_OF
        contextValueRange:
          type: array
          items:
            $ref: "#/components/schemas/CoverageAreaTAList"
    CoverageAreaTAList:
          type: integer
          $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" 
   #-------Definition of the scenario specific  ObjectTarget dataType----------------#
   
   #-------Definition of the concrete ExpectationContext dataType----------------#
+8 −51
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ components:
          intentContexts:
            type: array
            items:
              $ref: "#/components/schemas/IntentContext"
              $ref: "#/components/schemas/Context"
          intentFulfilmentInfo:
            $ref: "#/components/schemas/FulfilmentInfo"
   #-------Definition of generic IOCs ----------#  
@@ -72,7 +72,7 @@ components:
        expectationContexts:
          type: array
          items:
            $ref: "#/components/schemas/ExpectationContext"
            $ref: "#/components/schemas/Context"
        expectationfulfilmentInfo:
            $ref: "#/components/schemas/FulfilmentInfo" 
      required:
@@ -95,7 +95,7 @@ components:
        objectContexts:
          type: array
          items:
            $ref: "#/components/schemas/ObjectContext"           
            $ref: "#/components/schemas/Context"           

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

@@ -150,10 +150,10 @@ components:
          - ENSURE
   #-------Definition of the generic dataType --------------#    

   #-------Definition of the generic IntentContext dataType --------------#    
    IntentContext:
   #-------Definition of the generic Context dataType --------------#    
    Context:
      description: >-
        This data type is the "IntentContext" data type without specialisations
        This data type is the "Context" data type without specialisations
      type: object
      properties:
        contextAttribute:
@@ -164,7 +164,7 @@ components:
          type: array
          items:
            type: number 
   #-------Definition of the generic IntentContext dataType --------------#   
   #-------Definition of the generic Context dataType --------------#   
   
   #-------Definition of the generic ExpectationTarget dataType----------#     
    ExpectationTarget:
@@ -181,52 +181,9 @@ components:
        targetContexts:
          type: array
          items:
            $ref: "#/components/schemas/TargetContext"
    TargetContext:
      description: >-
        This data type is the "TargetContext" data type without specialisations
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: "#/components/schemas/Condition"
        contextValueRange:
          type: number        
            $ref: "#/components/schemas/Context"
   #-------Definition of the generic ExpectationTarget  dataType----------#  

   #-------Definition of the generic ObjectContext dataType----------------#
    ObjectContext:
      description: >-
        This data type is the "ObjectContext" data type without specialisations        
      type: object
      properties:
        contextAttribute:
          type: string
        contextCondition:
          $ref: "#/components/schemas/Condition"
        contextValueRange:
          type: array
          items:
            type: number 
   #-------Definition of the generic ObjectContext 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:
          type: array
          items:
            type: number 
   #-------Definition of the concrete ExpectationContext dataType----------------#
   
   #------Definition of JSON arrays for name-contained IOCs ---------------#

    SubNetwork-Multiple:
+1 −1
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Provisioning MnS
  version: 17.5.0
  version: 17.6.0
  description: >-
    OAS 3.0.1 definition of the Provisioning MnS
    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
Loading