Commit 189c6098 authored by lengyelb's avatar lengyelb Committed by Miguel Angel Reina Ortega
Browse files

slice updates

parent 8b32bb90
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ module _3gpp-5gc-nrm-affunction {
  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-TEST1";
  reference "3GPP TS 28.541";
  
  revision 2019-10-28 { reference S5-193518 ; }
  
+23 −20
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ module _3gpp-ns-nrm-networkslice {
  namespace urn:3gpp:sa5:_3gpp-ns-nrm-networkslice;
  prefix ns3gpp;

  import _3gpp-ns-nrm-networkslicesubnet { prefix nss3gpp; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-common-top { prefix top3gpp; }
@@ -20,6 +19,7 @@ module _3gpp-ns-nrm-networkslice {
    Information model definitions for network slice NRM (chapter 6)
    ";

  revision 2022-07-26 { reference CR-balazs145-r17-541-yang-corrections ; }
  revision 2020-06-02 {
    reference "CR-0485, CR-0508";
  }
@@ -30,15 +30,15 @@ module _3gpp-ns-nrm-networkslice {
  }

  grouping NetworkSliceGrp {

    uses subnet3gpp:SubNetworkGrp;   // Inherits from SubNetwork
    description "Represents the NetworkSlice IOC";
    
    leaf operationalState {
      description "The operational state of the network slice instance. 
        It describes whether or not the resource is physically installed 
        It describes whether or not the resource is installed 
        and working.";
      config false;
      type types3gpp:OperationalState;
      config false;
      mandatory true;
    }

    leaf administrativeState {
@@ -46,6 +46,7 @@ module _3gpp-ns-nrm-networkslice {
        It describes the permission to use or prohibition against 
        using the instance, imposed through the OAM services.";
      type types3gpp:AdministrativeState;
      default LOCKED;
    }

    list serviceProfileList {
@@ -56,14 +57,15 @@ module _3gpp-ns-nrm-networkslice {
    }

    leaf networkSliceSubnetRef {
      type leafref {
        path /nss3gpp:NetworkSliceSubnet/nss3gpp:id;
      }
      description "The NetworkSliceSubnet that the NetworkSlice is 
        associated with.";
      type types3gpp:DistinguishedName; 
      config false;
      mandatory true;
      description "DN of NetworkSliceSubnet relating to the 
        NetworkSlice instance";
    }
  }

  augment /subnet3gpp:SubNetwork {  
    list NetworkSlice {
      description "Represents the properties of a network slice instance in 
        a 5G network.";
@@ -76,3 +78,4 @@ module _3gpp-ns-nrm-networkslice {
      uses top3gpp:Top_Grp;
    }
  }
}
 No newline at end of file
+72 −62
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ module _3gpp-ns-nrm-networkslicesubnet {
  
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  import _3gpp-common-measurements { prefix meas3gpp; }
  import _3gpp-common-top { prefix top3gpp; }
  // import _3gpp-ns-nrm-common { prefix ns3cmn; }

  include _3gpp-ns-nrm-sliceprofile;
  
@@ -23,6 +21,7 @@ module _3gpp-ns-nrm-networkslicesubnet {
    Information model definitions for network slice NRM (chapter 6)
    ";

  revision 2022-07-26 { reference CR-balazs145-r17-541-yang-corrections ; }
  revision 2021-05-05 {
    description "replace perfReq with 3 new datatypes xxxSliceSubnetProfile";
    reference "CR-0485";
@@ -39,11 +38,6 @@ module _3gpp-ns-nrm-networkslicesubnet {
      3GPP TS 28.541 V15.X.XX";
  }
  
  feature MeasurementsUnderNetworkSliceSubnet {
    description "The MeasurementSubtree shall be contained under 
      NetworkSliceSubnet.";
  }

  typedef ETSI-GS-NFV-Identifier {
    type string;
    reference "ETSI GS NFV-IFA 013";
@@ -114,13 +108,10 @@ module _3gpp-ns-nrm-networkslicesubnet {
  }

  grouping NetworkSliceSubnetGrp {

    uses subnet3gpp:SubNetworkGrp;
    uses EPTransportGrp;
    
    description "Represents the NetworkSliceSubnet IOC.";
    leaf operationalState {
      description "The operational state of the network slice instance. 
        It describes whether or not the resource is physically installed 
      description "The operational state of the resouce. 
        It describes whether or not the resource is installed 
        and working.";
      mandatory true;
      config false;
@@ -131,7 +122,7 @@ module _3gpp-ns-nrm-networkslicesubnet {
      description "The administrative state of the network slice instance.
        It describes the permission to use or prohibition against
        using the instance, imposed through the OAM services.";
      mandatory true;
      default LOCKED;
      type types3gpp:AdministrativeState;
    }
    
@@ -157,61 +148,80 @@ module _3gpp-ns-nrm-networkslicesubnet {
      uses SliceProfileGrp;
    }
    
    list managedFunctionRef {
      description "The managed functions that the NetworkSliceSubnet is 
        associated with.";
      key aggregatedManagedFunction;
      leaf aggregatedManagedFunction { 
        type instance-identifier; 
    leaf priorityLabel {
      type int32 ;
      mandatory true ;
      description "Specifies a label that consumer would assign a value on 
        an instance of network slice subnet. The management system takes 
        the value of this attribute into account. The effect of this 
        attribute value to the subject managed entity is not standardized";
    }
    
    leaf networkSliceSubnetType {
      type enumeration {
        enum TOP_SLICESUBNET;
        enum RAN_SLICESUBNET;
        enum CN_SLICESUBNET;
      }
      mandatory true;
      description "Indicates the type of network slice subnet, including:
        - Top network slice subnet
        - RAN network slice subnet
        - CN network slice subnet";
    }
    
    leaf-list managedFunctionRef {
      type types3gpp:DistinguishedName; 
      config false;
      description "This holds a list of DN of ManagedFunction instances 
        supporting the NetworkSliceSubnet instance.";
    }

    leaf-list networkSliceSubnetRef {
      type leafref {
        path /NetworkSliceSubnet/id;
      type types3gpp:DistinguishedName; 
      config false;
      description "List of DNs of constituent NetworkSliceSubnet supporting 
        NetworkSliceSubnet instance .";
    }
      description "Lists the NetworkSliceSubnet instances associated with 
        this NetworkSliceSubnet.";
    
    leaf-list epTransportRef {
      type types3gpp:DistinguishedName; 
      description "List of transport level EPs associated with the 
        application level EP (i.e. EP_N3 or EP_NgU) or network slice subnet.";
    }
  }
  
  augment /subnet3gpp:SubNetwork {
    list NetworkSliceSubnet {
      description "Represents the properties of a network slice subnet 
      instance in a 5G network.";
        instance in a 5G network.
        
        The NetworkSliceSubnet can be categorized by following types:
        - RANSliceSubne represent the RAN network slice subnet in a 5G network, 
        which is associated to one or multiple 'RANSliceSubnetProfile'.
        - CNSliceSubnet represent the CN network slice subnet in a 5G network, 
        which is associated to one or multiple 'CNSliceSubnetProfile'.
        - TopSliceSubnet represent the top network slice subnet in a 5G network, 
        which is associated to one or multiple 'TopSliceSubnetProfile'.
        
        The attribute epTransportRef is used to specify a list of EP_Transport 
        instance as transport resources to be aggregated to a NetworkSliceSubnet 
        instance. The MnS consumer determines the EP_Transport instance(s) to 
        support EP_Application instances as part of the NetworkSliceSubnet 
        instance and request the MnS producer to configure the attribute 
        epTransportRef of the NetworkSliceSubnet. 
        
        The EP_Transport is name contained by SubNetwork, and an EP_Transport 
        instance can be a new instance created for the EP_Application instances 
        as part of NetworkSliceSubnet instance or an existing instance reused 
        for EP_Application instance.";
      key id;
  
      container attributes {

        uses NetworkSliceSubnetGrp;

      leaf-list parents {
        description "Reference to direct parent NetworkSliceSubnet 
          instances.
          If NetworkSliceSubnets form a containment hierarchy this is 
          modeled using references between the child NetworkSliceSubnet 
          and the parent NetworkSliceSubnet. 
          This reference MUST NOT be present for the top level 
          NetworkSliceSubnet and MUST be present for other 
          NetworkSliceSubnets.";
        type leafref {
          path "/NetworkSliceSubnet/id";
        }
      }
      
      leaf-list containedChildren {
        description "Reference to all directly contained NetworkSliceSubnet 
          instances.  If NetworkSliceSubnets form a containment hierarchy 
          this is modeled using references between the child 
          NetworkSliceSubnet and the parent NetworkSliceSubnet.";
        type leafref {
          path "/NetworkSliceSubnet/id";
        } 
      }
      }
  
      uses top3gpp:Top_Grp;
    uses meas3gpp:MeasurementSubtree {
      if-feature MeasurementsUnderNetworkSliceSubnet;
    }    
  }
}
 No newline at end of file