From 832a68c3e85b7493c9916d9cf3bf3920e59d9cfb Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Thu, 23 Aug 2018 09:08:53 -0700 Subject: Apply profile and move NSD to Resource Issue-ID: MODELING-104 Change-Id: I33a3b5d5993b362585d8d6c807972fb5fffb2e6a Signed-off-by: jjewitt58 --- .../GenDoc/ONAP GenDoc Template.docx | Bin 43268 -> 43676 bytes papyrus/ONAP Information Model/Resource.notation | 1288 +++++++++++++++++++- papyrus/ONAP Information Model/Resource.uml | 293 ++++- papyrus/ONAP Information Model/Service.notation | 805 +----------- papyrus/ONAP Information Model/Service.uml | 520 ++++---- papyrus/ONAP Information Model/model.uml | 14 +- 6 files changed, 1795 insertions(+), 1125 deletions(-) diff --git a/papyrus/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx b/papyrus/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx index ad3d7e2..05066f9 100644 Binary files a/papyrus/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx and b/papyrus/ONAP Information Model/GenDoc/ONAP GenDoc Template.docx differ diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation index 8634d4c..19b6a91 100644 --- a/papyrus/ONAP Information Model/Resource.notation +++ b/papyrus/ONAP Information Model/Resource.notation @@ -1,2 +1,1288 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml index 5a5ad16..ba83318 100644 --- a/papyrus/ONAP Information Model/Resource.uml +++ b/papyrus/ONAP Information Model/Resource.uml @@ -1,8 +1,287 @@ - - - - - - - + + + + + + + + + The NSD class is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs. + + + + Identifier of this NSD class. It globally uniquely identifies an instance of the NSD + + + + + + Identifies the designer of the NSD. + + + + + + Identifies the version of the NSD. + + + + + + Provides the human readable name of the NSD. + + + + + + Identifies an NSD in a version independent manner. This attribute is invariant across versions of NSD. + + + + + + Specifies a rule to trigger a scaling action on a NS instantiated according to the NSD. +NOTE 1: The rule is based on a combination of assertions on the values of virtualised resource-related performance metrics and VNF Indicators identified by the monitoredInfo attribute. +NOTE 2: There may be multiple data sources (each identified as monitoredInfo) per rule + + + + + + + + + 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). + + + + + + + Provides a signature to prevent tampering. + + + + + + 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. + + + + + + + + + + Provides the constituent VLDs. +Cardinality of 0 means that the NS is a NF set with unspecified connectivity. + + + + + + + + + References the VNFD of a constituent VNF. + + + + + + + + + References the PNFD of a constituent PNF. + + + + + + + + + References the NSD of a constituent nested NS. + + + + + + + + + The NsVirtualLinkDesc class provides general information enabling the instantiation of virtual links. + + + + + + + Defines the organization generating the VLD. + + + + + + + + Specifies the version of the VLD. + + + + + + Specifies properties for instantiating a VL according to a specific flavour. + + + + + + + Provides a signature to prevent tampering. + + + + + + + + + + + The LifeCycleManagementScript information element specifies a script for the NS. + + + + Describes NS lifecycle event(s) or an external stimulus detected on an NFVO reference point. +NOTE 1: A minimum set of NS lifecycle events triggered internally by the NFVO includes: start instantiation, end instantiation, start scaling, end scaling, start healing, end healing, start termination, end termination, start update, end update. +NOTE 2: A minimum set of external stimulus includes: the receipt of request message of instantiation, scaling, healing, termination, update of NS. + + + + + + + + Includes an NS LCM script (e.g., written in a DSL) triggered to react to one of the events listed in the event attribute. + + + + + + + The VirtualLinkDf datatype specifies properties for instantiating a VL according to a specific flavour. + + + + Identifies this VirtualLinkDF datatype within a VLD. + + + + + + Specifies quality of service parameters applicable to a VL. + + + + + + + Specifies one of the three levels defined in ETSI GS NFV-REL 001: +• Level 1 +• Level 2 +• Level 3 + + + + + + + + The NsQoS datatype specifies quality of service parameters applicable to a NS VL. + + + + + + + Specifies the priority level in case of congestion on the underlying physical links. + + + + + + + + + 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. + + + + Uniquely identifies the VNF Indicator class. +One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes). + + + + + + + + Specifies the virtualised resource related performance metric to be monitored on an NS level or VNF level. +One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes). + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation index d89910b..e25d26e 100644 --- a/papyrus/ONAP Information Model/Service.notation +++ b/papyrus/ONAP Information Model/Service.notation @@ -1183,13 +1183,13 @@ - + - + @@ -1261,13 +1261,13 @@ - + - + @@ -1768,7 +1768,7 @@ - + @@ -1838,7 +1838,7 @@ - + @@ -4190,797 +4190,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index b8a2318..841efed 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -311,23 +311,35 @@ - +

- + + + + + - +

