Commit 2b4ee3e5 authored by lengyelb's avatar lengyelb
Browse files

Locally rebased and commited !1576

parent 5e604652

yang-models/_3gpp-common-measurements.yang

+3 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ module _3gpp-common-measurements { 
    Measurements can be contained under ManagedElement, SubNetwork, or

    any list representing a class inheriting from Subnetwork or

    ManagedFunction. Note: KPIs will only be supported under SubNetwork

    Copyright 2024, 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)
@@ -57,6 +57,7 @@ module _3gpp-common-measurements { 
      Information Service (IS)";



  revision 2025-02-05 { reference CR-0460; }

  revision 2025-01-28 { reference CR-0511; } 

  revision 2024-11-06 { reference CR-0487; } 

  revision 2024-05-06 { reference CR-0359; }

  revision 2024-02-24 { reference CR-0346; }
@@ -243,7 +244,7 @@ module _3gpp-common-measurements { 
  }



  grouping PerfMetricJobGrp {

    description "Represents the attributtes of the IOC PerfMetricJob";

    description "Represents the attributes of the IOC PerfMetricJob";



    leaf administrativeState {

      default UNLOCKED;

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

+11 −5
Original line number Diff line number Diff line
@@ -12,10 +12,11 @@ module _3gpp-common-yang-types { 
  description "The model defines a YANG mapping of the top level 

    information classes used for management of 5G networks and 

    network slicing.

    Copyright 2024, 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";



  revision 2025-02-20 { reference CR-0511; } 

  revision 2024-05-18 { reference CR-0359; } 

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

  revision 2023-11-06 { reference CR-0305; }
@@ -980,10 +981,15 @@ module _3gpp-common-yang-types { 
        deleted, the 'NtfSubscriptionControl' instance created due to the

        request for implicit subscription shall be deleted as well.



        - When only the fileReportingPeriod and fileLocation attributes are

        present, the MnS producer shall store the files on a MnS consumer, that

        can be any entity such as a file server, at the location specified by

        fileLocation. No notification is emitted by the MnS producer.

        - When only the 'fileReportingPeriod' and 'fileLocation' attributes

        are present (CHOICE_3), the MnS producer shall store the files at the

        location specified by 'fileLocation'. The file location may identify 

        any entity such as a file server or a MnS consumer. The identified 

        MnS consumer may or may not be identical to the MnS consumer creating 

        the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit 

        'notifyFileReady' and 'notifyFilePreparationError' notifications to

        inform subscribers that a file has been made available at the location 

        specified by 'fileLocation'.



        - When only the streamTarget attribute is present, the MnS producer

        shall stream the data to the location specified by streamTarget.