Commit b32afbf3 authored by ruiyue's avatar ruiyue
Browse files

Address implementation conflict 

Merge branch 'Integration_Rel18_SA5_151_YAML' into 'TS28.541_Rel-18_CR01029_Add_YAML_solution_set_for_NRM_for_operator_specific_QoS_model_for_RAN_sharing'

# Conflicts:
#   OpenAPI/TS28541_NrNrm.yaml
parents 8bde96ed cc722a61

OpenAPI/TS28312_IntentExpectations.yaml

+88 −16
Original line number Diff line number Diff line
@@ -43,6 +43,36 @@ components: 
              - $ref: "#/components/schemas/RANEnergyConsumptionTarget"

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

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

        expectationContexts:

          type: array

          items:

            type: object

            oneOf:

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

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

      required:

        - expectationId

    RadioServiceExpectation:

      description: >-

        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio service delivering   

      type: object

      properties:

        expectationId:

          type: string

        expectationVerb:

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

        expectationObject:

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

        expectationTargets:

          type: array

          items:

            type: object

            oneOf:

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

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

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

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

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

        expectationContexts:

          type: array

          items:
@@ -140,6 +170,25 @@ components: 
              - $ref: '#/components/schemas/RATContext'

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

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

    RadioServiceExpectationObject:

      description: >-

        This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation

      type: object

      properties:

        objectType:

          type: string

          enum:

            - Radio_Service

        objectInstance:

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

        objectContexts:

          type: array

          items:

            type: object

            oneOf:

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

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

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

    ServiceSupportExpectationObject: 

      description: >-

        This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation
@@ -653,11 +702,7 @@ components: 
          enum:

            - IS_ALL_OF

        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
@@ -674,7 +719,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
@@ -768,8 +813,6 @@ components: 
          enum:

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:

          type: string

    EdgeIdentificationLocContext:

      description: >-
@@ -785,9 +828,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
@@ -804,9 +845,7 @@ components: 
        contextValueRange:

          type: array

          items:

            $ref: '#/components/schemas/CoverageAreaTAList'

    CoverageAreaTAList:

          type: integer

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

    NfTypeContext:          

      description: >-

        This data type is the "ObjectContext" data type with specialisations for NfTypeContext
@@ -862,6 +901,23 @@ components: 
   #-------Definition of the scenario specific  ObjectTarget dataType----------------#

   

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



    TargetAssuranceTimeContext:

      description: >-

        This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext       

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - TargetAssuranceTime

        contextCondition:

          type: string

          enum:

            - IS_EQUAL_TO

        contextValueRange:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' 



    ServiceStartTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext
@@ -922,4 +978,20 @@ components: 
            - IS_EQUAL_TO

        contextValueRange:

          $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"

    ServiceTypeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext       

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - ServiceType

        contextCondition:

          type: string

          enum:

            - IS_EQUAL_TO

        contextValueRange:

          $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst"



   #-------Definition of the concrete ExpectionContext dataType----------------#

OpenAPI/TS28312_IntentNrm.yaml

+45 −18
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ components: 
                - $ref: "#/components/schemas/IntentExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"  

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"              

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"                

          contextSelectivity:

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

          intentContexts:

            type: array

            items:
@@ -66,20 +70,17 @@ components: 
      - type: object

        properties:

          intentFulfilmentReport:

            type: array

            items:

            $ref: '#/components/schemas/IntentFulfilmentReport'

          intentConflictReports:

            type: array

            items:

              $ref: '#/components/schemas/IntentConflictReport'

          intentFeasibilityCheckReport:

            type: array

            items:

            $ref: '#/components/schemas/IntentFeasibilityCheckReport'              

          lastUpdated:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

          intentReference:

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



    IntentHandlingFunction-Single:

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -112,6 +113,8 @@ components: 
          type: array

          items:

            $ref: '#/components/schemas/ExpectationTarget'

        contextSelectivity:

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

        expectationContexts:

          type: array

          items:
@@ -131,8 +134,11 @@ components: 
          enum:

            - RAN_SubNetwork  #value for Radio Network Expectation--#

            - Edge_Service_Support  #value for Edge Service Support Expectation--#

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

        objectInstance:

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

        contextSelectivity:

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

        objectContexts:

          type: array

          items:
@@ -154,6 +160,12 @@ components: 
        - IS_EQUAL_TO_OR_LESS_THAN

        - IS_EQUAL_TO_OR_GREATER_THAN

        - IS_ALL_OF        

    Selectivity:

      type: string

      enum:

        - ALL_OF

        - ONE_OF

        - ANY_OF

    FulfilStatus:

      type: string

      readOnly: true
@@ -236,6 +248,8 @@ components: 
              items:

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

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

        contextSelectivity:

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

        targetContexts:

          type: array

          items:
@@ -342,13 +356,25 @@ components: 
        This data type is the "IntentConflictReport" data type without specialisations       

      type: object

      properties:

        conflictId:

          type: string

        conflictType:

          type: string

          enum:

              - INTENT_CONFLICT

              - EXPECTATION_CONFLICT

              - TARGET_CONFLICT

        conflictField:

        conflictingIntent:

          description: >-

            This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent

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

        conflictingExpectation:

          description: >-

            This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent       

          type: string     

        conflictingTarget:

          description: >-

            This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation           

          type: string  

   #-------Definition of the concrete IntentConflictReport dataType----------------#
@@ -380,10 +406,9 @@ components: 
          enum: 

            - RAN_SUBNETWORK

            - EDGE_SERVICE_SUPPORT

            - 5GC_SUBNETWORK 

        supportedExpectationTargetType:

          type: array

          items:

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

          type: string

   #-------Definition of the concrete IntentHandlingCapability dataType----------------#



   #------Definition of JSON arrays for name-contained IOCs ---------------#
@@ -415,6 +440,8 @@ components: 
    resources-intentNrm:

      oneOf:

       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/IntentHandlingFunction-Single'       

       - $ref: '#/components/schemas/Intent-Single'

       - $ref: '#/components/schemas/IntentReport-Single'       

   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#

OpenAPI/TS28541_5GcNrm.yaml

+657 −69

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28541_NrNrm.yaml

+30 −17
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ components: 
          $ref: '#/components/schemas/Sst'

        sd:

          type: string

          pattern: '^[A-Fa-f0-9]{6}$'



    PlmnIdList:

      type: array
@@ -65,13 +66,24 @@ components: 
      type: string

    NpnIdentity:

      type: object

      oneOf:

        - required: [ plmnId, cagidList ]

        - required: [ plmnId, nidList ]       

      properties:

        plmnId:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        cagidList:

          type: array

          items:

            $ref: '#/components/schemas/cagId'

          minItems: 1

          maxItems: 12  

        nidList:

          type: array

          items:

            $ref: '#/components/schemas/nid'

          minItems: 1

          maxItems: 12              

    NpnIdentityList:

      type: array

      items:
@@ -247,7 +259,7 @@ components: 
      enum:

        - DL

        - UL

        - DL and UL

        - DL_AND_UL

    BwpContext:

      type: string

      enum:
@@ -540,8 +552,8 @@ components: 
          enum:

            - RS1

            - RS2

            - RS1forEnoughMitigation

            - RS1forNotEnoughMitigation          

            - RS1_FOR_ENOUGH_MITIGATION

            - RS1_FOR_NOT_ENOUGH_MITIGATION         



    RimRSReportConf:

      type: object
@@ -582,7 +594,7 @@ components: 
        - PRB

        - PRB_UL

        - PRB_DL

        - RRC

        - RRC_CONNECTED_USERS

        - DRB    

    ParameterRange:

      type: object
