Commit 8489ead9 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.541_Rel17_CR0968_Removing_redundant_Tai_definition_in_NR_NRM' into 'Integration_Rel17_SA5_150_YAML'

Ts28.541 rel17 cr0968 removing redundant tai definition in nr nrm

See merge request !701
parents 6f12efd2 1ea29cb9

OpenAPI/TS28541_5GcNrm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ components: 
    TACList:

      type: array

      items:

        $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac'

        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

    WeightFactor:

      type: integer

    UdmInfo:
@@ -648,7 +648,7 @@ components: 
    TaiList:

      type: array

      items:

        $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' 

        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' 



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

    ProvMnS:

OpenAPI/TS28541_NrNrm.yaml

+6 −14
Original line number Diff line number Diff line
@@ -97,30 +97,22 @@ components: 
      type: integer

      maximum: 503

    NrTac:

      type: integer

      maximum: 16777215

      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

    NrTacList:

      type: array

      items:

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

    Tai:

      type: object

      properties:

        plmnId:

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

        nrTac:

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

        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

    TaiList:

      type: array

      items:

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

        $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' 

    BackhaulAddress:

      type: object

      properties:

        gnbId:

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

        tai:

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

          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'

    MappingSetIDBackhaulAddress:

      type: object

      properties:
@@ -930,7 +922,7 @@ components: 
                    nrPci:

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

                    nrTac:

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

                      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

                    arfcnDL:

                      type: integer

                    arfcnUL:
@@ -1009,7 +1001,7 @@ components: 
            plmnInfoList:

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

            nrTac:

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

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'



    NRFrequency-Single:

      allOf: