Commit 5d7a2f09 authored by ruiyue's avatar ruiyue
Browse files

Code moderator resolve the implementation conflict issue 

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'Rel_20_CR-0377_TS28.312_Enhancement_of_radio_network_performance_assurance_scenarios'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml
parents 4f2ebe89 34cf5031

OpenAPI/TS28312_IntentExpectations.yaml

+75 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ components: 
            oneOf:

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

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

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

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

      required:

        - expectationId
@@ -82,6 +83,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 +92,7 @@ components: 
            type: object

            oneOf:

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

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

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

      required:

        - expectationId
@@ -266,9 +269,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: >-
@@ -776,6 +781,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
@@ -1109,6 +1130,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
@@ -1478,6 +1517,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 +1553,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

OpenAPI/TS28312_IntentNrm.yaml

+85 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ components: 
        - $ref: '#/components/schemas/UEGroup'

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

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime'

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

    UEGroup:

      description: >-

        It describes the UE Group,
@@ -374,6 +375,90 @@ components: 
          enum: 

            - REDCAP_UE

            - EREDCAP_UE

    CivicArea:

      description: >-

        It describes civic area, which is represented by civic address (e.g. streets, districts, seats, etc.) or 

        location label (e.g. hotel name, school name).

      type: object

      properties:

        civicAddress:

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

        locationLabel:

          description: >-

            It describes a location label (e.g. hotel name, school name).

          type: string

    CivicAddress:

      description: Indicates a Civic address.

      type: object

      properties:

        country:

          type: string

        A1:

          type: string

        A2:

          type: string

        A3:

          type: string

        A4:

          type: string

        A5:

          type: string

        A6:

          type: string

        PRD:

          type: string

        POD:

          type: string

        STS:

          type: string

        HNO:

          type: string

        HNS:

          type: string

        LMK:

          type: string

        LOC:

          type: string

        NAM:

          type: string

        PC:

          type: string

        BLD:

          type: string

        UNIT:

          type: string

        FLR:

          type: string

        ROOM:

          type: string

        PLC:

          type: string

        PCN:

          type: string

        POBOX:

          type: string

        ADDCODE:

          type: string

        SEAT:

          type: string

        RD:

          type: string

        RDSEC:

          type: string

        RDBR:

          type: string

        RDSUBBR:

          type: string

        PRM:

          type: string

        POM:

          type: string

        usageRules:

          type: string

        method:

          type: string

        providedBy:

          type: string       

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

   

   #-------Definition of the generic ExpectationTarget dataType----------#

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:

OpenAPI/TS28623_MnSRegistryNrm.yaml

+41 −37
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ components: 


#-------- Definition of types-----------------------------------------------------

    MnsCapability:

      type: string

      oneOf:

        - type: string

          enum:

            - NR_PROVISIONING

            - 5GC_PROVISIONING
@@ -60,6 +61,9 @@ components: 
            - MNS_ACCESS_CONTROL_MANAGEMENT

            - DSO_RAPID_RECOVERY_AND_THRESHOLD_MONITORING

            - EXTERNALDATA_DISCOVERY_AND_REQUEST

        - type: string

          description: >- 

            It is used to represent the vendor extension values.

#-------- Definition of concrete IOCs --------------------------------------------          

    MnsRegistry-Single:

      allOf: