Commit 20d622fc authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel18_SA5_149_YANG_Helper' into 'Rel-18' 

Merge YANG integration branch into Rel-18 after SA5#149 and SA#100

See merge request !635
parents 6be8ed6a 6b0f45a0

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

+3 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ module _3gpp-5g-common-yang-types { 
  prefix "types5g3gpp";

  

  

  import ietf-yang-types { prefix yang; }

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



  organization "3GPP SA5";
@@ -12,6 +13,7 @@ module _3gpp-5g-common-yang-types { 
    network slicing.";

  reference "3GPP TS 28.541";



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

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

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

  revision 2019-10-20 { reference "Initial version."; }
@@ -24,9 +26,8 @@ module _3gpp-5g-common-yang-types { 
    leaf sd {

      description "Slice Differentiator

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

      type string{

      type yang:hex-string {

        length 6;

        pattern '[a-fA-F0-9]*';

      }

      reference "3GPP TS 23.003";

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -9,14 +9,16 @@ module _3gpp-5gc-nrm-QFQoSMonitoringControl { 
  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }



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

  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 QoS monitoring per QoS flow per UE for URLLC service defined 

    

in 3GPP TS 23.501.";

  reference "3GPP TS 28.541";



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

  revision 2023-04-26 { reference CR-0916; }

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

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

  revision 2020-04-10 { reference "S5-202101";   }

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

+4 −4
Original line number Diff line number Diff line
@@ -9,16 +9,15 @@ module _3gpp-5gc-nrm-affunction { 
  import _3gpp-common-top { prefix top3gpp; }

  

  organization "3gpp SA5";

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

  reference "3GPP TS 28.541";

  

  revision 2023-04-26 { reference CR-0916; }

  revision 2019-10-28 { reference S5-193518 ; }

  

  revision 2019-05-15 {

    description "initial revision";

  }

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

  

  grouping AFFunctionGrp {

    uses mf3gpp:ManagedFunctionGrp;
@@ -33,6 +32,7 @@ module _3gpp-5gc-nrm-affunction { 
      container attributes {

        uses AFFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }

}
 
 No newline at end of file

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

+11 −11
Original line number Diff line number Diff line
@@ -11,22 +11,22 @@ module _3gpp-5gc-nrm-externalseppfunction { 
  import ietf-inet-types { prefix inet; }

  

  organization "3gpp SA5";

  description "This IOC represents the external SEPP function which support message filtering

               and policing on inter-PLMN control plane interface. For more information about the SEPP, see 3GPP TS 23.501.";

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

  description "This IOC represents the external SEPP function which support 

    message filtering and policing on inter-PLMN control plane interface. 

    For more information about the SEPP, see 3GPP TS 23.501.";

  reference "3GPP TS 28.541";

  

  revision 2019-11-17 {

    description "initial revision";

    reference "Based on

      3GPP TS 28.541 V16.X.XX";

  }

  revision 2023-04-26 { reference CR-0916; }

  revision 2019-11-17 {reference "initial revision"; }



  grouping ExternalSEPPFunctionGrp {

    uses mf3gpp:ManagedFunctionGrp;

  

    container pLMNId {

      description "PLMN Identifiers of the sepp.

                   The PLMN Identifier is composed of a Mobile Country Code (MCC) and a Mobile Network Code (MNC).";

        The PLMN Identifier is composed of a Mobile Country Code (MCC) and a 

        Mobile Network Code (MNC).";

      uses types3gpp:PLMNId;

    }
@@ -38,7 +38,6 @@ module _3gpp-5gc-nrm-externalseppfunction { 
      description "The domain name of the SEPP.";

      type inet:domain-name;

    }



  }

  

  augment "/me3gpp:ManagedElement" {
@@ -50,6 +49,7 @@ module _3gpp-5gc-nrm-externalseppfunction { 
      container attributes {

        uses ExternalSEPPFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }

}
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ module _3gpp-5gc-nrm-neffunction { 
    information about the NEF, see 3GPP TS 23.501.";

  reference "3GPP TS 28.541";

  

  revision 2023-04-26 { reference CR-0916; }

  revision 2022-01-07 { reference CR-0643; }

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

  revision 2019-10-20 { reference "initial revision"; }
@@ -60,6 +61,7 @@ module _3gpp-5gc-nrm-neffunction { 
      container attributes {

        uses NEFFunctionGrp;

      }

      uses mf3gpp:ManagedFunctionContainedClasses;

    }

  }

}
 
 No newline at end of file