Commit d6e7256a authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel19_SA5_156_YANG' into 'Rel-19' 

Integration_Rel19_SA5_156_YANG into Rel-19

See merge request !1349
parents d068f567 daf5e54e

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

+15 −1
Original line number Diff line number Diff line
@@ -7,15 +7,17 @@ module _3gpp-5gc-nrm-anlffunction { 
  import _3gpp-common-managed-element { prefix me3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp; }

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

  

  organization "3gpp SA5";

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

  description "This IOC represents the AnLF function in 5GC.

               For more information about the AnLF, see 3GPP TS 23.288.

    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-08-07 { reference CR-1331; }

  revision 2023-11-03 { reference "initial revision"; }

  

  grouping AnLFFunctionGrp {
@@ -29,6 +31,18 @@ module _3gpp-5gc-nrm-anlffunction { 
      config false;

      description "It indicates the activation status of the AnLF";

    }

     leaf-list mLModelRefList {

      type types3gpp:DistinguishedName;

      description "This attribute holds a DN list of MLModel ¨

        (See TS 28.105).";

       config false;     

    }

    leaf-list aIMLInferenceFunctionRefList {

      type types3gpp:DistinguishedName;

      description "This attribute holds a DN list of AIMLInferenceFunction

        (See TS 28.105) .";

      config false;      

    }   

  }

    

  augment "/me3gpp:ManagedElement/nwdaf3gpp:NWDAFFunction" {

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

+6 −5
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ module _3gpp-5gc-nrm-ep { 
  description "Defines the YANG mapping of the 5GC related endpoint

               Information Object Classes (IOCs) that are part of the 5G Core 

               Network Resource Model.

    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-08-19 { reference CR-1314 ; } 

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

  revision 2019-11-18 {

    description "Ericsson refactoring.";
@@ -179,7 +180,7 @@ module _3gpp-5gc-nrm-ep { 
    uses eprp3gpp:EP_Common;

  }

  

  grouping EP_NLGGrp {

  grouping EP_NL2Grp {

    uses eprp3gpp:EP_Common;

  }
@@ -312,12 +313,12 @@ module _3gpp-5gc-nrm-ep { 
      }

    }

    

    list EP_NLG {

      description "Represents the EP_NLG IOC.";

    list EP_NL2 {

      description "Represents the EP_NL2 IOC.";

      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses EP_NLGGrp;

        uses EP_NL2Grp;

      }

    }

  }

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

+8 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ module _3gpp-5gc-nrm-nwdaffunction { 
    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.541";

  

  revision 2024-08-07 { reference CR-1329; }

  revision 2024-04-12 { reference CR-1218; } 

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

  revision 2023-04-26 { reference CR-0916; }
@@ -279,7 +280,8 @@ module _3gpp-5gc-nrm-nwdaffunction { 
  }

  

  grouping NWDAFFunctionGrp {

    description "Represents the NWDAFFunction IOC";

    description "The NWDAFFunction IOC includes attributes inherited from 

    ManagedFunction IOC(defined in TS 28.622)and the following attributes:";

    uses mf3gpp:ManagedFunctionGrp;

    

    list pLMNInfoList {
@@ -319,8 +321,9 @@ module _3gpp-5gc-nrm-nwdaffunction { 
      key idx;

      min-elements 1;

      description "The attribute specifies a list of NetworkSliceInfo which 

        is defined as a datatype (see clause 5.3.95). It can be used by the 

        NWDAF to facilitate the data collection from OAM.";

        is defined as a datatype (see clause 5.3.95). It is used by an 

        authorized consumer, e.g. NWDAF, to facilitate the data collection 

        from OAM.";

       leaf idx {

        type string;

      }

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

+11 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ module _3gpp-common-managed-element { 
  import _3gpp-common-files { prefix files3gpp; }

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

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

  import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -33,6 +34,7 @@ module _3gpp-common-managed-element { 
      3GPP TS 28.620 

      Umbrella Information Model (UIM)";

      

  revision 2024-08-21 { reference CR-1337 ; } 

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

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

  revision 2023-09-18 { reference CR-0271 ; }
@@ -49,6 +51,10 @@ module _3gpp-common-managed-element { 
  revision 2019-06-17 { reference " S5-203316"; }

  revision 2019-05-08 { reference "Initial revision"; }

  

  feature ECMappingRuleUnderManagedElement {

    description "ECMappingRule shall be contained under ManagedElement.";

  }



  feature EcmConnectionInfoUnderManagedElement  {

    description "The EcmConnectionInfo shall be contained under

    ManagedElement";
@@ -304,5 +310,10 @@ module _3gpp-common-managed-element { 
    uses econn3gpp:EcmConnectionInfoSubtree {

      if-feature EcmConnectionInfoUnderManagedElement;

    }



     uses ecmap3gpp:NRECMappingRuleSubtree {

      if-feature ECMappingRuleUnderManagedElement;

    }



  }    

}

yang-models/_3gpp-common-mecontext.yang

0 → 100644
+82 −0
Original line number Diff line number Diff line 
module _3gpp-common-mecontext {

  yang-version 1.1;

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

  prefix "mectx3gpp";



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

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import ietf-yang-schema-mount { prefix yangmnt; }



  organization "3GPP SA5";

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



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

    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)

    Integration Reference Point (IRP);

    Solution Set (SS) definitions



    3GPP TS 28.622

    Generic Network Resource Model (NRM)

    Integration Reference Point (IRP);

    Information Service (IS)";



  revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; }



  grouping MeContextGrp {

    description "Represents the MeContext IOC.";



    leaf dnPrefix {

      type types3gpp:DistinguishedName;

      description "It carries the DN Prefix information or no information.

        The instance of MeContext is the local root instance of the MIB.

        Otherwise the attribute shall be absent or carry no information.";

      reference "Annex C of 32.300 ";

    }

  }



  augment "/subnet3gpp:SubNetwork" {

    list Mecontext {

      description "This IOC is introduced for naming purposes. It may support

        creation of unique DNs in scenarios when some MEs have the same RDNs due

        to the fact that they have been manufacturer pre-configured.



        If some MEs have the same RDNs (for the above mentioned reason) and they

        are contained in the same SubNetwork instance, some measure shall be

        taken in order to assure the global uniqueness of DNs for all IOC

        instances under those MEs. One way could be to set different dnPrefix

        for those NEs, but that would require either that:



        a)  all LDNs or DNs are locally modified using the new dnPrefix for the

        upper portion of the DNs, or

        b)  a mapping (translation) of the old LDNs or DNs to the new DNs every

        time they are used externally, e.g. in alarm notifications.



        As both the two alternatives above may involve unacceptable drawbacks

        (as the old RDNs for the MEs then would have to be changed or mapped to

        new values), using MeContext offers a new alternative to resolve the DN

        creation. Using MeContext as part of the naming tree (and thus the DN)

        means that the dnPrefix, including a unique MeContext for each ME, may

        be directly concatenated with the LDNs, without any need to change or

        map the existing ME RDNs to new values.



        MeContext have 0..N instances. It may exist even if no SubNetwork exists.

        Every instance of MeContext contains exactly one ManagedElement during

        steady-state operations.";



      key id;

      uses top3gpp:Top_Grp;

      container attributes {

        uses MeContextGrp;

      }



      yangmnt:mount-point children-of-MeContext {

        description "Mountpoint for ManagedElement";

        reference "RFC8528 YANG Schema Mount";

      }

    }

  }

}
 
 No newline at end of file