Commit 127d623a authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'Rel18_28.623_CR0271_28.541_CR1043_YANG_Corrections' into... 

Merge branch 'Rel18_28.623_CR0271_28.541_CR1043_YANG_Corrections' into 'Integration_Rel18_SA5_151_YANG'

Rel18_28.623_CR0271_28.541_CR1043_YANG_Corrections into Integration

See merge request !777
parents d6d31f3e 875d9d90

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

+19 −3
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ module _3gpp-5g-common-yang-types { 
  organization "3GPP SA5";

  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.";

    network slicing.

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2021-08-05 { reference S5-214053/CR-0518; }

  revision 2020-11-05 { reference CR-0412 ; }
@@ -25,9 +28,9 @@ module _3gpp-5g-common-yang-types { 
  

    leaf sd {

      description "Slice Differentiator

        If not needed, the value can be set to FFFFFF.";

        If not needed, the value can be set to ff:ff:ff.";

      type yang:hex-string {

        length 6;

        length 8;

      }

      reference "3GPP TS 23.003";

    }
@@ -40,6 +43,19 @@ module _3gpp-5g-common-yang-types { 
    }

  }

    

  grouping PlmnIdNid {

    description "Represents the SCP domain specific information as defined 

      in TS 29.510 ";

    uses types3gpp:PLMNId;

    

    leaf nid {

      type string;

      description "This attribute represents network Identity; 

        Shall be present if PlmnIdNid identifies an SNPN. 

        (see clauses 5.30.2.3, 5.30.2.9, 6.3.4, and 6.3.8 in TS 23.501";

    }

  }



  grouping PLMNInfo {

    description "The PLMNInfo data type define a S-NSSAI member in a specific 

      PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI).

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

+4 −1
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { 
  

  organization "3gpp SA5";

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

  description " This IOC represents the set of mapping between 5QIs and DSCP.";

  description " This IOC represents the set of mapping between 5QIs and DSCP.

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2020-05-27 { reference "CR-0287"; }

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

+4 −1
Original line number Diff line number Diff line
@@ -12,9 +12,12 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { 
  organization "3gpp SA5";

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

  description "This IOC represents the capabilities and properties for control 

    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.";

    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.

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

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";



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

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

  revision 2020-09-30 { reference "CR-0393"; }

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

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

+4 −1
Original line number Diff line number Diff line
@@ -14,9 +14,12 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { 
  description "This IOC represents the capabilities and properties for control 

    of QoS monitoring per QoS flow per UE for URLLC service defined 

    

in 3GPP TS 23.501.";

in 3GPP TS 23.501.

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

    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 2020-11-08 { reference CR-0412 ; }

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

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

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

  description "This IOC is defined only to describe the IOCs representing

               its interaction interface with 5GC (i.e. EP_Rx and EP_N5).

               It has no attributes defined.";

               It has no attributes defined.

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

    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 2019-10-28 { reference S5-193518 ; }

  revision 2019-05-15 {reference "initial revision"; }