Commit e57ca17f authored by lengyelb's avatar lengyelb
Browse files

Locally rebased and merged MR1067

parent 40971776

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

+20 −1
Original line number Diff line number Diff line
@@ -13,10 +13,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 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

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

    TTA, TTC). All rights reserved.";

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

  

  revision 2024-04-04 { reference CR-1139; }

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2022-01-07 { reference CR-0643; }

  revision 2020-11-06 { reference CR-0412 ; }
@@ -224,6 +225,24 @@ module _3gpp-5gc-nrm-amffunction { 
      uses satelliteBackhaulInfo;

    }



    leaf-list mdtUserConsentReqList {

      type enumeration {

        enum M1;

        enum M2;

        enum M3;

        enum M4;

        enum M5;

        enum M6;

        enum M7;

        enum M8;

        enum M9;

        enum MDT_UE_LOCATION;

      }

      description "represents a list of MDT measurement names that are

        subject to user consent at MDT activation.

        Any MDT measurement, whose name is not specified in this list, is not 

        subject to user consent at MDT activation.";

    }

  }

  

  augment "/me3gpp:ManagedElement" {

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

+21 −1
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ module _3gpp-5gc-nrm-udmfunction { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the UDM function in 5GC. For more 

    information about the UDM, see 3GPP TS 23.501.

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";

  

  revision 2024-04-04 { reference CR-1139; }

  revision 2023-09-18 { reference CR-1043 ; } 

  revision 2023-04-26 { reference CR-0916; }

  revision 2020-11-08 { reference CR-0412 ; }
@@ -74,6 +75,25 @@ module _3gpp-5gc-nrm-udmfunction { 
      reference "3GPP TS 23.501";

      uses types5g3gpp:CommModel;

    }



    leaf-list mdtUserConsentReqList {

      type enumeration {

        enum M1;

        enum M2;

        enum M3;

        enum M4;

        enum M5;

        enum M6;

        enum M7;

        enum M8;

        enum M9;

        enum MDT_UE_LOCATION;

      }

      description "represents a list of MDT measurement names that are

        subject to user consent at MDT activation.

        Any MDT measurement, whose name is not specified in this list, is not 

        subject to user consent at MDT activation.";

    }

  }

  

  augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang

+20 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
    TTA, TTC). All rights reserved.";

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



  revision 2024-04-04 { reference CR-1139; }

  revision 2024-02-24 { reference CR-1218; } 

  revision 2024-01-12 { reference CR-1138; }

  revision 2023-09-18 { reference CR-1043; }
@@ -154,6 +155,25 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      uses QceIdMappingInfoGrp;

      leaf idx { type string; }

    }



    leaf-list mdtUserConsentReqList {

      type enumeration {

        enum M1;

        enum M2;

        enum M3;

        enum M4;

        enum M5;

        enum M6;

        enum M7;

        enum M8;

        enum M9;

        enum MDT_UE_LOCATION;

      }

      description "represents a list of MDT measurement names that are

        subject to user consent at MDT activation.

        Any MDT measurement, whose name is not specified in this list, is not 

        subject to user consent at MDT activation.";

    }

  }



  grouping QceIdMappingInfoGrp {