Commit e64604ea authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR_1059_NRM_enhancements_for_MNPFFunction' into... 

Merge branch 'TS28.541_Rel18_CR_1059_NRM_enhancements_for_MNPFFunction' into 'Integration_Rel18_SA5_152_YAML'

TS28.541_Rel18_CR_1059_NRM_enhancements_for_MNPFFunction

See merge request !851
parents e005f936 995ed96b

OpenAPI/TS28541_5GcNrm.yaml

+113 −3
Original line number Diff line number Diff line
@@ -2738,6 +2738,17 @@ components: 
          minProperties: 1

      not:

        required: [ networkInstance, dnaiNwInstanceList ]

    MnpfInfo:

      description: Information of an MNPF Instance

      type: object

      properties:

        msisdnRanges:

          type: array

          items:

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

          minItems: 1

      required:

        - msisdnRanges



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

    ProvMnS:
@@ -2860,6 +2871,8 @@ components: 
              $ref: '#/components/schemas/MbSmfFunction-Multiple'

            MBUPFFunction:

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

            MNPFFunction:

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



    AmfFunction-Single:

      allOf:
@@ -3263,6 +3276,8 @@ components: 
              $ref: '#/components/schemas/EP_N27-Multiple'

            EP_N96:

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

            EP_SM14:

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

    NssfFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3451,6 +3466,10 @@ components: 
                    scpInfo:

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

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

        - type: object

          properties:

            EP_SM13:

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

    NefFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -4973,6 +4992,34 @@ components: 
            EP_Nmb9:

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



    MnpfFunction-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'

                    managedNFProfile:

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

                    commModelList:

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

                    mnpfInfo:

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

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

        - type: object

          properties:

            EP_SM12:

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

            EP_SM13:

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

            EP_SM14:

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

              

    EP_N3mb-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -5029,6 +5076,48 @@ components: 
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'

    EP_SM12-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_SM13-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_SM14-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 ----------------------
@@ -5397,6 +5486,18 @@ components: 
      type: array

      items:

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

    EP_SM12-Multiple:

      type: array

      items:

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

    EP_SM13-Multiple:

      type: array

      items:

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

    EP_SM14-Multiple:

      type: array

      items:

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

    Configurable5QISet-Multiple:

      type: array

      items:
@@ -5461,6 +5562,10 @@ components: 
      type: array

      items:

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

    MnpfFunction-Multiple:

      type: array

      items:

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



#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
@@ -5571,6 +5676,10 @@ components: 
       - $ref: '#/components/schemas/EP_N16mb-Single'

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



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

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

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



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

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

       - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
@@ -5588,3 +5697,4 @@ components: 
       - $ref: '#/components/schemas/BsfFunction-Single'

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

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

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