Commit a972103f authored by ruiyue's avatar ruiyue
Browse files

Code Moderator resolve the implementation conflict issue 

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'Rel20_CR_TS28.561_Add_Solution_for_Capability_Discovery_of_NDT_in_NDT_Collaboration'

# Conflicts:
#   OpenAPI/TS28561_NdtNrm.yaml
parents e5cd6389 2c11fda6

OpenAPI/TS28104_MdaReport.yaml

+26 −4
Original line number Diff line number Diff line
@@ -152,16 +152,38 @@ components: 
      properties:

        mobilityPerformanceIssueIdentifier:

          type: integer

        mobilityPerformanceIssueType:

          type: string

          enum:    

              - NSA_ISSUE

              - SA_ISSUE   

        mobilityPerformanceIssue:

          type: string

          enum:    

              - TOO-EARLY_HANDOVER

              - TOO-LATE_HANDOVER

              - PINGPONG_HANDOVER

              - TOO-EARLY_PSCELL_CHANGE

              - TOO-LATE_PSCELL_CHANGE

              - TOO-EARLY_PSCELL_ CONDITIONAL_CHANGE

              - TOO-LATE_PSCELL_CONDITIONAL_CHANGE        

        mobilityPerformanceIssueRootCause:

          type: string

          enum:

              - TooLongMobilityInterruptionTime

              - PoorCoverageOfTheCelledge

              - InappropriateHandoverParameters

              - TOO_LONG_MOBILITY_INTERRUPTION_TIME

              - POOR_COVERAGE_OF_THE_CELL_EDGE

              - INAPPROPRIATE_HANDOVER_PARAMETERS

              - HIGH_INTERFERENCE

              - INSUFFICIENT TRANSPORT_RESOURCES

              - CAPABILITY_ISSUE

              - Other

        mobilityPerformanceIssueLocation:

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



        recommendedActions:

          type: array

          uniqueItems: true

          items:

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

#-------- Definition of specific CoverageProblemAnalysis MDAoutput -----------------------------

    CoverageProblemAnalysisOutput:

      type: object

OpenAPI/TS28312_IntentExpectations.yaml

+134 −2
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ components: 
            oneOf:

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

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

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

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

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

      required:

        - expectationId
@@ -82,6 +84,7 @@ components: 
              - $ref: '#/components/schemas/DLThptPerUETarget'

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

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

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

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

        expectationContexts:

          type: array
@@ -90,6 +93,8 @@ components: 
            type: object

            oneOf:

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

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

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

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

      required:

        - expectationId
@@ -130,6 +135,7 @@ components: 
              - $ref: '#/components/schemas/ServiceEndTimeContext'

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

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

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

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

      required:

        - expectationId
@@ -156,6 +162,7 @@ components: 
              - $ref: '#/components/schemas/MaxNumberofRegisteredsubscribersTarget'

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

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

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

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

        expectationContexts:

          type: array
@@ -165,6 +172,7 @@ components: 
            oneOf:

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

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

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

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

      required:

        - expectationId
@@ -210,6 +218,7 @@ components: 
            type: object

            oneOf:

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

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

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

      required:

        - expectationId
@@ -266,9 +275,11 @@ components: 
              - $ref: '#/components/schemas/DlFrequencyContext'

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

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

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

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

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

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

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



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

    EdgeServiceSupportExpectationObject: 

      description: >-
@@ -314,6 +325,7 @@ components: 
              - $ref: '#/components/schemas/TaiContext'

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

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

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

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

    NetworkMaintenanceExpectationObject:

      description: >-
@@ -776,6 +788,22 @@ components: 
            - IS_LESS_THAN

        targetValueRange:

          type: integer

    ServiceAvailabilityTarget:

      description: >-

        describes the service availability target for the Radio Service that the intent expectation is applied. 

        The detailed definition for service availability sees communication service availability defined in clause 3.1 of TS 22.261

      type: object

      properties:

        targetName:

          type: string

          enum:

            - ServiceAvailability

        targetCondition:

          type: string

          enum:

            - IS_GREATER_THAN

        targetValueRange:

          type: number          

    DLThptPerUETarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget. It describes the DL throughput target by the per UE for the
@@ -971,6 +999,23 @@ components: 
            - IS_LESS_THAN

        targetValueRange:

          type: integer

    LatencyTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for LatencyTarget.

        It represents the latency target for the core network service (ending at the UPF) that the 

        intent expectation is applied.

      type: object

      properties:

        targetName:

          type: string

          enum:

            - Latency

        targetCondition:

          type: string

          enum:

            - IS_LESS_THAN

        targetValueRange:

          type: integer            

    MaintenanceVersionTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance.
@@ -1109,6 +1154,24 @@ components: 
             - IS_EQUAL_TO

        contextValueRange:

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

    CivicAreaContext:

      description: >-

        It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of     civic area. 

        The civic area supports civic address (e.g. streets, districts, seats, etc.) or location label (e.g. hotel name, school name)

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - CivicArea

        contextCondition:

          type: string

          enum:

             - IS_ALL_OF

        contextValueRange:

          type: array

          items:

            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/CivicArea'

    DlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference
@@ -1326,6 +1389,24 @@ components: 
          uniqueItems: true

          items:

            type: string

    PreferredUPFContext:

      description: >-

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

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - PreferredUPF

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          type: array

          uniqueItems: true

          items:

            type: string            

    MaintenanceVersionContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version.
@@ -1478,6 +1559,25 @@ components: 
            - IS_EQUAL_TO

        contextValueRange:

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

    PrbHighLoadRatioContext:

      description: >-

        This data type describes the load condition (i.e. PrbHighLoadRatio) for the radio network 

        that the intent expectation is applied. The detailed PrbHighLoadRatio see PrbHighLoadRatio defined in TS 28.554

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - prbHighLoadRatio

        contextCondition:

          type: string

          enum:

            - IS_GREATER_THAN

        contextValueRange:

          type: integer

          description: unit is %

          minimum: 0

          maximum: 100

    SchedulingTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes
@@ -1495,6 +1595,21 @@ components: 
            - IS_ALL_OF

        contextValueRange:

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

    AssuranceDurationContext:

      description: >-

        It describes the time duration at which the radio service instance should be scheduled to be delivered and available.

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - AssuranceDuration

        contextCondition:

          type: string

          enum:

            - S_EQUAL_TO

        contextValueRange:

          type: integer

    StartTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for StartTimeContext
@@ -1525,4 +1640,21 @@ components: 
            - IS_EQUAL_TO

        contextValueRange:

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

    DecompositionAssistingContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for DecompositionAssistingContext. It describes the list of DNs of authorized intent handling functions to which intent decomposition is not recommended

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - DecompositionAssisting

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:

            type: string

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

OpenAPI/TS28312_IntentNrm.yaml

+331 −13

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/TS28561_NdtNrm.yaml

+52 −0
Original line number Diff line number Diff line
@@ -37,8 +37,13 @@ components: 
            description: >-

              It indicates the different types of NDT application use cases which the NDT is capable of undertaking..

              New values can be added to this list in future releases to support new use cases.

          collaborationSupport:

            type: boolean

            default: false

          nDTFunctionScope:

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

          supportedExternalDataList:

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

          nDTFunctionRefList:

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

          genericModellingCapabilities:
@@ -64,6 +69,10 @@ components: 
            $ref: '#/components/schemas/NDTInputDescription'

          nDTJobExecutionRequirements:

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

          reportingMethod:

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

          ndtDataGeneration:

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

          collaboratingNDT:

            description: >-

              It indicates the related NDT Job contributing as a collaborator to the executed NDT Job. It describes the DN of the collaborated NDT Job
@@ -72,6 +81,8 @@ components: 
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'

          nDTJobRefList:

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

          externalDataTypeRefList:

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

    NDTReport-Single:

      description: >-

        This IOC represents the properties of an NDT report corresponding to an NDT job
@@ -86,6 +97,15 @@ components: 
            items:

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

            description: It indicates the list of NDTOutput(s) that are provided by the NDT function as the output for any task executed in an instantiated NDT job.

          nDTCollaborationInfoList:

            type: array

            items:

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

          nDTDaenumtaGenEnaInfo:

            type: string

            enum:

              - AIML_BASED

              - NON_AIML_BASED

          nDTJobRef:

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'
@@ -230,6 +250,38 @@ components: 
            - EMBB

            - MMTC



    ReportingMethod:

      type: string

      enum:

        - STREAMING

        - NOTIFICATION  

    DataGeneration:  

      type: object

      properties:

        nDTDataGenObject:

          type: array

          uniqueItems: true

          items:

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

        dataGenType:

          type: array

          uniqueItems: true

          items:

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

        dataGenTimeWindow:

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

        dataGenQuantity:

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

    DataGenQuantity:

      type: object

      oneOf:

        - required: [ numberOfData ]

        - required: [ dataGenPeriod ]

      properties:

        numberOfData:

          type: integer

        dataGenPeriod:

          type: integer



  #------Definition of JSON arrays for name-contained IOCs ---------------#

OpenAPI/TS28623_GenericNrm.yaml

+0 −3
Original line number Diff line number Diff line
@@ -647,9 +647,6 @@ components: 
        - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'

        - $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'

        - $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'

        - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'

        - $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'

        - $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'



    ManagedElement-Single:

      allOf: