Commit 30a9ed81 authored by Zu Qiang's avatar Zu Qiang 🛀
Browse files

Update 4 files 

- /yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
- /yang-models/_3gpp-5g-common-yang-types.yang
- /yang-models/_3gpp-5gc-nrm-udmfunction.yang
- /yang-models/_3gpp-5gc-nrm-amffunction.yang
parent fa1e1a06

yang-models/_3gpp-5g-common-yang-types.yang

+28 −1
Original line number Diff line number Diff line
@@ -11,10 +11,11 @@ module _3gpp-5g-common-yang-types { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "The model defines common types for 5G networks and 

    network slicing.

    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-01-12 { reference CR-1139; }

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

  revision 2023-05-10 { reference CR-0916; }

  revision 2021-08-05 { reference S5-214053/CR-0518; }
@@ -162,4 +163,30 @@ module _3gpp-5g-common-yang-types { 
    }

  }



  grouping MdtUserConsentReqGrp {

    leaf mDTMeasurementName {

      mandatory true;

      description "Specifies the unique MDT measurement names.";

      type enumeration {

        enum M1;

        enum M2;

        enum M3;

        enum M4;

        enum M5;

        enum M6;

        enum M7;

        enum M8;

        enum M9;

        enum MDT_UE_Location;

      }

    }



    leaf userConsentReq {

      type boolean;

      mandatory true;

      description "Specifies if user consent is required. 

        FALSE: the MDT measurement name is not subject to user consent.

        TRUE: the MDT measurement name is subject to user consent.";

    }

  }

}
 
 No newline at end of file

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

+9 −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-01-12 { reference CR-1139; }

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

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

  revision 2020-11-06 { reference CR-0412 ; }
@@ -77,6 +78,13 @@ module _3gpp-5gc-nrm-amffunction { 
      uses types5g3gpp:CommModel;

    }



    list mdtUserConsentReqList {

      description "represents whether an MDT measurement name specified in 

        MDT collection is subject to user consent.";

      key idx;

      uses MdtUserConsentReqGrp;

      leaf idx { type string; }

    }

  }

  

  augment "/me3gpp:ManagedElement" {

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

+10 −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-01-12 { 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,14 @@ module _3gpp-5gc-nrm-udmfunction { 
      reference "3GPP TS 23.501";

      uses types5g3gpp:CommModel;

    }

    

    list mdtUserConsentReqList {

      description "represents whether an MDT measurement name specified in 

        MDT collection is subject to user consent.";

      key idx;

      uses MdtUserConsentReqGrp;

      leaf idx { type string; }

    }

  }

  

  augment "/me3gpp:ManagedElement" {

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

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

  description "Defines the YANG mapping of the GNBCUCPFunction Information 

    Object Class (IOC) that is part of the NR Network Resource Model (NRM).

    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-01-12 { reference CR-1139; }

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

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

  revision 2022-07-28 { reference "CR-0770"; }
@@ -141,6 +142,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      description "This attribute determines whether the DAPS handover function

                   is enabled or disabled.";

    }



    list mdtUserConsentReqList {

      description "represents whether an MDT measurement name specified in 

        MDT collection is subject to user consent.";

      key idx;

      uses MdtUserConsentReqGrp;

      leaf idx { type string; }

    }

  }



  augment "/me3gpp:ManagedElement" {