Commit 0bd66287 authored by sunse's avatar sunse
Browse files

manual fix rebase confliction

parents 29ac53b8 2952de3a
Loading
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -1622,6 +1622,7 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/InternalGroupIdRange'

    BsfInfo:
      description: Information of a BSF NF Instance
      type: object
@@ -3657,6 +3658,7 @@ components:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

    AanfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3883,6 +3885,7 @@ components:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

    BsfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3907,7 +3910,6 @@ components:
                      $ref: '#/components/schemas/BsfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'


#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    SubNetwork-Multiple: