Commit 850066ea authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR0965_NRM_enhancements_for_GMLCFunction' into...

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

Ts28.541 rel18 cr0965 nrm enhancements for gmlc function

See merge request !707
parents 5994befa 42ec669b
Loading
Loading
Loading
Loading
Loading
+147 −6
Original line number Diff line number Diff line
@@ -1558,6 +1558,19 @@ components:
          additionalProperties:
            $ref: '#/components/schemas/NssaafInfo'
          minProperties: 1
    GmlcInfo:
      description: Information of a GMLC NF Instance
      type: object
      properties:
        servingClientTypes:
          type: array
          items:
            $ref: '#/components/schemas/ExternalClientType'
        gmlcNumbers:
          type: array
          items:
            type: string
            pattern: '^[0-9]{5,15}$'

#-------- Definition of concrete IOCs --------------------------------------------
    ProvMnS:
@@ -1668,6 +1681,8 @@ components:
              $ref: '#/components/schemas/ChfFunction-Multiple'
            MFAFFunction:
              $ref: '#/components/schemas/MfafFunction-Multiple'
            GMLCFunction:
              $ref: '#/components/schemas/GmlcFunction-Multiple'

    AmfFunction-Single:
      allOf:
@@ -1740,8 +1755,8 @@ components:
              $ref: '#/components/schemas/EP_N26-Multiple'
            EP_NLS:
              $ref: '#/components/schemas/EP_NLS-Multiple'
            EP_NLG:
              $ref: '#/components/schemas/EP_NLG-Multiple'
            EP_NL2:
              $ref: '#/components/schemas/EP_NL2-Multiple'
            EP_N58:
              $ref: '#/components/schemas/EP_N58-Multiple'
            EP_N41:
@@ -1860,6 +1875,8 @@ components:
              $ref: '#/components/schemas/EP_S5C-Multiple'
            EP_N40:
              $ref: '#/components/schemas/EP_N40-Multiple'
            EP_N88:
              $ref: '#/components/schemas/EP_N88-Multiple'
            FiveQiDscpMappingSet:
              $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
            GtpUPathQoSMonitoringControl:
@@ -2089,6 +2106,8 @@ components:
              $ref: '#/components/schemas/EP_N13-Multiple'
            EP_N59:
              $ref: '#/components/schemas/EP_N13-Multiple'
            EP_NL6:
              $ref: '#/components/schemas/EP_NL6-Multiple'
    UdrFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2307,6 +2326,10 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                    nwdafInfo:
                      $ref: '#/components/schemas/NwdafInfo'
        - type: object
          properties:
            EP_NL3:
              $ref: '#/components/schemas/EP_NL3-Multiple'
                      
    ScpFunction-Single:
      allOf:
@@ -2392,6 +2415,9 @@ components:
          properties:
            EP_N33:
              $ref: '#/components/schemas/EP_N33-Multiple'
            EP_NL5:
              $ref: '#/components/schemas/EP_NL5-Multiple'

    NsacfFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2984,7 +3010,63 @@ components:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress'
                    remoteAddress:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'
    EP_NLG-Single:
    EP_NL2-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_NL3-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_NL5-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_NL6-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_NL9-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
@@ -3446,6 +3528,39 @@ components:
                      $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'
        - 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'
                    gmlcInfo:
                      $ref: '#/components/schemas/GmlcInfo'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            EP_NL2:
              $ref: '#/components/schemas/EP_NL2-Multiple'
            EP_NL3:
              $ref: '#/components/schemas/EP_NL3-Multiple'
            EP_NL5:
              $ref: '#/components/schemas/EP_NL5-Multiple'
            EP_NL6:
              $ref: '#/components/schemas/EP_NL6-Multiple'
            EP_NL9:
              $ref: '#/components/schemas/EP_NL9-Multiple'

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

@@ -3702,10 +3817,26 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_NLS-Single'
    EP_NLG-Multiple:
    EP_NL2-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_NL2-Single'
    EP_NL3-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_NL3-Single'
    EP_NL5-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_NL5-Single'
    EP_NL6-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_NL6-Single'
    EP_NL9-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EP_NLG-Single'
        $ref: '#/components/schemas/EP_NL9-Single'
    EP_N60-Multiple:
      type: array
      items:
@@ -3770,6 +3901,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/MfafFunction-Single'
    GmlcFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/GmlcFunction-Single'

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

@@ -3856,7 +3991,12 @@ components:
       - $ref: '#/components/schemas/EP_Rx-Single'
       - $ref: '#/components/schemas/EP_MAP_SMSC-Single'
       - $ref: '#/components/schemas/EP_NLS-Single'
       - $ref: '#/components/schemas/EP_NLG-Single'
       - $ref: '#/components/schemas/EP_NL2-Single'
       - $ref: '#/components/schemas/EP_NL3-Single'
       - $ref: '#/components/schemas/EP_NL5-Single'
       - $ref: '#/components/schemas/EP_NL6-Single'
       - $ref: '#/components/schemas/EP_NL9-Single'

       - $ref: '#/components/schemas/Configurable5QISet-Single'
       - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single'
       - $ref: '#/components/schemas/PredefinedPccRuleSet-Single'
@@ -3868,3 +4008,4 @@ components:
       - $ref: '#/components/schemas/DccfFunction-Single'
       - $ref: '#/components/schemas/ChfFunction-Single'
       - $ref: '#/components/schemas/MfafFunction-Single'
       - $ref: '#/components/schemas/GmlcFunction-Single'