From 6e69139fd316b618affea6511974763ecfa63da6 Mon Sep 17 00:00:00 2001 From: Fernando Oliveira Date: Wed, 2 Sep 2020 16:18:19 -0400 Subject: Many changes to bring NSD into alignment with ETSI IFA014 v2.7.1 - Support for Sapd - Support for nested NSD - Support for vnffgd - Updated NsDf - Updated Nslifecyclemanagementscripts Added a optional reference to an ETSI NSD in the ServiceDescriptor Since the ServiceDescriptor may be nested an NSD may be referenced by a nested ServiceDescriptor. Therefore, several NSD may be referenced by a hierarchy of Service Descriptors. Resources defined by a an NSD will not be described by the ServiceDescriptor Issue-ID: MODELING-334 Signed-off-by: Fernando Oliveira Change-Id: I0aff2b29c65502dde98c655dbb344864a85628af --- ONAP_Information_Model/Common.notation | 2518 ++++++++++++------------ ONAP_Information_Model/Common.uml | 91 +- ONAP_Information_Model/Ns.notation | 1267 ++++++------ ONAP_Information_Model/Ns.uml | 1090 +++++++++-- ONAP_Information_Model/Pnf.uml | 33 +- ONAP_Information_Model/Service.notation | 2054 ++++++++++---------- ONAP_Information_Model/Service.uml | 3198 +++++++++++++++---------------- ONAP_Information_Model/Vnf.notation | 3018 ++++++++++++++--------------- ONAP_Information_Model/Vnf.uml | 217 +-- 9 files changed, 7044 insertions(+), 6442 deletions(-) diff --git a/ONAP_Information_Model/Common.notation b/ONAP_Information_Model/Common.notation index b962bd4..e36d41e 100644 --- a/ONAP_Information_Model/Common.notation +++ b/ONAP_Information_Model/Common.notation @@ -32,14 +32,6 @@ - - - - - - - - @@ -71,14 +63,6 @@ - - - - - - - - @@ -110,14 +94,6 @@ - - - - - - - - @@ -149,14 +125,6 @@ - - - - - - - - @@ -188,13 +156,45 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -202,26 +202,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -253,16 +233,6 @@ - - - - - - - - - - @@ -294,26 +264,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -324,6 +274,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -359,14 +359,6 @@ - - - - - - - - @@ -396,14 +388,6 @@ - - - - - - - - @@ -460,14 +444,6 @@ - - - - - - - - @@ -506,14 +482,6 @@ - - - - - - - - @@ -793,22 +761,6 @@ - - - - - - - - - - - - - - - - @@ -847,14 +799,6 @@ - - - - - - - - @@ -893,14 +837,6 @@ - - - - - - - - @@ -991,14 +927,6 @@ - - - - - - - - @@ -1021,38 +949,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1091,13 +987,117 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1105,145 +1105,145 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + @@ -2010,101 +2010,101 @@ - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -2383,125 +2383,125 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -2536,14 +2536,6 @@ - - - - - - - - @@ -2575,14 +2567,6 @@ - - - - - - - - @@ -2614,14 +2598,6 @@ - - - - - - - - @@ -2653,14 +2629,6 @@ - - - - - - - - @@ -2692,14 +2660,6 @@ - - - - - - - - @@ -2731,14 +2691,6 @@ - - - - - - - - @@ -2770,14 +2722,6 @@ - - - - - - - - @@ -2809,14 +2753,6 @@ - - - - - - - - @@ -2858,14 +2794,6 @@ - - - - - - - - @@ -2897,14 +2825,6 @@ - - - - - - - - @@ -2936,14 +2856,6 @@ - - - - - - - - @@ -2975,14 +2887,6 @@ - - - - - - - - @@ -3029,80 +2933,116 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3147,26 +3087,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -3247,36 +3167,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3423,16 +3313,6 @@ - - - - - - - - - - @@ -3455,16 +3335,6 @@ - - - - - - - - - - @@ -3490,6 +3360,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5627,14 +5627,6 @@ - - - - - - - - @@ -5666,14 +5658,6 @@ - - - - - - - - @@ -5723,14 +5707,6 @@ - - - - - - - - @@ -5814,14 +5790,6 @@ - - - - - - - - @@ -5880,14 +5848,6 @@ - - - - - - - - @@ -5927,14 +5887,6 @@ - - - - - - - - @@ -5966,14 +5918,6 @@ - - - - - - - - @@ -6010,14 +5954,6 @@ - - - - - - - - @@ -6054,86 +5990,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6165,14 +6021,6 @@ - - - - - - - - @@ -6204,14 +6052,6 @@ - - - - - - - - @@ -6243,14 +6083,6 @@ - - - - - - - - @@ -6282,14 +6114,6 @@ - - - - - - - - @@ -6321,14 +6145,6 @@ - - - - - - - - @@ -6360,14 +6176,6 @@ - - - - - - - - @@ -6399,14 +6207,6 @@ - - - - - - - - @@ -6438,14 +6238,6 @@ - - - - - - - - @@ -6477,14 +6269,6 @@ - - - - - - - - @@ -6516,80 +6300,246 @@ - - - - + + + + - + - - - - - - - - - - + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6613,16 +6563,6 @@ - - - - - - - - - - @@ -6665,16 +6605,6 @@ - - - - - - - - - - @@ -6717,16 +6647,6 @@ - - - - - - - - - - @@ -6738,16 +6658,6 @@ - - - - - - - - - - @@ -6759,106 +6669,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6870,16 +6680,6 @@ - - - - - - - - - - @@ -6891,26 +6691,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -6933,16 +6713,6 @@ - - - - - - - - - - @@ -6954,16 +6724,6 @@ - - - - - - - - - - @@ -6975,46 +6735,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7059,6 +6779,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7092,14 +7092,6 @@ - - - - - - - - @@ -7131,14 +7123,6 @@ - - - - - - - - @@ -7170,14 +7154,6 @@ - - - - - - - - @@ -7209,14 +7185,6 @@ - - - - - - - - @@ -7248,14 +7216,6 @@ - - - - - - - - @@ -7287,14 +7247,6 @@ - - - - - - - - @@ -7326,14 +7278,6 @@ - - - - - - - - @@ -7365,100 +7309,76 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - + + + + + + + + @@ -7658,6 +7578,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Common.uml b/ONAP_Information_Model/Common.uml index 2f89e2e..2cc55d3 100644 --- a/ONAP_Information_Model/Common.uml +++ b/ONAP_Information_Model/Common.uml @@ -736,58 +736,6 @@ NOTE: This allows to provide one or more localization languages to support sel - - - The VirtualLinkProfile class specifies a profile for instantiating VLs of a particular NS DF according to a specific VLD and VL DF. - - - - Uniquely identifies this VirtualLinkProfile class. - - - - - Identifies a flavour within the VLD. - - - - - - Specifies affinity and anti-affinity rules applicable between VLs instantiated from the referenced VLD. - - - - - - - Identifies an affinity or anti-affinity group the VLs instantiated according to the VlProfile belong to. -NOTE : Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VirtualLinkProfile and the VL(s) using other VirtualLinkProfile(s) in the same group. - - - - - - - Specifies the maximum bitrate requirements for a VL instantiated according to this profile. -NOTE: These attributes are used to control scaling boundaries. - - - - - Specifies the minimum bitrate requirements for a VL instantiated according to this profile. -NOTE: These attributes are used to control scaling boundaries. - - - - - Uniquely references a VLD. - - - - - - - The CpdPool class specifies a pool of descriptors of connection points and service access points. @@ -4417,15 +4365,30 @@ Permitted Values: - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -4995,4 +4958,10 @@ Permitted Values: + + + + + + diff --git a/ONAP_Information_Model/Ns.notation b/ONAP_Information_Model/Ns.notation index b3d5f78..318b96a 100644 --- a/ONAP_Information_Model/Ns.notation +++ b/ONAP_Information_Model/Ns.notation @@ -61,15 +61,6 @@ - - - - - - - - - @@ -110,24 +101,6 @@ - - - - - - - - - - - - - - - - - - @@ -160,7 +133,7 @@ - + @@ -191,7 +164,7 @@ - + @@ -222,7 +195,7 @@ - + @@ -280,47 +253,192 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -336,8 +454,8 @@ - - + + @@ -346,7 +464,7 @@ - + @@ -366,9 +484,9 @@ - - - + + + @@ -397,9 +515,9 @@ - - - + + + @@ -428,59 +546,213 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -549,14 +821,6 @@ - - - - - - - - @@ -622,14 +886,6 @@ - - - - - - - - @@ -658,17 +914,9 @@ - + - - - - - - - - @@ -700,14 +948,6 @@ - - - - - - - - @@ -736,17 +976,9 @@ - + - - - - - - - - @@ -778,20 +1010,20 @@ - - - - - - - - + + + + + + + + @@ -814,55 +1046,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -895,14 +1080,6 @@ - - - - - - - - @@ -931,17 +1108,9 @@ - + - - - - - - - - @@ -973,14 +1142,6 @@ - - - - - - - - @@ -1012,13 +1173,93 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1036,34 +1277,30 @@ - - - - - - - - - - + + - + + - + + - + + - + + @@ -1083,22 +1320,28 @@ + + - + + - + + - + + - + + @@ -1106,16 +1349,6 @@ - - - - - - - - - - @@ -1145,17 +1378,7 @@ - - - - - - - - - - - + @@ -1186,17 +1409,7 @@ - - - - - - - - - - - + @@ -1291,34 +1504,30 @@ - - - - - - - - - - + + - + + - + + - + + - + + @@ -1326,16 +1535,6 @@ - - - - - - - - - - @@ -1361,16 +1560,6 @@ - - - - - - - - - - @@ -1399,91 +1588,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1509,34 +1616,30 @@ - - - - - - - - - - + + - + + - + + - + + - + + @@ -1544,16 +1647,6 @@ - - - - - - - - - - @@ -1579,16 +1672,6 @@ - - - - - - - - - - @@ -1616,22 +1699,28 @@ + + - + + - + + - + + - + + @@ -1639,6 +1728,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1669,7 +1868,7 @@ - + @@ -1923,7 +2122,7 @@ - + @@ -2053,85 +2252,85 @@ - - - - + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -2265,7 +2464,7 @@ - + @@ -2505,105 +2704,105 @@ - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/ONAP_Information_Model/Ns.uml b/ONAP_Information_Model/Ns.uml index 7178e60..946eedd 100644 --- a/ONAP_Information_Model/Ns.uml +++ b/ONAP_Information_Model/Ns.uml @@ -116,12 +116,36 @@ + + +

