Commit 60ec2ed5 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR0963_NRM_enhancements_for_AANFFunction' into...

Merge branch 'TS28.541_Rel18_CR0963_NRM_enhancements_for_AANFFunction' into 'Integration_Rel18_SA5_150_YAML'

Ts28.541 rel18 cr0963 nrm enhancements for aanf function

See merge request !709
parents 29539338 1c7981ea
Loading
Loading
Loading
Loading
Loading
+119 −1
Original line number Diff line number Diff line
@@ -1558,6 +1558,7 @@ components:
          additionalProperties:
            $ref: '#/components/schemas/NssaafInfo'
          minProperties: 1

    GmlcInfo:
      description: Information of a GMLC NF Instance
      type: object
@@ -1622,6 +1623,16 @@ components:
          items:
            $ref: '#/components/schemas/InternalGroupIdRange'
 
    AanfInfo:
      description: Represents the information relative to an AAnF NF Instance.
      type: object
      properties:
        routingIndicators:
          type: array
          items:
            type: string
            pattern: '^[0-9]{1,4}$'

#-------- Definition of concrete IOCs --------------------------------------------
    ProvMnS:
      oneOf:
@@ -1735,6 +1746,8 @@ components:
              $ref: '#/components/schemas/GmlcFunction-Multiple'
            TSCTSFFunction:
              $ref: '#/components/schemas/TsctsfFunction-Multiple'
            AANFFunction:
              $ref: '#/components/schemas/AanfFunction-Multiple'

    AmfFunction-Single:
      allOf:
@@ -2129,6 +2142,8 @@ components:
              $ref: '#/components/schemas/EP_N12-Multiple'
            EP_N13:
              $ref: '#/components/schemas/EP_N13-Multiple'
            EP_N61:
              $ref: '#/components/schemas/EP_N61-Multiple'
    UdmFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2479,6 +2494,11 @@ components:
              $ref: '#/components/schemas/EP_NL5-Multiple'
            EP_N85:
              $ref: '#/components/schemas/EP_N85-Multiple'
            EP_N62:
              $ref: '#/components/schemas/EP_N62-Multiple'
            EP_N63:
              $ref: '#/components/schemas/EP_N63-Multiple'

    NsacfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3405,6 +3425,10 @@ components:
              $ref: '#/components/schemas/EP_N5-Multiple'
            EP_N86:
              $ref: '#/components/schemas/EP_N86-Multiple'
            EP_N63:
              $ref: '#/components/schemas/EP_N63-Multiple'
            EP_N62:
              $ref: '#/components/schemas/EP_N62-Multiple'

    NssaafFunction-Single:
      allOf:
@@ -3591,6 +3615,79 @@ 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'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    pLMNInfoList:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'
                    sBIFqdn:
                      type: string
                    managedNFProfile:
                      $ref: '#/components/schemas/ManagedNFProfile'
                    commModelList:
                      $ref: '#/components/schemas/CommModelList'
                    aanfInfo:
                      $ref: '#/components/schemas/AanfInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_N61:
              $ref: '#/components/schemas/EP_N61-Multiple'
            EP_N62:
              $ref: '#/components/schemas/EP_N62-Multiple'
            EP_N63:
              $ref: '#/components/schemas/EP_N63-Multiple'
    EP_N61-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
    EP_N62-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
    EP_N63-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr'
                - type: object
                  properties:
                    localAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'


    GmlcFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3659,6 +3756,7 @@ components:
              $ref: '#/components/schemas/EP_N89-Multiple'
            EP_N96:
              $ref: '#/components/schemas/EP_N96-Multiple'

    EP_N84-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4023,6 +4121,18 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_N60-Single'
    EP_N61-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N61-Single'
    EP_N62-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N62-Single'
    EP_N63-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_N63-Single' 
    EP_Npc4-Multiple:
      type: array
      items:
@@ -4115,6 +4225,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/TsctsfFunction-Single'
    AanfFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AanfFunction-Single'

#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------

@@ -4189,6 +4303,9 @@ components:
       - $ref: '#/components/schemas/EP_N58-Single'
       - $ref: '#/components/schemas/EP_N59-Single'              
       - $ref: '#/components/schemas/EP_N60-Single'
       - $ref: '#/components/schemas/EP_N61-Single'
       - $ref: '#/components/schemas/EP_N62-Single'
       - $ref: '#/components/schemas/EP_N63-Single'
       - $ref: '#/components/schemas/EP_N84-Single'
       - $ref: '#/components/schemas/EP_N85-Single'
       - $ref: '#/components/schemas/EP_N86-Single'
@@ -4226,3 +4343,4 @@ components:
       - $ref: '#/components/schemas/MfafFunction-Single'
       - $ref: '#/components/schemas/GmlcFunction-Single'
       - $ref: '#/components/schemas/TsctsfFunction-Single'
       - $ref: '#/components/schemas/AanfFunction-Single'