Commit f3364c0a authored by sunse's avatar sunse
Browse files

Merge branch '28.541_Rel18_CR0864_NRM_enhancements_for_NSSAAFFunction' into... 

Merge branch '28.541_Rel18_CR0864_NRM_enhancements_for_NSSAAFFunction' into Integration_Rel18_SA5_147_YAML
parents 54d48ea1 47e905fe

OpenAPI/TS28541_5GcNrm.yaml

+88 −3
Original line number Diff line number Diff line
@@ -1192,6 +1192,20 @@ components: 
          items:

            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai'

          minItems: 1

    NssaafInfo:

      description: Information of a NSSAAF Instance

      type: object

      properties:

        supiRanges:

          type: array

          items:

            $ref: '#/components/schemas/SupiRange'

          minItems: 1

        internalGroupIdentifiersRanges:

          type: array

          items:

            $ref: '#/components/schemas/InternalGroupIdRange'

          minItems: 1



#-------- Definition of concrete IOCs --------------------------------------------

    ProvMnS:
@@ -1292,6 +1306,8 @@ components: 
              $ref: '#/components/schemas/EcmConnectionInfo-Multiple'

            EASDFFunction:

              $ref: '#/components/schemas/EASDFFunction-Multiple'

            NSSAAFFunction:

              $ref: '#/components/schemas/NssaafFunction-Multiple'



    AmfFunction-Single:

      allOf:
@@ -1366,6 +1382,8 @@ components: 
              $ref: '#/components/schemas/EP_NLS-Multiple'

            EP_NLG:

              $ref: '#/components/schemas/EP_NLG-Multiple'

            EP_N58:

              $ref: '#/components/schemas/EP_N13-Multiple'

    AmfSet-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -1715,6 +1733,8 @@ components: 
              $ref: '#/components/schemas/EP_N10-Multiple'

            EP_N13:

              $ref: '#/components/schemas/EP_N13-Multiple'

            EP_N59:

              $ref: '#/components/schemas/EP_N13-Multiple'

    UdrFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2869,6 +2889,59 @@ components: 
                      items:

                        $ref: '#/components/schemas/PccRule'                           



    NssaafFunction-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

                    cNSIIdList:

                      $ref: '#/components/schemas/CNSIIdList'

                    nFProfileList:

                      $ref: '#/components/schemas/NFProfileList'

                    commModelList:

                      $ref: '#/components/schemas/CommModelList'

                    nssafInfo:

                      $ref: '#/components/schemas/NssaafInfo'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    EP_N58-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_N59-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'



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



    SubNetwork-Multiple:
@@ -3147,9 +3220,18 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/EcmConnectionInfo-Single'







    NssaafFunction-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/NssaafFunction-Single'

    EP_N58-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/EP_N58-Single'

    EP_N59-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/EP_N59-Single'



#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
@@ -3216,6 +3298,8 @@ components: 
       - $ref: '#/components/schemas/EP_N31-Single'

       - $ref: '#/components/schemas/EP_N32-Single'

       - $ref: '#/components/schemas/EP_N33-Single'       

       - $ref: '#/components/schemas/EP_N58-Single'

       - $ref: '#/components/schemas/EP_N59-Single'              

       - $ref: '#/components/schemas/EP_N60-Single'

       - $ref: '#/components/schemas/EP_N88-Single'
@@ -3236,4 +3320,5 @@ components: 
       - $ref: '#/components/schemas/Dynamic5QISet-Single'

       - $ref: '#/components/schemas/EASDFFunction-Single'

       - $ref: '#/components/schemas/EcmConnectionInfo-Single'

       - $ref: '#/components/schemas/NssaafFunction-Single'