Commit 4267f5d1 authored by ruiyue's avatar ruiyue
Browse files

Merge branch...

Merge branch 'TS28.541_Rel17_CR1275_Update_the_definition_for_NRNetwork_and_EUtraNetwork' into 'Integration_Rel17_SA5_156_YAML'

TS28.541 Rel17 CR1275 Update_the_definition_for_NRNetwork_and_EUtraNetwork

See merge request !1274
parents be0e7e68 4ea9cba0
Loading
Loading
Loading
Loading
Loading
+27 −2
Original line number Diff line number Diff line
@@ -882,7 +882,10 @@ components:
              $ref: '#/components/schemas/DMROFunction-Single'
            DLBOFunction:
              $ref: '#/components/schemas/DLBOFunction-Single'

            NRNetwork:
              $ref: '#/components/schemas/NRNetwork-Single'
            EUtranNetwork:  
              $ref: '#/components/schemas/EUtraNetwork-Single'
    NrCellCu-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1565,6 +1568,15 @@ components:
              $ref: '#/components/schemas/EP_F1C-Multiple'
            EP_F1U:
              $ref: '#/components/schemas/EP_F1U-Multiple'
    NRNetwork-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            NRFrequency:
              $ref: '#/components/schemas/NRFrequency-Multiple'
            ExternalGnbCuCpFunction:
              $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple'
    ExternalGnbCuUpFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1635,6 +1647,15 @@ components:
                    nRFrequencyRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
    EUtraNetwork-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            EUtranFrequency:
              $ref: '#/components/schemas/EUtranFrequency-Multiple'
            ExternalENBFunction:
              $ref: '#/components/schemas/ExternalENBFunction-Multiple'
    ExternalENBFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2041,6 +2062,10 @@ components:
        - $ref: '#/components/schemas/NrCellDu-Single'
        - $ref: '#/components/schemas/NrOperatorCellDu-Single'

        - $ref: '#/components/schemas/NRNetwork-Single'
        - $ref: '#/components/schemas/EUtraNetwork-Single'


        - $ref: '#/components/schemas/NRFrequency-Single'
        - $ref: '#/components/schemas/EUtranFrequency-Single'