Commit 23f02342 authored by shumim's avatar shumim
Browse files

Merge branch '28.541_Rel17_CR0641_Fix_stage3_definition_for_DDNMF_141e' into...

Merge branch '28.541_Rel17_CR0641_Fix_stage3_definition_for_DDNMF_141e' into Integration_Rel17_SA5_141_YAML

Merge into 141e yaml
parents 20f63c0b 42a08cd0
Loading
Loading
Loading
Loading
Loading
+13 −7
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ components:

    DDNMFFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1696,7 +1696,7 @@ components:
                      type: boolean
    EP_N33-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1809,7 +1809,7 @@ components:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
    EP_Npc4-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1823,7 +1823,7 @@ components:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
    EP_Npc6-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1837,7 +1837,7 @@ components:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' 
    EP_Npc7-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1851,7 +1851,7 @@ components:
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'
    EP_Npc8-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -1895,7 +1895,7 @@ components:

    FiveQICharacteristics-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            fiveQIValue:
@@ -2332,6 +2332,7 @@ components:
       - $ref: '#/components/schemas/ScpFunction-Single'
       - $ref: '#/components/schemas/NefFunction-Single'
       - $ref: '#/components/schemas/NsacfFunction-Single'
       - $ref: '#/components/schemas/DDNMFFunction-Single'

       - $ref: '#/components/schemas/ExternalAmfFunction-Single'
       - $ref: '#/components/schemas/ExternalNrfFunction-Single'
@@ -2373,6 +2374,11 @@ components:
       - $ref: '#/components/schemas/EP_N60-Single'
       - $ref: '#/components/schemas/EP_Nxx-Single'

       - $ref: '#/components/schemas/EP_Npc4-Single'
       - $ref: '#/components/schemas/EP_Npc6-Single'
       - $ref: '#/components/schemas/EP_Npc7-Single'
       - $ref: '#/components/schemas/EP_Npc8-Single'

       - $ref: '#/components/schemas/EP_S5C-Single'
       - $ref: '#/components/schemas/EP_S5U-Single'
       - $ref: '#/components/schemas/EP_Rx-Single'