Commit 9bee5961 authored by sunse's avatar sunse
Browse files

Merge branch 'Rel19_CR_TS28.541_NRM_enhancements_to_ManagedNFProfile' into...

Merge branch 'Rel19_CR_TS28.541_NRM_enhancements_to_ManagedNFProfile' into 'Integration_Rel19_SA5_160_YAML'

Rel19 CR1490 TC28.541 enhancement to Update to ManagedNFProfile: TS28541_5GcNrm.yaml

See merge request !1644
parents cb09d7ec a5fb761a
Loading
Loading
Loading
Loading
Loading
+118 −0
Original line number Diff line number Diff line
@@ -340,6 +340,13 @@ components:
          readOnly: true
        nfType:
          $ref: '#/components/schemas/NFType'
        collocatedNfInstances:
          type: array
          uniqueItems: true
          items:
            $ref: '#/components/schemas/CollocatedNfInstance'
        nfInstanceName:
          type: string
        nfStatus:
          $ref: '#/components/schemas/NFStatus'
        plmnList:
@@ -370,6 +377,11 @@ components:
          uniqueItems: true
          items:
            $ref: '#/components/schemas/SnpnId'
        perPlmnSnssaiList:
          type: array
          uniqueItems: true
          items:
            $ref: '#/components/schemas/PlmnSnssai'
        allowedSNPNs:
          type: array
          uniqueItems: true
@@ -390,10 +402,30 @@ components:
          uniqueItems: true
          items:
            $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
        allowedRuleSet:
          description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key
          type: object
          additionalProperties:
            $ref: '#/components/schemas/RuleSet'
          minProperties: 1
        locality:
          type: string
        extLocality:
          description: >
            A map (list of key-value pairs) where a (unique) valid JSON string serves
            as key representing a type of locality
          type: object
          additionalProperties:
            type: string
          minProperties: 1
        capacity:
          type: integer
        load:
          type: integer
          minimum: 0
          maximum: 100
        loadTimeStamp:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        nfSetIdList:
          type: array
          uniqueItems: true
@@ -431,6 +463,14 @@ components:
           readOnly: true
        nfProfileChangesSupportInd:
           type: boolean
        nfProfilePartialUpdateChangesSupportInd:
          type: boolean
          default: false
          writeOnly: true
        nfProfileChangesInd:
          type: boolean
          default: false
          readOnly: true
        defaultNotificationSubscriptions:
          type: array
          uniqueItems: true
@@ -3495,6 +3535,84 @@ components:
      enum:
        - REGISTERED
        - DEREGISTERED
    CollocatedNfInstance:
      description: Information of an collocated NF Instance registered in the NRF
      type: object
      required:
        - nfInstanceId
        - nfType
      properties:
        nfInstanceId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
        nfType:
          $ref: '#/components/schemas/NFType'
    PlmnSnssai:
      description: List of network slices (S-NSSAIs) for a given PLMN ID
      type: object
      required:
        - plmnId
        - sNssaiList
      properties:
        plmnId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
        sNssaiList:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
          minItems: 1
        nid:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid'
    RuleSet:
      type: object
      required:
        - priority
        - action
      properties:
        priority:
          type: integer
          minimum: 0
          maximum: 65535
        plmns:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId'
        snpns:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid'
        nfTypes:
          type: array
          uniqueItems: true
          items:
            $ref: '#/components/schemas/NFType'
        nfDomains:
          type: array
          uniqueItems: true
          items:
            type: string
        nssais:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai'
        nfInstances:
          type: array
          uniqueItems: true
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId'
        scopes:
          type: array
          uniqueItems: true
          items:
            type: string
        action:
          type: string
          enum:
            - ALLOW
            - DENY

#-------- Definition of types for name-containments ------
    SubNetwork-ncO-5GcNrm: