Commit 99eb07f4 authored by ruiyue's avatar ruiyue
Browse files

Merge branch '28.541_Rel17_CR0528_enhance_5GC_NRM_to_support_5G_DDNMF' into...

Merge branch '28.541_Rel17_CR0528_enhance_5GC_NRM_to_support_5G_DDNMF' into 'Integration_Rel17_SA5_138_YAML'

Enhance 5GC NRM to support 5G DDNMF

See merge request sa5/MnS!164
parents 77b17f4e 29ac6524
Loading
Loading
Loading
Loading
+82 −1
Original line number Diff line number Diff line
@@ -1108,6 +1108,34 @@ components:
            EP_N60:
              $ref: '#/components/schemas/EP_N60-Multiple'

    DDNMFFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    plmnId:
                      $ref: 'nrNrm.yaml#/components/schemas/PlmnId'
                    sBIFqdn:
                      type: string
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_N64:
              $ref: '#/components/schemas/EP_N64-Multiple'
            EP_N65:
              $ref: '#/components/schemas/EP_N65-Multiple'
            EP_N66:
              $ref: '#/components/schemas/EP_N66-Multiple'

    ExternalAmfFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -1601,6 +1629,48 @@ components:
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
    EP_N64-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
    EP_N65-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' 
    EP_N66-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    FiveQiDscpMappingSet-Single:
      allOf:
@@ -1996,7 +2066,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_N60-Single'

    EP_N64-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N64-Single'
    EP_N65-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N65-Single'
    EP_N66-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N66-Single'
    Configurable5QISet-Multiple:
      type: array
      items: