Commit 694665e5 authored by lengyelb's avatar lengyelb
Browse files

Locally rebase and merge !1686

parent 3fa194d4

yang-models/_3gpp-common-subnetwork.yang

+6 −27
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ module _3gpp-common-subnetwork { 
  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 20254, 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.623

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

      Umbrella Information Model (UIM)";

  

  revision 2025-03-25 { reference "CR-0516"; } 

  revision 2025-03-25 { reference "CR-0516 CR-0527"; } 

  revision 2024-11-19 { reference "Add STM"; } 

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

  revision 2024-01-30 { reference CR-0328 ; }
@@ -217,34 +217,13 @@ module _3gpp-common-subnetwork { 


  list SubNetwork {

    key id;

    description "Represents a set of managed entities";

    description "Represents a set of managed entities

      Contained ManagedElements and SubNetworks shall be connected via 

      YANG Schema-mount.";



    uses top3gpp:Top_Grp;

    container attributes {    

      uses SubNetworkGrp;

      leaf-list parents {

        description "Reference to all containg SubNetwork instances 

          in strict order from the root subnetwork down to the immediate 

          parent subnetwork.

          If subnetworks form a containment hierarchy this is 

          modeled using references between the child SubNetwork and the parent 

          SubNetworks. 

          This reference MUST NOT be present for the top level SubNetwork and 

          MUST be present for other SubNetworks.";

        type leafref {

          path "../../../SubNetwork/id";  

        } 

      }

      

      leaf-list containedChildren{

        description "Reference to all directly contained SubNetwork instances.

          If subnetworks form a containment hierarchy this is 

          modeled using references between the child SubNetwork and the parent 

          SubNetwork.";

        type leafref {

          path "../../../SubNetwork/id";  

        } 

      }

    }

        

    uses meas3gpp:MeasurementSubtree {
@@ -288,7 +267,7 @@ module _3gpp-common-subnetwork { 
    }    



    yangmnt:mount-point children-of-SubNetwork {

      description "Mountpoint for ManagedElement";

      description "Mountpoint for contained ManagedElements and SubNetworks";

      reference "RFC8528 YANG Schema Mount";

    }

    // augment external parts here