- + + + + + @@ -338,26 +350,36 @@ - +

- + + + + + - +

- + + + + - +

- + + + + @@ -371,11 +393,14 @@ - +

- + + + + @@ -641,10 +666,11 @@ NOTE: Each identifier references an affinity or anti-affinity group which expres - + Identifies a flavour within the VLD. + @@ -677,10 +703,11 @@ NOTE: These attributes are used to control scaling boundaries. - + Uniquely references a VLD. + @@ -819,10 +846,11 @@ NS levels may be used in the context of NS scaling and in this case they are ref - + Identifies the NSD applicable to NS instantiated according to this profile. + @@ -1428,119 +1456,6 @@ NOTE: The provider of the PNFD might be different from the provider of the PNF. - - - The NSD class is a deployment template whose instances are used by the NFVO for the lifecycle management of NSs. - - - - Identifier of this NSD class. It globally uniquely identifies an instance of the NSD - - - - - - Identifies the designer of the NSD. - - - - - - Identifies the version of the NSD. - - - - - - Provides the human readable name of the NSD. - - - - - - Identifies an NSD in a version independent manner. This attribute is invariant across versions of NSD. - - - - - - Specifies a rule to trigger a scaling action on a NS instantiated according to the NSD. -NOTE 1: The rule is based on a combination of assertions on the values of virtualised resource-related performance metrics and VNF Indicators identified by the monitoredInfo attribute. -NOTE 2: There may be multiple data sources (each identified as monitoredInfo) per rule - - - - - - - - - Provides a life cycle management script written in a Domain Specific Language (DSL). - - - - - - - Provides a signature to prevent tampering. - - - - - - 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. - - - - - - - - Provides the constituent VLDs. -Cardinality of 0 means that the NS is a NF set with unspecified connectivity. - - - - - - - - References the VNFD of a constituent VNF. - - - - - - - - References the PNFD of a constituent PNF. - - - - - - - References the NSD of a constituent nested NS. - - - - - The NsDf class specifies the properties of a variant of an NS. @@ -1558,10 +1473,11 @@ 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. + @@ -1663,12 +1579,13 @@ NOTE 2: The presence of a VNFD or PNFD identifier in a VNFFGD does not imply tha - + 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. + @@ -1705,51 +1622,15 @@ If it is set to True, management and orchestration functions are responsible for - + References the descriptor of the NS VL instance to which the SAP instantiated from this SAPD connects to. + - - - The NsVirtualLinkDesc class provides general information enabling the instantiation of virtual links. - - - - - - - Defines the organization generating the VLD. - - - - - - - - Specifies the version of the VLD. - - - - - - Specifies properties for instantiating a VL according to a specific flavour. - - - - - - - Provides a signature to prevent tampering. - - - - - - An implementation of a NF via a tightly coupled software and hardware system. @@ -1809,57 +1690,6 @@ A PnfExtCpd inherits from the Cpd Class. - - - The VirtualLinkDf datatype specifies properties for instantiating a VL according to a specific flavour. - - - - Identifies this VirtualLinkDF datatype within a VLD. - - - - - - Specifies quality of service parameters applicable to a VL. - - - - - - - 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. - - - - Uniquely identifies the VNF Indicator class. -One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes). - - - - - - - Specifies the virtualised resource related performance metric to be monitored on an NS level or VNF level. -One and only one of the attributes shall be included (i.e. there is a XOR relationship between the attributes). - - - - - - The VnfIndicatorData datatype identifies a VNF indicator in a VNFD. @@ -1951,42 +1781,6 @@ NOTE 3: When the corresponding NS level is used in the context of NS scaling, t - - - The NsQoS datatype specifies quality of service parameters applicable to a NS VL. - - - - - - - Specifies the priority level in case of congestion on the underlying physical links. - - - - - - - - - The LifeCycleManagementScript information element specifies a script for the NS. - - - - Describes NS lifecycle event(s) or an external stimulus detected on an NFVO reference point. -NOTE 1: A minimum set of NS lifecycle events triggered internally by the NFVO includes: start instantiation, end instantiation, start scaling, end scaling, start healing, end healing, start termination, end termination, start update, end update. -NOTE 2: A minimum set of external stimulus includes: the receipt of request message of instantiation, scaling, healing, termination, update of NS. - - - - - - - - Includes an NS LCM script (e.g., written in a DSL) triggered to react to one of the events listed in the event attribute. - - - @@ -2006,13 +1800,23 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - + + + + + + + + + - - + + + + + + @@ -2023,29 +1827,63 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + @@ -2168,23 +2006,37 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -2291,23 +2143,36 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2335,21 +2200,54 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/model.uml b/papyrus/ONAP Information Model/model.uml index 2bc6c23..88a368a 100644 --- a/papyrus/ONAP Information Model/model.uml +++ b/papyrus/ONAP Information Model/model.uml @@ -10,15 +10,15 @@ - -

+ +

- + -- cgit 1.2.3-korg