From 4f252923df5221ee068b76ec44d1952bbabcd6c7 Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Thu, 23 Aug 2018 10:40:41 -0700 Subject: Alignment of NSD model with R2 Issue-ID: MODELING-104 Change-Id: I0209044799e915670b639c73120033d63695c512 Signed-off-by: jjewitt58 --- papyrus/ONAP Information Model/Resource.notation | 237 +++++------ papyrus/ONAP Information Model/Resource.uml | 245 ++++++++++- papyrus/ONAP Information Model/Service.uml | 510 ++++++++++------------- 3 files changed, 561 insertions(+), 431 deletions(-) (limited to 'papyrus') diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation index 19b6a91..3424713 100644 --- a/papyrus/ONAP Information Model/Resource.notation +++ b/papyrus/ONAP Information Model/Resource.notation @@ -1,5 +1,5 @@ - + @@ -16,42 +16,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -79,6 +43,15 @@ + + + + + + + + + @@ -118,33 +91,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -167,13 +113,13 @@ - - + + - + @@ -184,43 +130,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -243,13 +152,13 @@ - + - + @@ -260,15 +169,6 @@ - - - - - - - - - @@ -291,13 +191,13 @@ - + - + @@ -314,14 +214,6 @@ - - -

- - - - - @@ -399,6 +291,11 @@ + + + + + @@ -438,17 +335,56 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -468,7 +404,7 @@ - + @@ -509,7 +445,7 @@ - + @@ -550,7 +486,7 @@ - + @@ -584,9 +520,9 @@ - - - + + + @@ -698,7 +634,7 @@ - + @@ -792,6 +728,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml index ba83318..d63ce19 100644 --- a/papyrus/ONAP Information Model/Resource.uml +++ b/papyrus/ONAP Information Model/Resource.uml @@ -70,31 +70,28 @@ NOTE 2: There may be multiple data sources (each identified as monitoredInfo) p - + Identifies a DF within the scope of an NSD. - - + Provides the descriptor of a SAP of the NS. - - + Provides the descriptors of the applicable forwarding graphs. Cardinality of 0 means that the NS is a NF set with unspecified connectivity. - @@ -118,11 +115,10 @@ Cardinality of 0 means that the NS is a NF set with unspecified connectivity.&#x - + References the PNFD of a constituent PNF. - @@ -173,6 +169,239 @@ Cardinality of 0 means that the NS is a NF set with unspecified connectivity.&#x + + + The NsDf class specifies the properties of a variant of an NS. +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. + + + + Identifies this NsDf class. It identifies a NS DF within the NSD. + + + + + + Assurance parameter against which this flavour is being described. The key can be a combination of multiple assurance parameters with a logical relationship between them. The parameters should be present as a monitoredInfo attribute in the NSD. + + + + + + Identifies either a virtualised resource-related performance metric or a VNF Indicator. + + + + + + + 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. + + + + + + + + + + + + + + + + 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. + + + + + + + + + The scaling aspects supported by this DF of the NS. + + + + + + + + + PNF profile to be used for the NS flavour. + + + + + + + + + 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. + + + + + + + + + + The Vnffgd class 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 VNFD 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. + + + + + + + + A reference to a pool of descriptors of connection points attached to one of the constituent VNFs and PNFs and/or one of the SAPs of the parent NS or of a nested NS. + + + + + + + + The network forwarding path associated to the VNFFG. + + + + + + + + References the VLD of a constituent VL. +NOTE: The presence of a VLD identifier in a VNFFGD does not imply that all connection points of the VLs instantiated using this VL are connected to the VNFFG instantiated using the VNFFGD. + + + + + + + + + References the PNFD 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. + + + + + + + + + + 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. + + + + + + + Specify whether the SAP address assignment is under the responsibility of management and orchestration functions or not. +If it is set to True, management and orchestration functions are responsible for assigning addresses to the access points instantiated from this SAPD. + + + + + + References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. + + + + + + + + References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to. + + + + + + + + The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only. + + + + Identifier of this Pnfd class. It uniquely identifies the PNFD. + + + + + + Identifies the provider of the PNFD. +NOTE: The provider of the PNFD might be different from the provider of the PNF. + + + + + + Identifies the version of the PNFD + + + + + + Provides a signature to prevent tampering. + + + + + + + + Specifies the characteristics of one or more connection points where to connect the PNF to a VL. + + + + + + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index 841efed..6461a96 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -65,35 +65,55 @@ - +

- + + + + + - +

- + + + + + @@ -113,11 +133,15 @@ - +

- + + + + + @@ -128,11 +152,14 @@ - +

- + + + + @@ -164,11 +191,15 @@ - +

- + + + + + @@ -341,11 +372,14 @@ - +

- + + + + @@ -384,11 +418,14 @@ - +

- + + + + @@ -544,11 +581,15 @@ If null, then represents to the end of time - +

- + + + + + @@ -832,10 +873,11 @@ 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. + @@ -1417,220 +1459,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - - - The Pnfd class is a deployment template enabling on-boarding PNFs and referencing them from an NSD. It focuses on connectivity aspects only. - - - - Identifier of this Pnfd class. It uniquely identifies the PNFD. - - - - - - Identifies the provider of the PNFD. -NOTE: The provider of the PNFD might be different from the provider of the PNF. - - - - - - Identifies the version of the PNFD - - - - - - Provides a signature to prevent tampering. - - - - - - - - Specifies the characteristics of one or more connection points where to connect the PNF to a VL. - - - - - - - - The NsDf class specifies the properties of a variant of an NS. -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. - - - - Identifies this NsDf class. It identifies a NS DF within the NSD. - - - - - - Assurance parameter against which this flavour is being described. The key can be a combination of multiple assurance parameters with a logical relationship between them. The parameters should be present as a monitoredInfo attribute in the NSD. - - - - - - Identifies either a virtualised resource-related performance metric or a VNF Indicator. - - - - - - - - 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. - - - - - - - - - - - - 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. - - - - - - - - The scaling aspects supported by this DF of the NS. - - - - - - - PNF profile to be used for the NS flavour. - - - - - - - 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. - - - - - - - - The Vnffgd class 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 VNFD 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. - - - - - - - - A reference to a pool of descriptors of connection points attached to one of the constituent VNFs and PNFs and/or one of the SAPs of the parent NS or of a nested NS. - - - - - - - The network forwarding path associated to the VNFFG. - - - - - - - References the VLD of a constituent VL. -NOTE: The presence of a VLD identifier in a VNFFGD does not imply that all connection points of the VLs instantiated using this VL are connected to the VNFFG instantiated using the VNFFGD. - - - - - - - - - References the PNFD 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. - - - - - - - - - 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. - - - - - - - Specify whether the SAP address assignment is under the responsibility of management and orchestration functions or not. -If it is set to True, management and orchestration functions are responsible for assigning addresses to the access points instantiated from this SAPD. - - - - - - References the descriptor of VNF or PNF external connection points the SAPs instantiated from this SAPD are mapped to. - - - - - - - - References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to. - - - - - - An implementation of a NF via a tightly coupled software and hardware system. @@ -1863,12 +1691,24 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - - + + + + + + + + + + + + + + + + + + @@ -1884,20 +1724,40 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + @@ -2018,7 +1878,9 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + + + @@ -2032,39 +1894,57 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -2173,33 +2053,85 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg