Commit bf7ea1fb authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0790

parents a9377fc8 d15a0d03

OpenAPI/TS28541_5GcNrm.yaml

+42 −4
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ components: 
        fqdn:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn'





    SeppInfo:

      description: Information of a SEPP Instance

      type: object
@@ -863,6 +864,45 @@ components: 
            $ref: '#/components/schemas/TaiRange'

          minItems: 1



    NwdafCapability:

      description: Indicates the capability supported by the NWDAF

      type: object

      properties:

        analyticsAggregation:

          type: boolean

          default: false

        analyticsMetadataProvisioning:

          type: boolean

          default: false

    MlAnalyticsInfo:

      description: ML Analytics Filter information supported by the Nnwdaf_MLModelProvision service

      type: object

      properties:

        mlAnalyticsIds:

          type: array

          items:

            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'

          minItems: 1

        snssaiList:

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

        trackingAreaList:

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



    NwdafInfo:

      description: Information of a NWDAF NF Instance

      type: object

      properties:

        eventIds:

          type: array

          items:

            $ref: 'TS29520_Nnwdaf_AnalyticsInfo.yaml#/components/schemas/EventId'

          minItems: 1          

        nwdafEvents:

          type: array

          items:

            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'

          minItems: 1



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

    ProvMnS:

      oneOf:
@@ -1605,12 +1645,10 @@ components: 
                      $ref: '#/components/schemas/CommModelList'

                    networkSliceInfoList:

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

                    nwdafEvents:

                      type: array

                      items:

                        $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'

                    administrativeState:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

                    nwdafInfo:

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

                      

    ScpFunction-Single:

      allOf:

OpenAPI/TS29520_Nnwdaf_AnalyticsInfo.yaml

0 → 100644
+717 −0

File added.

Preview size limit exceeded, changes collapsed.