Commit 1b11c5e9 authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'YANG_Correction_28.623_28.541_Rel18-SA5-153' into 'Integration_Rel18_SA5_153_YANG' 

YANG_Correction_28.623_28.541_Rel18-SA5-153 into Integration_Rel18_SA5_153_YANG

See merge request !1025
parents afcf5ef8 3d80f656

yang-models/_3gpp-5gc-ecmconnectioninfo.yang→yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang

+6 −5
Original line number Diff line number Diff line 
module _3gpp-5gc-ecmconnectioninfo {

module _3gpp-5gc-nrm-ecmconnectioninfo {

  yang-version 1.1;

  namespace "urn:3gpp:sa5:_3gpp-5gc-ecmconnectioninfo";

  namespace "urn:3gpp:sa5:_3gpp-5gc-nrm-ecmconnectioninfo";

  prefix "econn3gpp";



  import ietf-inet-types { prefix inet; }
@@ -11,11 +11,12 @@ module _3gpp-5gc-ecmconnectioninfo { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "Defines the YANG mapping of the EcmConnectionInfo 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 2023-11-14 { reference CR-1136 ; } 

  revision 2024-01-29 { reference CR-1166 ; } 

  revision 2023-11-05 { reference CR-1131 ; } 

  

  grouping GeoLocGrp {

    description "This datatype represent the geographical location.";

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

+3 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ module _3gpp-common-managed-element { 
  import _3gpp-common-trace { prefix trace3gpp; }

  import _3gpp-common-files { prefix files3gpp; }

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

  import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; }

  import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }



  organization "3GPP SA5";

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



  description "Defines ManagedElement which will be augmented 

      by other IOCs

    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

      Generic Network Resource Model (NRM)
@@ -33,6 +33,7 @@ module _3gpp-common-managed-element { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

      

  revision 2024-01-30 { reference CR-0328 ; } 

  revision 2023-11-14 { reference CR-0305 ; }

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

  revision 2023-08-10 { reference CR-0257;   }

yang-models/_3gpp-common-subnetwork.yang

+3 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ module _3gpp-common-subnetwork { 
  import ietf-yang-schema-mount { prefix yangmnt; }

  import _3gpp-common-files { prefix files3gpp; }

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

  import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; }

  import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }



  organization "3GPP SA5";

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

    

  description "Defines basic SubNetwork which will be augmented by other IOCs

    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

      Generic Network Resource Model (NRM)
@@ -33,6 +33,7 @@ module _3gpp-common-subnetwork { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

  

  revision 2024-01-30 { reference CR-0328 ; } 

  revision 2023-11-14 { reference CR-0305 ; } 

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

  revision 2023-08-10 { reference CR-0257;   }