Commit 52cd2c6a authored by lengyelb's avatar lengyelb
Browse files

Locally rebasing and merging MR1105

parent 3d40dc00

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

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

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

    information about the NWDAF, 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-02-23 { reference CR-1219 ; } 

  revision 2023-09-17 { reference CR-1042 ; } 

  revision 2020-11-07 { reference CR-0412 ; }

  revision 2019-10-25 { reference "S5-194457 S5-195427 S5-193518"; }
@@ -128,7 +129,7 @@ module _3gpp-5gc-nrm-nwdaffunction { 
  augment "/me3gpp:ManagedElement" {

    list NWDAFFunction {

      description "5G Core NWDAF Function";

      reference "3GPP TS 28.541";

      reference "3GPP TS 28.541 3GPP TS 23.501";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

yang-models/_3gpp-common-fm.yang

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ module _3gpp-common-fm { 
      Information Service (IS)";



  revision 2024-04-05 { reference CR-0332 ; } 

  revision 2024-02-23 { reference CR-0347; } 

  revision 2023-09-17 { reference CR-0270 ; } 

  revision 2023-05-09 { reference CR-0249;   }

  revision 2022-10-31 { reference CR-0195;   }
@@ -446,7 +447,7 @@ module _3gpp-common-fm { 
    description "Represents the AlarmList IOC.";



    leaf administrativeState {

      type types3gpp:AdministrativeState ;

      type types3gpp:BasicAdministrativeState ;

      default LOCKED;

      description "When set to UNLOCKED, the alarm list is updated.

        When the set to LOCKED, the existing alarm records are not

yang-models/_3gpp-common-managed-function.yang

+3 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module _3gpp-common-managed-function { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "The module defines a base class/grouping for major 3GPP 

    functions.

    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.622
@@ -24,6 +24,7 @@ module _3gpp-common-managed-function { 
    3GPP TS 28.620 

    Umbrella Information Model (UIM)";



  revision 2024-02-23 { reference CR-0347 ; } 

  revision 2023-12-17 { reference CR-0327 ; } 

  revision 2023-09-17 { reference CR-0270 ; } 

  revision 2022-10-31 { reference CR-0195;   }
@@ -114,7 +115,7 @@ module _3gpp-common-managed-function { 
    }



    leaf administrativeState  {

      type types3gpp:AdministrativeState;

      type types3gpp:BasicAdministrativeState;

      mandatory true;

      description "Permission to use or prohibition against using the instance";

    }

yang-models/_3gpp-common-measurements.yang

+5 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ module _3gpp-common-measurements { 
    Measurements can be contained under ManagedElement, SubNetwork, or

    any list representing a class inheriting from Subnetwork or

    ManagedFunction. Note: KPIs will only be supported under SubNetwork

    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.623
@@ -57,6 +57,7 @@ module _3gpp-common-measurements { 
      Integration Reference Point (IRP);

      Information Service (IS)";



  revision 2024-02-23 { reference CR-0347; } 

  revision 2024-01-29 { reference "CR-0327"; }

  revision 2023-11-17 { reference "CR-0298"; }

  revision 2023-11-05 { reference CR-0306; }
@@ -242,7 +243,7 @@ module _3gpp-common-measurements { 


    leaf administrativeState {

      default UNLOCKED;

      type types3gpp:AdministrativeState ;

      type types3gpp:BasicAdministrativeState ;

      description "Enable or disables production of the metrics";

    }
@@ -326,7 +327,7 @@ module _3gpp-common-measurements { 


    leaf administrativeState {

      default UNLOCKED;

      type types3gpp:AdministrativeState ;

      type types3gpp:BasicAdministrativeState ;

      description "Enables or disables the ThresholdMonitor.";

    }

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

+12 −11
Original line number Diff line number Diff line
@@ -13,10 +13,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-02-23 { reference CR-1219; } 

  revision 2023-09-17 { reference CR-1042 ; } 

  revision 2022-07-27 { reference "CR-0769"; }

  revision 2021-11-06 { reference "CR-0611" ; }
@@ -81,27 +82,27 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      uses types3gpp:PLMNId;

    } 



    leaf-list x2BlackList {

    leaf-list x2BlockList {

      type string;

      description "List of nodes to which X2 connections are prohibited.";

    }



    leaf-list x2WhiteList {

    leaf-list x2AllowList {

      type string;

      description "List of nodes to which X2 connections are enforced.";

    }



    leaf-list xnBlackList {

    leaf-list xnBlockList {

      type string;

      description "List of nodes to which Xn connections are prohibited.";

    }



    leaf-list xnWhiteList {

    leaf-list xnAllowList {

      type string;

      description "List of nodes to which X2 connections are enforced.";

    }



    leaf-list xnHOBlackList {

    leaf-list xnHOBlockList {

      type string;

      description "List of nodes to which handovers over  Xn are prohibited.";

    }
@@ -112,7 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
        supports (is associated to).";

    }



    leaf-list x2HOBlackList {

    leaf-list x2HOBlockList {

      type string;

      description "List of nodes to which handovers over X2 are prohibited.";

    }