Commit 90a82ea5 authored by sunse's avatar sunse
Browse files

CR584 manual confliction resolution

parents 03e052e6 bf418a43
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
@@ -466,6 +466,26 @@ components:
        maxNumberofPDUSessions:
          type: integer
     
    NRTACRange:
      type: object
      properties:
        nRTACstart:
          type: string
        nRTACend:
          type: string
        nRTACpattern:
          type: string

    TaiRange:
      type: object
      properties:
        plmnId:
          $ref: 'nrNrm.yaml#/components/schemas/PlmnId'
        nRTACRangelist:
          type: array
          items:
            $ref: '#/components/schemas/NRTACRange'
    
#-------- Definition of concrete IOCs --------------------------------------------

    SubNetwork-Single:
@@ -1085,6 +1105,16 @@ components:
                      $ref: '#/components/schemas/CapabilityList'
                    isCAPIFSup:
                      type: boolean
                    taiList:
                      items:
                        $ref: 'nrNrm.yaml#/components/schemas/TaiList'
                    taiRangeList:
                      type: array
                      items:
                        $ref: '#/components/schemas/TaiRange'
                    dnai:
                      type: string

        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ components:
          $ref: '#/components/schemas/PlmnId'
        nrTac:
          $ref: '#/components/schemas/NrTac'
    TaiList:
      type: array
      items:
        $ref: '#/components/schemas/Tai' 

    BackhaulAddress:
      type: object