Commit 8f72ecc2 authored by sunse's avatar sunse
Browse files

Merge branch...

Merge branch 'Rel19_CR1451_TS28.541_Enhance_the_OpenAPI_related_to_multiplicity_for_5GCNrm' into 'Integration_Rel19_SA5_159_YAML'

Rel19 CR1451 TS28.541 Enhance the OpenAPI related to multiplicity for 5GCNrm

See merge request !1591
parents d7fb7f07 18b8583d
Loading
Loading
Loading
Loading
Loading
+27 −3
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ components:
          type: array
          items:
            type: string
          minItems: 1
        schema:
          type: string
        nfServiceStatus:
@@ -264,6 +265,7 @@ components:
          type: array
          items: 
            $ref: '#/components/schemas/DefSubServiceInfo'
          minItems: 1
        callbackUriPrefix:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo'
    DefSubServiceInfo:
@@ -273,6 +275,7 @@ components:
          type: array
          items:
            type: string
          minItems: 1
          readOnly: true
        supportedFeatures:
          type: string
@@ -284,6 +287,7 @@ components:
          type: array
          items: 
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
          minItems: 1
        interPlmnFqdn:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'
        nfInstanceID:
@@ -343,10 +347,12 @@ components:
          type: array
          items:
            type: string
          minItems: 1
        servingScope:
          type: array
          items:
            type: string
          minItems: 1
        lcHSupportInd:
          type: boolean
          readOnly: true
@@ -357,10 +363,12 @@ components:
          type: array
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
          minItems: 1
        scpDomains:
          type: array
          items:
            type: string
          minItems: 1
        recoveryTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo'
        nfServicePersistence:
@@ -403,6 +411,7 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/SupportedFunc'
      minItems: 1
    CommModelType:
      type: string
      description: any of enumerated value
@@ -426,10 +435,12 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/CommModel'
      minItems: 1
    CapabilityList:
      type: array
      items:
        type: string
      minItems: 1
    FiveQiDscpMapping:
      type: object
      properties:
@@ -452,7 +463,7 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/NetworkSliceInfo'

      minItems: 1
    PacketErrorRate:
      type: object
      properties:
@@ -566,6 +577,7 @@ components:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation'
          minItems: 1
        traffCorreInd:
          type: boolean
          default: false
@@ -693,6 +705,7 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/NRTACRange'
          minItems: 1

    GUAMInfo:
      type: object
@@ -711,7 +724,7 @@ components:
      type: array
      items:
        type: string

      minItems: 1
    DnnSmfInfoItem:
      type: object
      properties:
@@ -744,11 +757,13 @@ components:
          type: array
          items:
            $ref: '#/components/schemas/DnnSmfInfoItem'
          minItems: 1

    5GCNfConnEcmInfoList:
      type: array
      items:
        $ref: '#/components/schemas/5GCNfConnEcmInfo'
      minItems: 1
    5GCNfConnEcmInfo:
      type: object
      description: 'Store the 5GC NF connection information'
@@ -854,10 +869,12 @@ components:
          type: array
          items:
            type: string
          minItems: 1
        hNwPubKeyIds:
          type: array
          items:
            type: integer
          minItems: 1
    SuciInfoList:
      type: array
      items:
@@ -875,6 +892,7 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/IdentityRange'
      minItems: 1
    InternalGroupIdRangeList:
      type: array
      items:
@@ -883,10 +901,12 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/SupportedDataSet'
      minItems: 1
    SharedDataIdRangeList:
      type: array
      items:
        $ref: '#/components/schemas/SharedDataIdRange'
      minItems: 1
    InterfaceUpfInfoItem:
      type: object
      properties:
@@ -1523,6 +1543,7 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/TrpInfo'
      minItems: 1

    LmfInfo:
      description: Information of an LMF NF Instance
@@ -3422,6 +3443,7 @@ components:
                      type: array
                      items:
                        $ref: '#/components/schemas/dnaiSatelliteMapping'
                      minItems: 1
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: '#/components/schemas/ManagedFunction5GC-nc0'           
        - type: object
@@ -4939,6 +4961,7 @@ components:
                      type: array
                      items:
                        $ref: '#/components/schemas/PccRule'
                      minItems: 1                           
                          
    AfFunction-Single:
      allOf:
@@ -5698,6 +5721,7 @@ components:
                  type: array
                  items:
                    $ref: '#/components/schemas/Operation'
                  minItems: 1
                administrativeState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                operationalState: