Commit 5289eabf authored by cintiarosa's avatar cintiarosa
Browse files

correct amfinfo and MlAnalyticsInfo to aligne with stage 2

parent a4903e45

yang-models/_3gpp-5gc-nrm-amffunction.yang

+19 −1
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-amffunction { 
  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "AMFFunction derived from basic ManagedFunction.

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,

    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2026-05-25 { reference CR-1703 ; }

  revision 2025-07-25 { reference CR-1558 ; }

  revision 2025-03-25 { reference "CR-1489 CR-1512" ; }

  revision 2024-11-01 { reference CR-1405; }
@@ -455,6 +456,23 @@ module _3gpp-5gc-nrm-amffunction { 
        NR RedCap UE;

        - TRUE: AMF supports High Latency communication e.g. for NR RedCap UE;";

    }



    leaf-list amfEvents {

      type string;

      min-elements 1;

      description "This attribute indicates AMF event types supported

        by the AMF, see TS 29.510.

        allowedValues: See clause 6.2.6.3.3 of TS 29.518 for

        AmfEventType.";

    }



    leaf-list praIdList {

      type string;

      min-elements 1;

      description "This attribute indicates the identifier of the Core

        Network predefined PRA(s) supported by the AMF, see

        TS 29.510.";

    }

  }



  grouping AMFFunctionGrp {

yang-models/_3gpp-5gc-nrm-nwdaffunction.yang

+43 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2026-05-25 { reference CR-1703 ; }

  revision 2026-05-20 { reference CR-1703 ; }

  revision 2025-07-25 { reference CR-1558 ; }

  revision 2025-03-25 { reference CR-1489 ; }
@@ -153,6 +154,48 @@ module _3gpp-5gc-nrm-nwdaffunction { 
        capability as specified in clause 5.2 of 3GPP TS 23.288.";

    }



    leaf-list vflAnalyticsIds {

      type types5g3gpp:NwdafEvent;

      min-elements 1;

      description "This attribute indicates the Analytics Id(s) (identified

        by nwdafEvent defined in TS 29.520) for which VFL is supported.

        The included Analytics Id(s) shall have the same attribute values,

        e.g. they shall share the same vflCapabilityType.";

    }



    leaf vflClientAggrCap {

      type boolean;

      default false;

      description "This attribute indicates whether a VFL client

        supporting aggregating the intermediate results of other VFL

        clients.

        This attribute shall be present if aggregating the intermediate

        results of other VFL clients is supported and the

        vflCapabilityType is set to 'VFL_CLIENT' or

        'VFL_SERVER_AND_CLIENT'.";

    }



    leaf vflInterInfo {

      type string;

      description "This attribute indicate the VFL interoperability

        indicator.

        This attribute shall be present if the NWDAF or AF supports the

        VFL interoperability for the provided Analytics Id(s). If none

        are provided the NWDAF is not allowed to perform the VFL

        operation.";

    }



    leaf-list featureId {

      type string;

      description "This attribute indicate the different feature

        information supported by the NWDAF or AF for the provided

        Analytics Id(s). Only the VFL clients and the VFL server sharing

        the same VFL interoperability indicator can understand the

        content of feature ID(s).

        This attribute shall be present if the vflCapabilityType

        attribute is present.";

    }



    list vflTimeInterval {

      key idx ;

      leaf idx { type uint32; }