Commit 097ef14d authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel18_SA5_161_YANG' into 'Rel-18' 

From Integration_Rel18_SA5_161_YANG into Rel-18

See merge request !1780
parents 83a7df90 025fc5ac

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

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ in 3GPP TS 23.501. 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2023-09-24 { reference CR-0916; }

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

  revision 2020-08-03 { reference "CR-0321"; }

  revision 2020-04-10 { reference "S5-202101";   }

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

+37 −1
Original line number Diff line number Diff line
@@ -6,16 +6,20 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }

  import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }

  import  _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; }

  import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; }

  

  organization "3gpp SA5";

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

  description "This IOC represents the dynamic 5QIs including their QoS 

    characteristics.

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



  revision 2025-03-24 { reference CR-1488 ; } 

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

  revision 2022-07-28 { reference "CR-0770"; }

  revision 2022-01-07 { reference CR-0643; }
@@ -52,11 +56,43 @@ module _3gpp-5gc-nrm-dynamic5qiset { 
    }  

  }

  

  feature Dynamic5QISetUnderSubNetwork {

    description "Dynamic5QISet shall be contained under SubNetwork."; 

  }

  augment "/subnet3gpp:SubNetwork" {

    if-feature Dynamic5QISetUnderSubNetwork;

    uses Dynamic5QISetSubtree;

  }



  feature Dynamic5QISetUnderManagedElement {

    description "Dynamic5QISet shall be contained under ManagedElement."; 

  }

  augment "/me3gpp:ManagedElement" {

    if-feature Dynamic5QISetUnderManagedElement;

    uses Dynamic5QISetSubtree;

  }

  

  feature Dynamic5QISetUnderGNBDUFunction {

    description "Dynamic5QISet shall be contained under GNBDUFunction."; 

  }

  augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {

    if-feature Dynamic5QISetUnderGNBDUFunction;

    uses Dynamic5QISetSubtree;

  }

  

  feature Dynamic5QISetUnderGNBCUCPFunction {

    description "Dynamic5QISet shall be contained under GNBCUCPFunction.";

  }

  augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {

    if-feature Dynamic5QISetUnderGNBCUCPFunction;

    uses Dynamic5QISetSubtree;

  }



  feature Dynamic5QISetUnderGNBCUUPFunction {

    description "Dynamic5QISet shall be contained under GNBCUUPFunction."; 

  }

  augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" {

    if-feature Dynamic5QISetUnderGNBCUUPFunction;

    uses Dynamic5QISetSubtree;

  }

}
 
 No newline at end of file

yang-models/_3gpp-common-antennafunction.yang

0 → 100644
+197 −0
Original line number Diff line number Diff line 
module _3gpp-common-antennafunction {

  yang-version 1.1;

  namespace "urn:3gpp:sa5:_3gpp-common-antennafunction";

  prefix "antfunc3gpp";



  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-common-top { prefix top3gpp; }



  organization "3GPP SA5";

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

  description "Defines the YANG mapping of the Antenna Function Information

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

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.662 Generic Network Resource Model (NRM)";



  revision 2025-03-27 {

    description "Initial revision";

  }

grouping AntennaFunctionGrp {

    description "Represents the AntennaFunction.";

    uses mf3gpp:ManagedFunctionGrp;



    leaf beamTilt {

      description "The beam tilt of the wanted antenna beam 

        in the vertical plane. A positive value on the 

        beamtilt indicates an antenna beam direction below the 

        vertical plane.";

      units degree;

      type types3gpp:TenthOfDegrees;

    }



    leaf bearing {

      description "The bearing in degrees that the antenna is pointing in.

        AllowedValues: See \"Antenna bearing\" in 3GPP TS 25.463.";

      reference "3GPP TS 25.463, UTRAN Iuant interface: 

        Remote Electrical Tilting (RET)

        antennas Application Part (RETAP) signalling";

      type types3gpp:TenthOfDegrees;

    }



    leaf elevation {

      description "The elevation the antenna function should have, 

         based on World Geodetic System (1984 version) global 

         reference frame (WGS 84). Positive values correspond to 

         meters above sea level, negative values correspond to meters 

         below sea level. If empty, value is not defined.";

      type types3gpp:Altitude;

    }

    

    leaf horizBeamWidth {

      description "The 3 dB power beamwidth of the antenna pattern 

        in the horizontal plane. 

        A value of 360 indicates an omnidirectional antenna.

        Note: The value of this attribute has no operational impact 

        on the network, e.g. the NE behaviour is not affected by the 

        value setting of this attribute. 

        Note as well that this attribute is not supported over the 

        Iuant interface according to 3GPP TS37.466.

        A single integral value corresponding to an angle in degrees 

        between 0 and 360.";

      reference "3GPP TS 37.466, Iuant interface: Application part";

      type types3gpp:TenthOfDegrees;

    }



    leaf latitude {

      description "Latitude of transmitter antenna position.

        Positive value means north, negative value means south.

        

        Specification: WGS 84

        Allowed Values: { -90.000000..90.000000 }";

      units degree;

      type types3gpp:Latitude;

    }



    leaf longititude {

      description "Longitude of transmitter antenna position.

        Positive value means east, negative value means west.

        Specification: WGS 84

        Allowed Values: { -180.000000..180.000000 }";

      units degree;

      type types3gpp:Longitude;

    } 



    leaf maxAzimuthValue {

      description "The maximum amount of change of azimuth the RET

        system can support. This is the change in degrees clockwise 

        from bearing.

        Note: The value of this attribute has no operational impact 

        on the network, e.g. the NE behaviour is not affected by the 

        value setting of this attribute. 

        Note as well that this attribute is not supported over the 

        Iuant interface according to Ref. 3GPP TS 37.466.

        A single decimal value corresponding to an angle in degrees 

        between 0 and 360 with a resolution of 0.1 degrees.";

      reference "3GPP TS 37.466, Iuant interface: Application part";

      units degree;

      type decimal64 {

        range "0..360"; 

        fraction-digits 1;

      }

    }

    leaf minAzimuthValue {

      description "The minimum amount of change of azimuth the RET

        system can support. This is the change in degrees clockwise 

        from bearing.

        Note: The value of this attribute has no operational impact 

        on the network, e.g. the NE behaviour is not affected by the 

        value setting of this attribute. 

        Note as well that this attribute is not supported over the 

        Iuant interface according to Ref. 3GPP TS 37.466.

        A single decimal value corresponding to an angle in degrees 

        between 0 and 360 with a resolution of 0.1 degrees.";

      reference "3GPP TS 37.466, Iuant interface: Application part";

      units degree;

      type decimal64 {

        range "0..360"; 

        fraction-digits 1;

      }

    }

    

    leaf-list referencedBy {

      description "This attribute contains the DNs of one or more objects 

        that refer to this object.

        

        In the case of  AntennaFunction,  these referring objects may 

        include DNs of SectorEquipmentFunction instances if associations 

        between them and the AntennaFunction exist.

        

        Note: referencedBy is a DN datatype and so can reference an MOI 

        under a different ME";

      config false;

      type types3gpp:DistinguishedName;

    }





    leaf retGroupName {

      description "The group name is a textual, alpha-numeric string to

        define a logical grouping of antennas which may be in different cells.

        

        This attribute permits the definition of a logical grouping

        of the antennas. This may be defined either at

        installation time, or by management activity";

      type string;

    }



    leaf retTiltValue {

      description "The electrical tilt setting of the antenna, \"Tilt value\" in 

        3GPP TS 37.466.";

      reference "3GPP TS 37.466, Iuant interface: Application part";

      type types3gpp:TenthOfDegrees;

    }



    leaf vertBeamWidth {

      description "The 3 dB power beamwidth of the antenna pattern in 

        the vertical plane.

        The value of this attribute has no operational impact on

        the network, e.g. the NE behaviour is not affected by the

        value setting of this attribute.

        This attribute is not supported over the Iuant interface

        according to Ref. 3GPP TS 37.466.";

      reference "3GPP TS 37.466, Iuant interface: Application part";

      units degree;

      type uint32 {

        range "0..180";

      }

    }



    leaf-list theCellList {

      description "This attribute contains the DNs of EUtranGenericCell 

        or UtranGenericCell if associations between them exist. 

        This attribute contains the DNs of GSMCellPart if association 

        between them exist. ";

      config false;

      status deprecated;

      type types3gpp:DistinguishedName;

    }



  }



  augment "/me3gpp:ManagedElement" {



    list AntennaFunction {

      key id;

      uses top3gpp:Top_Grp;

      description "This MOI represents an array of radiating elements that

         may be tilted to adjust the RF coverage of a cell(s).";

      

      container attributes {

        uses AntennaFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }

}

yang-models/_3gpp-common-filemanagement.yang

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module _3gpp-common-filemanagement { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";



  revision 2024-11-07 { reference CR-0473 ; }

  revision 2024-11-12 { reference CR-0473 ; }

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

  revision 2023-02-14 { reference CR-0234; }

  revision 2022-10-24 { reference CR-0196;  }

yang-models/_3gpp-common-files.yang

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ module _3gpp-common-files { 
      Integration Reference Point (IRP);

      Information Service (IS)";

  

  revision 2024-05-11 { reference CR-0362 ; } 

  revision 2024-05-12 { reference CR-0362 ; } 

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

  revision 2022-09-28 { reference CR-0191; }