@@ -834,6 +846,8 @@ components: 
            dynamic5QISetRef:

              description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported.            

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

            NrOperatorCellDu:

              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'              

    GnbCuUpFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1083,8 +1097,7 @@ components: 
              $ref: '#/components/schemas/CPCIConfigurationFunction-Single'

            DRACHOptimizationFunction:

              $ref: '#/components/schemas/DRACHOptimizationFunction-Single'

            NrOperatorCellDu:

              $ref: '#/components/schemas/NrOperatorCellDu-Multiple'



    BWPSet-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1231,7 +1244,7 @@ components: 
                    beamType:

                      type: string

                      enum:

                        - SSB-BEAM

                        - SSB_BEAM

                    beamAzimuth:

                      type: integer

                      minimum: -1800
@@ -1479,13 +1492,13 @@ components: 
                    isProbingCapable:

                      type: string

                      enum:

                         - yes

                         - no

                         - YES

                         - NO

                    energySavingState:

                      type: string

                      enum:

                         - isNotEnergySaving

                         - isEnergySaving

                         - IS_NOT_ENERGY_SAVING

                         - IS_ENERGY_SAVING



    DRACHOptimizationFunction-Single:

      allOf:
@@ -1589,13 +1602,13 @@ components: 
                    energySavingControl:

                      type: string

                      enum:

                         - toBeEnergySaving

                         - toBeNotEnergySaving

                         - TO_BE_ENERGY_SAVING

                         - TO_BE_NOT_ENERGY_SAVING

                    energySavingState:

                      type: string

                      enum:

                         - isNotEnergySaving

                         - isEnergySaving

                         - IS_NOT_ENERGY_SAVING

                         - IS_ENERGY_SAVING



    RimRSGlobal-Single:

      allOf:

OpenAPI/TS28541_SliceNrm.yaml

+35 −4
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ components: 
          $ref: '#/components/schemas/SynchronicityRANSubnet'

        sliceSimultaneousUse:

          $ref: '#/components/schemas/SliceSimultaneousUse'

        reliability:

        dLReliability:

          type: number

        uLReliability:

          type: number

        energyEfficiency:

          type: number
@@ -354,6 +356,12 @@ components: 
          $ref: '#/components/schemas/N6Protection'

        nonIPSupport:

          $ref: '#/components/schemas/NonIPSupport'

        availability:

          type: number

        maxDLDataVolume:

          type: number

        maxULDataVolume:

          type: number

    

    RANSliceSubnetProfile:

      type: object
@@ -382,7 +390,9 @@ components: 
          $ref: '#/components/schemas/XLThpt'

        uESpeed:

          type: integer

        reliability:

        dLReliability:

          type: number

        uLReliability:

          type: number

        dLMaxPktSize:

          type: integer
@@ -412,6 +422,15 @@ components: 
          $ref: '#/components/schemas/DeterministicComm'

        nonIPSupport:

          $ref: '#/components/schemas/NonIPSupport'

        availability:

          type: number

        maxDLDataVolume:

          type: number

        maxULDataVolume:

          type: number

        kPIMonitoring:

          $ref: '#/components/schemas/KPIMonitoring'



    TopSliceSubnetProfile:

      type: object

      properties:
@@ -461,7 +480,9 @@ components: 
          $ref: '#/components/schemas/MobilityLevel'

        uESpeed:

          type: integer

        reliability:

        dLReliability:

          type: number

        uLReliability:

          type: number

        dLDeterministicComm:

          $ref: '#/components/schemas/DeterministicComm'
@@ -475,6 +496,14 @@ components: 
          $ref: '#/components/schemas/N6Protection'

        nonIPSupport:

          $ref: '#/components/schemas/NonIPSupport'

        availability:

          type: number

        maxDLDataVolume:

          type: number

        maxULDataVolume:

          type: number

        kPIMonitoring:

          $ref: '#/components/schemas/KPIMonitoring'



    ServiceProfile:

      type: object
@@ -545,7 +574,9 @@ components: 
            type: integer

          survivalTime:

            type: number

          reliability:

          dLReliability:

            type: number

          uLReliability:

            type: number

          maxDLDataVolume:

            type: number