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

Merge branch... 

Merge branch '28.541_Rel18_Add_satellite_backhaul_information_to_support_5G_system_with_satellite_backhaul_architecture' into 'Integration_Rel18_SA5_153_YANG'

28.541_Rel18_CR1148_Add_satellite_backhaul_information_to_support_5G_system_with_satellite_backhaul_architecture

See merge request !852
parents 21a164b9 f093d72b

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

+148 −1
Original line number Diff line number Diff line
@@ -25,6 +25,140 @@ module _3gpp-5gc-nrm-amffunction { 
  revision 2019-05-31 { reference "Ericsson refactoring."; }

  revision 2018-08-07 { reference "Initial revision"; }



  grouping GlobalRanNodeIDGrp{

    

    list pLMNId {

      description "The PLMN Identifier is composed of

       a Mobile Country Code (MCC) and 

       a Mobile Network Code (MNC).";

      min-elements 1;

      max-elements 1;

      key "mcc mnc";

      uses types3gpp:PLMNId;

    }

    

    choice GlobalRanNodeID{

      description "Unique identifier of an NG-RAN node.";

      reference "3GPP TS 38.413";

      mandatory true;

      case gNB {

        leaf GlobalgNBID{

          description "Unique identifier of a gNB.";

          reference "3GPP TS 38.413";

          type int64;

          mandatory true;

        }

      }



      case ng-eNB{

        leaf Globalng-eNBID{

          type string{

            pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-

            [A-Fa-f0-9]{6}|SMacroNGeNB

            -[A-Fa-f0-9]{5})$';

          }

          description "This represents the identifier of

           the ng-eNB ID as specified in 

          clause 9.3.1.8 of 3GPP TS 38.413.";

          mandatory true;

        }

      }



      case N3IWF{

        leaf N3IWFID{

          type string{

            pattern '^[A-Fa-f0-9]+$';

          }

          description "This IE shall contain the N3IWF 

          identifier received over NGAP and

           shall be encoded as a string of 

           hexadecimal characters.";

          mandatory true;

        } 

      }



      case TNGF{

        leaf TNGFID{

          type string{

            pattern '^[A-Fa-f0-9]+$';

          }

          description "This represents the identifier of

           the TNGF ID as specified in clause

           9.3.1.161 of 3GPP TS 38.413 in hexadecimal

            representation.";

          mandatory true;

        }

      }

      

      case TWIF{

        leaf TWIFID{

          type string;

          description "This represents the TWIF identification

           as specified in clause

           9.3.1.163 of TS 38.413";

          mandatory true;

        }

      }



      case W-AGF{

        leaf W-AGFID{

          type string{

            pattern '^[A-Fa-f0-9]+$';

          }

          description "This represents the identifier of

           the W-AGF ID as specified in

           clause 9.3.1.162 of 3GPP TS 38.413 

           in hexadecimal representation.";

          mandatory true;

        }

      }

    }

  }



  grouping satelliteBackhaulInfo{

    description "Defines information related to satellite backhaul category

     and corresponding information of gNB.";

    reference "3GPP TS 23.501";



    list GlobalRanNodeID{

      description "Unique identifier of an NG-RAN node.";

      uses GlobalRanNodeIDGrp;

      min-elements 1;

      max-elements 1;

      leaf GlobalRanNodeIDValue{

        type string;

        description "this relies on the choice of GlobalRanNodeID";

      }

      key "GlobalRanNodeIDValue";

    }



    leaf satelliteBackhaulCategory{

      description "Satellite backhaul category refers to the type of the

       satellite used in the backhaul. Only a single backhaul category

        can be indicated.";

      reference "3GPP TS 29.571";

      type enumeration{

        enum GEO;

        enum MEO;

        enum LEO;

        enum OTHER_SAT;

        enum DYNAMIC_GEO;

        enum DYNAMIC_MEO;

        enum DYNAMIC_LEO;

        enum DYNAMIC_OTHER_SAT;

        enum NON_SATELLITE;

      }

      mandatory true;

    }



    leaf geoSatelliteId{

      description "Unique identifier of a GEO satellite.";

      reference "3GPP TS 29.571";

      type string;

      //condition present only if the UPF is deployed on the satellite.

    }

  }



  grouping AMFFunctionGrp {

    description "Represents the AMFFunction IOC";

    uses mf3gpp:ManagedFunctionGrp;
@@ -38,7 +172,7 @@ module _3gpp-5gc-nrm-amffunction { 
    }



    container aMFIdentifier {

      presence true;

      //presence true;

      description "An AMF identifier, comprising an AMF Region ID, an

        AMF Set ID and an AMF Pointer.";  

      uses types3gpp:AmfIdentifier;
@@ -66,6 +200,7 @@ module _3gpp-5gc-nrm-amffunction { 
      min-elements 1;

      max-elements 1;

      uses types3gpp:ManagedNFProfile;

      description "";

    }



    list commModelList {
@@ -77,6 +212,18 @@ module _3gpp-5gc-nrm-amffunction { 
      uses types5g3gpp:CommModel;

    }



    list satelliteBackhaulInfoList{

      description "Specifies a list of satellite backhaul information. It can be

       used by NF and NF services.";

      leaf GlobalRanNodeIDValue{

        type string;

        description "this relies on the choice of GlobalRanNodeID";

      }

      key "GlobalRanNodeIDValue";

      min-elements 1;

      uses satelliteBackhaulInfo;

    }



  }

  

  augment "/me3gpp:ManagedElement" {