+ + + + + +

+ + + - The NSD class is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs. + The NSD information element is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs. For all attributes in this class, the Producer is SDC and the Consumer is SDC/UUI/VFC @@ -155,6 +179,53 @@ For all attributes in this class, the Producer is SDC and the Consumer is SDC/UU + + + References the NSD of a constituent nested NS. +At least one between nestedNsd and vnfdId attributes shall be present. + + + + + + + References the VNFD of a constituent VNF. + + + + + + + + References the PNFD of a constituent PNF. + + + + + + + + Provides the descriptor of a service access point of the network service. + + + + + + + Provides the constituent VLDs. +Cardinality of 0 means that the NS is a NF set with unspecified connectivity. + + + + + + + + Provides the descriptors of the applicable forwarding graphs. + + + + Specifies a rule to trigger a scaling action on a NS instantiated according to the NSD. @@ -166,13 +237,6 @@ NOTE 2: There may be multiple data sources (each identified as monitoredInfo) p - - - Identifies either a virtualised resource-related performance metric or a VNF Indicator. - - - - Provides a life cycle management script written in a Domain Specific Language (DSL). @@ -180,30 +244,16 @@ NOTE 2: There may be multiple data sources (each identified as monitoredInfo) p - - - Provides the constituent VLDs. -Cardinality of 0 means that the NS is a NF set with unspecified connectivity. - + + + Specifies a DF within the scope of an NSD. - - + - - - References the VNFD of a constituent VNF. + + + Provides a signature to prevent tampering. - - - - - - - References the PNFD of a constituent PNF. - - - - @@ -214,19 +264,15 @@ For all attributes in this class the Producer is SDC and the Consumer is SDC/UUI - - - Defines the organization generating the VLD. + + + Identifier of the NsVirtualLinkDesc information element. It uniquely identifies a VLD. - - - - - - Specifies the version of the VLD. + + + The ConnectivityType information element specifies the protocol exposed by a VL and the flow pattern supported by the VL. - @@ -235,6 +281,16 @@ For all attributes in this class the Producer is SDC and the Consumer is SDC/UUI + + + Specifies test access facilities expected on the VL (e.g. none, passive monitoring, or active (intrusive) loopbacks at endpoints). + + + + + Provides human-readable information on the purpose of the virtual link (e.g. VL for control plane traffic). + + @@ -253,27 +309,35 @@ NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF sh - - - Identifies either a virtualised resource-related performance metric or a VNF Indicator. + + + VNF profile to be used for the NS flavour. - - + + - - - Describes the details of an NS level. -NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0. - + + + PNF profile to be used for the NS flavour. - - + + - - - + + + VL profile to be used for the NS flavour. + + + - + + + The scaling aspects supported by this DF of the NS. + + + + + Specifies affinity or anti-affinity relationship applicable between the VNF instances created using different VNFDs, the Virtual Link instances created using different NsVirtualLinkDescs or the nested NS instances created using different NSDs in the same affinity or anti-affinity group. @@ -281,51 +345,197 @@ NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF sh - - - The scaling aspects supported by this DF of the NS. + + + Describes the details of an NS level. +NOTE: Every VNF, VL and nested NS whose descriptor is referenced by the NS DF shall be involved in an NS instantiation level of the parent NS. If no instances of a given VNF/nested NS have to be deployed at NS instantiation time, the numberOfInstances attribute in the corresponding VnfToLevelMapping/NsToLevelMapping datatype shall be set to 0. + - - + + - - - PNF profile to be used for the NS flavour. + + + + + + + Additional parameters for NS Lifecycle Management operations. - - - + - + Specifies a NS Profile supported by this NS DF. - - - VNF profile to be used for the NS flavour. - - - - - - + Specifies the order in which instances of the VNFs and/or nested NSs have to be created. - - - - VL profile to be used for the NS flavour. + + + Identifies either a virtualised resource-related performance metric or a VNF Indicator. - - - + + + + + + + The VnfProfile class specifies a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF. + + + + Identifier of this vnfProfile class. It uniquely identifies a VnfProfile. + + + + + + Reference to the VNFD. + + + + + + + + + Identifies a flavour within the VNFD. + + + + + + + + + Identifier of the instantiation level of the VNF DF to be used for instantiation. +If not present, the default instantiation level as declared in the VNFD shall be used. + + + + + + + + Minimum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile. + + + + + + Maximum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile. + + + + + + Specifies affinity and anti-affinity rules applicable between VNF instances created from this profile. + + + + + + + + Identifier(s) of the affinity or anti-affinity group(s) the VnfProfile belongs to. +NOTE: Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationships between the VNF instance(s) created using this VnfProfile and the VNF instance(s) created using other VnfProfile(s) in the same group. + + + + + + Defines the connection information of the VNF, it contains connection relationship between a VNF connection point and a NS virtual Link. + + + + + + + + The PnfProfile class describes additional data for a given PNF instance used in a DF. + + + + Identifier of this PnfProfile class. It uniquely identifies a PnfProfile. + + + + + + References a PNFD. + + + + + + Defines the connection information of the PNF, it contains connection relationship between a PNF connection point and a NS virtual Link. + + + + + + + + + The VirtualLinkProfile class specifies a profile for instantiating VLs of a particular NS DF according to a specific VLD and VL DF. + + + + Uniquely identifies this VirtualLinkProfile class. + + + + + + Uniquely references a VLD. + + + + + + + + Identifies a flavour within the VLD. + + + + + Specifies affinity and anti-affinity rules applicable between VLs instantiated from the referenced VLD. + + + + + + + + Identifies an affinity or anti-affinity group the VLs instantiated according to the VlProfile belong to. +NOTE : Each identifier references an affinity or anti-affinity group which expresses affinity or anti-affinity relationship between the VL(s) using this VirtualLinkProfile and the VL(s) using other VirtualLinkProfile(s) in the same group. + + + + + + + + Specifies the maximum bitrate requirements for a VL instantiated according to this profile. +NOTE: These attributes are used to control scaling boundaries. + + + + + + Specifies the minimum bitrate requirements for a VL instantiated according to this profile. +NOTE: These attributes are used to control scaling boundaries. + + @@ -352,7 +562,7 @@ Scaling by a single step does not imply that exactly one instance of each entity - + Describes the details of an NS level. NOTE: Only a subset of the VNFs, VLs and nested NSs whose descriptor is referenced by the NS DF may be involved in an NS scale level of the parent NS. @@ -384,19 +594,17 @@ NS levels may be used in the context of NS scaling and in this case they are ref - + Specifies the profile of the VNFs involved in this NS level and, for each of them, the required number of instances. - - + Specifies the profile of the VLs involved in this NS level and, for each of them, the needed bandwidth. - @@ -412,15 +620,33 @@ NS levels may be used in the context of NS scaling and in this case they are ref The NsProfile class specifies the profile to be used for a nested NS. - - - Identifies an NS profile. + + + Identifies the NSD applicable to NS instantiated according to this profile. + + + + + + + Identifies the applicable NS DF within the scope of the NSD. + + + + + + + Identifies the NS level within the referenced NS DF to be used in the context of the parent NS instantiation. If not present, the default NS instantiation level as declared in the referenced NSD shall be used. + + + + Minimum number of nested NS instances based on the referenced NSD that is permitted to exist for this NsProfile. @@ -441,26 +667,290 @@ NS levels may be used in the context of NS scaling and in this case they are ref - - - Identifies the applicable NS DF within the scope of the NSD. + + + Defines the connection information of the NS, it contains connection relationship between an NS SAP and a NS virtual Link of the composite NS. - - + - - - Identifies the NS level within the referenced NS DF to be used in the context of the parent NS instantiation. If not present, the default NS instantiation level as declared in the referenced NSD shall be used. + + + + The SAPD class specifies the information used to instantiate the service access points of an NS. A Sapd inherits from the Cpd class. All attributes of the Cpd are also attributes of the Sapd. + + + + + + + References the descriptor of VNF external connection points or the descriptor of PNF external connection points or the descriptor of the SAP of a nested NS of this NS, which the SAPs instantiated from this SAPD are mapped to. - - + + + - - - Identifies the NSD applicable to NS instantiated according to this profile. + + + References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to. - - + + + + + + + The Vnffgd information element specifies a topology of connectivity of a NS and optionally forwarding rules applicable to the traffic conveyed over this topology. + + + + Identifier of this Vnffgd information element. It uniquely identifies a VNFFGD. + + + + + + References the VnfProfile of a constituent VNF. +NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it. +NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD. + + + + + + + References the pnfProfile of a constituent PNF. +NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it. +NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD. + + + + + + + References the nsProfile of a constituent NS. +NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it. +NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD. + + + + + + + References the virtualLinkProfile of a constituent VL. +NOTE 1: The list of constituent VNFs, PNFs, and nested NS SAPs of a VNFFG can be identical to the list of constituent VNFs, PNFs and nested NSs of the parent NSD, or can be a subset of it. +NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply that all connection points instantiated from all embedded CPDs are connected to the VNFFG instantiated using the VNFFGD. + + + + + + + NfpPositionElement associated with one of the constituent VNF Profile, PNF Profile or NS Profile of a nested NS. + + + + + + The network forwarding path associated to the VNFFG. + + + + + + + + The SecurityParameters information element contains the signature of an NSD instance together with information required to validate the signature. + + + + Provides the signature of the signed part of the descriptor. + + + + + + Specifies the algorithm used to compute the signature. + + + + + + Provides a certificate or a reference to a certificate to validate the signature. + + + + + + + The Nfpd class associates traffic flow criteria to a list of descriptors associated to the connection points and service access points to be visited by traffic flows matching these criteria. + + + + Identifies this nfpd class within a VNFFGD. + + + + + Provides an NFP classification and selection rule. +The rule may be expressed as a criteria constructed out of atomic assertions linked by Boolean operators AND, OR and NOT. +NOTE: Examples of atomic assertions are assertions on packet header fields’ values, date and time ranges, etc. + + + + + References the descriptor of a connection point to be traversed by the traffic flows matching the criteria. This shall be a connection point attached to one of the constituent VNFs and PNFs of the parent VNFFG, or a SAP of one of the constituent nested NSs of the parent VNFFG. +NOTE: When multiple values are provided, the order is significant and specifies the sequence of connection points to be traversed. + + + + + + + The VnfIndicatorData information element identifies a VNF indicator in a VNFD. + + + + Identifies a VNFD. + + + + + + Identifies a VNF indicator within the VNFD. + + + + + + + The MonitoringParameter information element specifies a virtualised resource related performance metric to be monitored. + + + + Unique identifier of this monitoring parameter information element. + + + + + + Human readable name of the monitoring parameter. + + + + + Defines the virtualised resource-related performance metric. +NOTE: The NFVO collects the performance reports corresponding to metric defined in this attribute from the VIMs and VNFMs using one or more PM Jobs. + + + + + + An attribute that describes the periodicity at which to collect the performance information. + + + + + + + This information element is a container for all additional parameters that affect the invocation of NS Lifecycle Management operations, structured by operation. + + + + Additional parameters for the Instantiate NS operation. + + + + + Additional parameters for the Scale NS operation. + + + + + Additional parameters for the Heal NS operation. + + + + + + This information element defines attributes that represent additional parameters for invocation of the Instantiate Ns operation. + + + + Array of KVP requirements for additional parameters of NS to be passed when invoking the Instantiate Ns operation. + + + + + + + + + This information element defines attributes that represent additional parameters for invocation of the Scale Ns operation. + + + + Array of KVP requirements for additional parameters of NS to be passed when invoking the Instantiate Ns operation. + + + + + + + + + This information element defines attributes that represent additional parameters for invocation of the Heal Ns operation. + + + + Array of KVP requirements for additional parameters of NS to be passed when invoking the Instantiate Ns operation. + + + + + + + + + The CpdInConstituentElement information element enables identifying a CPD or SAPD in the context of an NS constituent. + + + + References the profile of an NS constituent. + + + + + + References the VNF external CPD for a given VnfProfile, or the PNF external CPD for a given PnfProfile, or a NS SAPD for a given NsProfile identified by the constituentBaseElementId. + + + + + + + The Dependencies information element provides indications on the order in which VNFs associated to different VNF Profiles and/or nested NSs associated to different NS Profiles are to be instantiated. + + + + References a VnfProfile or NsProfile. +NOTE: NFV Management and Orchestration functions shall instantiate VNFs from the VnfProfile and/or nested NSs from the NsProfile referenced in the primary attribute before instantiating VNFs from the VnfProfile and/or nested NSs from the NsProfile referenced in the secondary attribute. + + + + + + + + + + References a VnfProfile or NsProfile. +NOTE: NFV Management and Orchestration functions shall instantiate VNFs from the VnfProfile and/or nested NSs from the NsProfile referenced in the primary attribute before instantiating VNFs from the VnfProfile and/or nested NSs from the NsProfile referenced in the secondary attribute + + + + + + @@ -481,6 +971,84 @@ NS levels may be used in the context of NS scaling and in this case they are ref Respresents the port of a NS VL. + + + A composition of Network Functions and defined by its functional and behavioural specification. +NOTE: The Network Service (NS) contributes to the behaviour of the higher layer service, which is characterized by at least performance, dependability, and security specifications. The end-to-end network service behaviour is the result of the combination of the individual network function behaviours as well as the behaviours of the network infrastructure composition mechanism. + + + + Identifier of this NetworkService, identifying the NS instance. + + + + + + Human readable name of the NS instance. + + + + + + Human readable description of the NS instance + + + + + + Reference to consistituent VNFs and PNFs on this NS. +NOTE: Cardinality of zero is only valid for a non-instantiated NS. + + + + + + + + + + Information on the VLs of this NS. +NOTE: Cardinality of zero is only valid for a non-instantiated NS. + + + + + + + + + Information on the SAPs of this NS. + + + + + + + + Reference to information on nested NSs of this NS. + + + + + + + + Information on the VNFFGs of this NS. + + + + + + + + + + Provides information on a Service Access Point (SAP) of a NS + + + + + @@ -539,6 +1107,25 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess + + + Specifies the maximum latency in ms. + + + + + + Specifies the maximum jitter in ms. + + + + + + Specifies the maximum packet loss ratio. + + + + Specifies the priority level in case of congestion on the underlying physical links. @@ -548,22 +1135,43 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - Specifies one of the three levels defined in ETSI GS NFV-REL 001: -• Level 1 -• Level 2 -• Level 3 - - - - - - - The MonitoredData datatype identifies information to be monitored during the lifetime of a network service instance. + The MonitoredData datatype identifies information to be monitored during the lifetime of a network service instance. +NOTE: One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes). + + + + Provides information on a VNF Indicator to be monitored. + + + + + + Specifies the virtualised resource related performance metric to be monitored on an NS level or VNF level. + + + + + + + The VnfToLevelMapping datatype specifies the profile to be used for a VNF involved in a given NS level and the required number of instances. + + + Identifies the profile to be used for a VNF involved in an NS level. + + + + + + Specifies the number of VNF instances required for an NS level. +NOTE 1: It shall be in the range of minNumberOfInstances-maxNumberOfInstances, as specified in the referenced VnfProfile. +NOTE 2: When the corresponding NS level is used in the context of NS instantiation, the numberOfInstances attribute specifies the number of VNF instances to be deployed. +NOTE 3: When the corresponding NS level is used in the context of NS scaling, the numberOfInstances attribute does not specify the number of VNF instances to be added/removed when reaching that NS scale level. The actual number of VNF instances to be added/removed can be derived by subtracting the numberOfInstances declared in the source NS scale level from the numberOfInstances declared in the target NS level of the scaling request. + + + @@ -585,6 +1193,22 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t + + + The VirtualLinkToLevelMapping datatype specifies the profile to be used for a VL involved in a given NS level and bitrate requirements. + + + + Identifies the profile to be used for a VL involved in an NS level. + + + + + Specifies the bit rate requirements for the NS level. +NOTE: It shall be in the range of minBitrateRequirements - maxBitrateRequirements, as specified in the referenced VirtualLinkProfile. + + + The NsVirtuallLinkConnectivity datatype describes connection information between a connection point and a NS virtual Link. @@ -593,12 +1217,87 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t Reference an NS VL profile. + - + References the descriptor of a connection point on a VNF/PNF or a SAP which connects to virtual links instantiated from the profile identified in the virtualLinkProfileId attribute. + + + + + + The NfpPositionElement information element references one or two CPD(s) or SAPD(s) for a given VnfProfile, PnfProfile or NsProfile. +The usage of profiles enables differentiating the CPDs or SAPDs specified in the same VNFD/PNFD/NSD that are applicable to different VNF/PNF/NS instances derived from the same VNFD/PNFD/NSD. + + + + Identifier of this NfpPositionElement information element. It uniquely identifies an NfpPositionElemen. + + + + + + Specifies a CPD or SAPD in the context of a profile of an NS constituent element +When only one value is provided, the ingress and egress traffic is associated to a single CPD or SAPD. When two values are provided, the ingress CP/SAP is associated to the first value and the egress CP/SAP is associated to the second value + + + + + + + The NfpPositionDesc information element references one or more CPDs or SAPDs and provides rules on how to route traffic flows among CP or SAP instances instantiated from these descriptors. + + + + Identifier of this NfpPositionDesc element. + + + + + References one or a pair of CPDs or SAPDs + + + + + Specifies a rule to apply to forward traffic to CP or SAP instances corresponding to the referenced CPD(s) and SAPD(s). The minimum list of rules to be supported shall include: • ALL = Traffic flows shall be forwarded simultaneously to all CP or SAP instances created from the referenced CP profile(s). • LB = Traffic flows shall be forwarded to one CP or SAP instance created from the referenced CP profile(s) selected based on a load-balancing algorithm. + + + + + Provides input parameters to configure the forwarding behaviour (e.g. identifies a load balancing algorithm). + + + + + + + + Specifies the protocols that the VL uses (Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). + + + + + + + Specifies the flow pattern of the connectivity (Line, Tree, Mesh, etc.). + + + + + + + Specifies one of the three levels defined in ETSI GS NFV-REL 001: +• Level 1 +• Level 2 +• Level 3 + + + + + @@ -626,7 +1325,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - @@ -656,8 +1354,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - @@ -726,18 +1422,154 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Pnf.uml b/ONAP_Information_Model/Pnf.uml index 799f4ce..d4a9e7b 100644 --- a/ONAP_Information_Model/Pnf.uml +++ b/ONAP_Information_Model/Pnf.uml @@ -114,26 +114,6 @@ NOTE: The provider of the PNFD might be different from the provider of the PNF. - - - The PnfProfile class describes additional data for a given PNF instance used in a DF. - - - - Identifier of this PnfProfile class. It uniquely identifies a PnfProfile. - - - - - - Defines the connection information of the PNF, it contains connection relationship between a PNF connection point and a NS virtual Link. - - - - - - - @@ -199,9 +179,15 @@ NOTE: The provider of the PNFD might be different from the provider of the PNF. - - - + + + + + + + + + @@ -210,7 +196,6 @@ NOTE: The provider of the PNFD might be different from the provider of the PNF. - diff --git a/ONAP_Information_Model/Service.notation b/ONAP_Information_Model/Service.notation index e1c412d..7aac8ac 100644 --- a/ONAP_Information_Model/Service.notation +++ b/ONAP_Information_Model/Service.notation @@ -547,118 +547,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -986,90 +874,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2429,15 +2233,6 @@ - - - - - - - - - @@ -2558,165 +2353,204 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + + + + + + + + + @@ -3016,205 +2850,277 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + @@ -3249,14 +3155,6 @@ - - - - - - - - @@ -3288,14 +3186,6 @@ - - - - - - - - @@ -3327,14 +3217,6 @@ - - - - - - - - @@ -3495,14 +3377,6 @@ - - - - - - - - @@ -3534,14 +3408,6 @@ - - - - - - - - @@ -3587,15 +3453,6 @@ - - - - - - - - - @@ -3669,14 +3526,6 @@ - - - - - - - - @@ -3708,14 +3557,6 @@ - - - - - - - - @@ -3747,110 +3588,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3891,14 +3628,6 @@ - - - - - - - - @@ -3939,14 +3668,6 @@ - - - - - - - - @@ -4014,14 +3735,6 @@ - - - - - - - - @@ -4048,14 +3761,6 @@ - - - - - - - - @@ -4082,14 +3787,6 @@ - - - - - - - - @@ -4166,14 +3863,6 @@ - - - - - - - -

@@ -4277,7 +3966,7 @@ - + @@ -4292,66 +3981,6 @@ - - -

- - - - - - -

- - - - @@ -4391,14 +4020,6 @@ - - - - - - - - @@ -4430,161 +4051,351 @@ - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - - - - - - - + + + + - - - - - - - - + + + + + + - - - - - - - - + + + + + + - - - - - - - + + + + + - - - - - - - + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4662,7 +4473,7 @@ - + @@ -4728,16 +4539,6 @@ - - - - - - - - - - @@ -4800,16 +4601,6 @@ - - - - - - - - - - @@ -4872,156 +4663,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5044,36 +4685,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5147,16 +4758,6 @@ - - - - - - - - - - @@ -5188,16 +4789,6 @@ - - - - - - - - - - @@ -5208,75 +4799,396 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP_Information_Model/Service.uml b/ONAP_Information_Model/Service.uml index 63540ac..1dfb2da 100644 --- a/ONAP_Information_Model/Service.uml +++ b/ONAP_Information_Model/Service.uml @@ -1,1681 +1,1517 @@ - - - - - -