Commit 08355e1d authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'Rel_19_CR_TS_28.312_Enhance_the_solution_for_RadioServiceExpectation' into 'Integration_Rel19_SA5_160_YAML'

Rel_19_CR0314_TS_28.312_Enhance_the_solution_for_RadioServiceExpectation

See merge request !1654
parents 0aaa63fa 1b1ae1a7

OpenAPI/TS28312_IntentExpectations.yaml

+8 −22
Original line number Diff line number Diff line
@@ -260,8 +260,11 @@ components: 
            type: object

            oneOf:

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

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

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

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

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

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

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

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

    EdgeServiceSupportExpectationObject: 

      description: >-
@@ -1020,7 +1023,7 @@ components: 
    CellContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for CellContext.

        It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied

        It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied

        in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells

        identified by NG-RAN CGI).

      type: object
@@ -1062,7 +1065,7 @@ components: 
    DlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference

        frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied.       

        frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied.       

      type: object

      properties:

        contextAttribute:
@@ -1081,7 +1084,7 @@ components: 
    UlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference

        frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied.       

        frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied.       

      type: object

      properties:

        contextAttribute:
@@ -1122,7 +1125,7 @@ components: 
              - NR

    UEGroupContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI])

        This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI, pLMNId])

      type: object

      properties:

        contextAttribute:
@@ -1407,23 +1410,6 @@ components: 
            - IS_EQUAL_TO

        contextValueRange:

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

    PlmnInfoContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes 

        the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing 

        feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service.

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - PlmnInfo

        contextCondition:

          type: string

          enum:

            - IS_ALL_OF

        contextValueRange:

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

    SchedulingTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes

OpenAPI/TS28312_IntentNrm.yaml

+5 −4
Original line number Diff line number Diff line
@@ -295,14 +295,15 @@ components: 
        - $ref: '#/components/schemas/UEGroup'

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

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

        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo'

    UEGroup:

      description: >-

        It describes the UE Group, which is 

        represented by specific 5QI, specific S-NSSAI, or a specific combination 

        of S-NSSAI and 5QI

        It describes the UE Group, 

        which is represented by specific 5QI, specific S-NSSAI, specific PLMNId or 

        a specific combination of S-NSSAI, 5QI and PLMNId.

      type: object

      properties:

        pLMNId:

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

        fiveQI:

          type: integer

          minimum: 0