From d5bae8961f5be71b02d77b0b551605c3f42adb40 Mon Sep 17 00:00:00 2001 From: jjewitt58 Date: Tue, 7 Aug 2018 12:06:15 -0700 Subject: Move PNF and NSD models from service to resource Issue-ID: MODELING-104 Change-Id: Ib89176a246e9cbb9b14960d15b72f28be7f17c8d Signed-off-by: jjewitt58 --- .../GenDoc/ONAP Model Structure.docx | Bin 0 -> 42072 bytes papyrus/ONAP Information Model/Resource.notation | 963 ++++++++++++++- papyrus/ONAP Information Model/Resource.uml | 532 +++++++- papyrus/ONAP Information Model/Service.notation | 943 +------------- papyrus/ONAP Information Model/Service.uml | 1295 +++++++++----------- 5 files changed, 2051 insertions(+), 1682 deletions(-) create mode 100644 papyrus/ONAP Information Model/GenDoc/ONAP Model Structure.docx diff --git a/papyrus/ONAP Information Model/GenDoc/ONAP Model Structure.docx b/papyrus/ONAP Information Model/GenDoc/ONAP Model Structure.docx new file mode 100644 index 0000000..93c9b20 Binary files /dev/null and b/papyrus/ONAP Information Model/GenDoc/ONAP Model Structure.docx differ diff --git a/papyrus/ONAP Information Model/Resource.notation b/papyrus/ONAP Information Model/Resource.notation index 777931a..69d6072 100644 --- a/papyrus/ONAP Information Model/Resource.notation +++ b/papyrus/ONAP Information Model/Resource.notation @@ -1,53 +1,924 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Resource.uml b/papyrus/ONAP Information Model/Resource.uml index 962827b..1d7b09d 100644 --- a/papyrus/ONAP Information Model/Resource.uml +++ b/papyrus/ONAP Information Model/Resource.uml @@ -1,14 +1,520 @@ - - - - - - - - - - - - - + + + + +

+ + + + + +

+ + + + + + + + +

+ + + + + +

+ + + + + + + + +

+ + + + + + + + + + + + + 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 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. +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 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. + + + + + + + External CP of the PNF. + + + + + + + + + External CP of the PNF. + + + + + + + Cpd used to deploy this PNF CP. + + + + + + + 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. + + + + + + + + + + A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. +A PnfExtCpd inherits from the Cpd Class. + + + + + + + + diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation index 0a99186..943bf41 100644 --- a/papyrus/ONAP Information Model/Service.notation +++ b/papyrus/ONAP Information Model/Service.notation @@ -764,929 +764,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1716,13 +793,13 @@ - + - + @@ -2106,13 +1183,13 @@ - + - + @@ -2184,13 +1261,13 @@ - + - + @@ -2243,7 +1320,7 @@ - + @@ -2691,7 +1768,7 @@ - + @@ -2761,7 +1838,7 @@ - + @@ -3696,7 +2773,7 @@ - + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index 6ef4f65..f870b23 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -65,104 +65,55 @@ - - -

- - - - - -

- - - - - - - - -

- - - - - -

- - - - - - - - -

- - - - - - - +

- + + + + + - +

- + + + + + @@ -182,11 +133,15 @@ - +

- + + + + + @@ -197,11 +152,14 @@ - +

- + + + + @@ -233,11 +191,15 @@ - +

- + + + + + @@ -299,11 +261,15 @@ - +

- + + + + + @@ -492,258 +458,19 @@ If null, then represents to the end of time - +

- + + + + + - - - 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 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 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 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 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. @@ -774,124 +501,6 @@ NOTE: When multiple values are provided, the order is significant and specifies - - - 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 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 VnfProfile class specifies a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF. @@ -1011,10 +620,11 @@ NOTE: These attributes are used to control scaling boundaries. - + Uniquely references a VLD. + @@ -1030,25 +640,6 @@ NOTE: These attributes are used to control scaling boundaries. - - - 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. - - - - - - The NsScalingAspect class describes the details of an NS scaling aspect. An NS scaling aspect is an abstraction representing a particular "dimension" or "property" along which a given NS can be scaled. @@ -1158,10 +749,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. + @@ -1172,23 +764,15 @@ 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. + - - - A PnfExtCpd is a type of Cpd and describes the characteristics of an external interface, a.k.a external CP, where to connect the PNF to a VL. -A PnfExtCpd inherits from the Cpd Class. - - - - - This is an abstract proxy class, allowing to provide reference to either NsProfile or VnfProfile. @@ -1349,35 +933,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - - - An implementation of a NF via a tightly coupled software and hardware system. - - - - - - - External CP of the PNF. - - - - - - - - External CP of the PNF. - - - - - - - Cpd used to deploy this PNF CP. - - - - Respresents the port of a NS VL. @@ -1993,40 +1548,100 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + @@ -2042,9 +1657,15 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - + + + + + + + + + @@ -2060,7 +1681,9 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - + + + @@ -2076,9 +1699,15 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - + + + + + + + + + @@ -2135,51 +1764,103 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + @@ -2206,7 +1887,9 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - + + + @@ -2222,15 +1905,33 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2254,57 +1955,151 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2325,9 +2120,15 @@ NOTE 2: A minimum set of external stimulus includes: the receipt of request mess - - - + + +