Commit bd776abe authored by cintiarosa's avatar cintiarosa
Browse files

update stage 3 to align VnfParameters and PeeParameters into datatypes

parent dd9d4a7c
Loading
Loading
Loading
Loading
Loading
+139 −136
Original line number Diff line number Diff line
@@ -161,34 +161,9 @@ module _3gpp-common-managed-function {
        description "A user-friendly (and user assignable) name of this object.";
    }      
  }
  
  grouping ManagedFunctionGrp {
    description "Abstract root class to be inherited/reused by classes 
      representing 3GPP functions.
          
      Anywhere this grouping is used by classes inheriting from ManagedFunction
      the list representing the inheriting class needs to include all 
      contained classes of ManagedFunction too. Contained classes are 
      either 
      - augmented into the Function class or 
      - shall be included in the list representing the inheriting class 
      using the grouping  ManagedFunctionContainedClasses:
        1) EP_RP solved using augment
        2) uses mf3gpp:ManagedFunctionContainedClasses; 
      ";

    uses Function_Grp;
    
    list vnfParametersList {
      key vnfInstanceId;
      description "Contains the parameter set of the VNF 
        instance(s) corresponding to an NE.
        The presence of this list indicates that the ManagedFunction
        represented is realized by one or more VNF instance(s). Otherwise it  
        shall be absent. 
        The presence of a vnfParametersList entry, whose vnfInstanceId with a 
        string length of zero, in createMO operation can trigger the 
        instantiation of the related VNF/VNFC instances.";        
  grouping VnfParametersGrp {
     description "This <<dataType>> represents the parameter set of the VNF 
     instance(s) corresponding to an NE.";        
        
    leaf vnfInstanceId {
      type string ;
@@ -231,14 +206,11 @@ module _3gpp-common-managed-function {
    } 
  }
    
    list peeParametersList {
      key idx;
      description "Contains the parameter set for the control 
        and monitoring of power, energy and environmental parameters of 
        ManagedFunction instance(s).";

  grouping PeeParametersGrp {
    description "This <<dataType>> represents the parameter list for the control
    and monitoring of power, energy and environmental parameters of ManagedFunction
    instance(s).";
    leaf idx { type uint32; }  

    leaf siteIdentification {
      type string;
      mandatory true;
@@ -283,7 +255,6 @@ module _3gpp-common-managed-function {
        NRSectorCarrier instance(s).";
    }
      
      
    leaf siteDescription {
      type string;
      mandatory true;
@@ -315,8 +286,40 @@ module _3gpp-common-managed-function {
    } 
  }

  grouping ManagedFunctionGrp {
    description "Abstract root class to be inherited/reused by classes 
      representing 3GPP functions.
          
      Anywhere this grouping is used by classes inheriting from ManagedFunction
      the list representing the inheriting class needs to include all 
      contained classes of ManagedFunction too. Contained classes are 
      either 
      - augmented into the Function class or 
      - shall be included in the list representing the inheriting class 
      using the grouping  ManagedFunctionContainedClasses:
        1) EP_RP solved using augment
        2) uses mf3gpp:ManagedFunctionContainedClasses; 
      ";

    uses Function_Grp;
    list vnfParametersList {
      key "vnfInstanceId";        
      uses VnfParametersGrp;
      description "This attribute contains the parameter set of the VNF 
      instance(s) corresponding to an NE. The presence of this attribute 
      indicates that the ManagedFunction represented by the MOI is a 
      virtualized function ";
    }
    list peeParameterslist{
      key "idx";
      uses PeeParametersGrp;
      description "This attribute contains the parameter list for the control
       and monitoring of power, energy and environmental parameters of 
       ManagedFunction instance(s). ";
    }
   
    leaf priorityLabel {
      mandatory true;
      mandatory false;
      type uint32;
    }