From 992b5f1989209e70b2a6c354e42edb03f7c340d4 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Wed, 5 Jun 2019 19:01:01 +0800 Subject: Udate Service Model to align with wiki page Detailed changes please check with the wiki page with colored attribute. Issue-ID: MODELING-104 Change-Id: I60d233c8aca5ecf0e8af0e4238207c62e3f158ec Signed-off-by: guochuyicmri --- ONAP Information Model/Service.notation | 707 +++++++++++++++++++++++--------- ONAP Information Model/Service.uml | 139 ++++++- 2 files changed, 646 insertions(+), 200 deletions(-) diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation index 6292261..ca0b9c1 100644 --- a/ONAP Information Model/Service.notation +++ b/ONAP Information Model/Service.notation @@ -3220,6 +3220,20 @@ + + +
+
+
+ + + + + + + + + @@ -3340,61 +3354,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+
+
+ + + - + - - - - + + + + + +
+
+
+ @@ -3403,6 +3382,20 @@ + + +
+
+
+ + + + + + + + + @@ -3426,7 +3419,7 @@ - + @@ -3550,32 +3543,33 @@ - - - + + +
+
+
+ + + - + - - - - - - + + + + + +
+
+
+ + + - + - - - - - - - - - - - + + @@ -3988,40 +3982,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4211,6 +4171,247 @@ + + +
+
+
+
+
+ + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + +
+ + + + + + + + + + +
+
+
+
+ + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + @@ -4324,11 +4525,11 @@ - + - + @@ -4381,7 +4582,7 @@ - + @@ -4749,16 +4950,6 @@ - - - - - - - - - - @@ -4790,17 +4981,6 @@ - - - - - - - - - - - @@ -4830,7 +5010,7 @@ - + @@ -4942,6 +5122,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -6010,45 +6210,101 @@ - - - - - - - - - - - - - - - - - - - - - + + +
+
+
+
+ + + +
+
+
+ + + + + + + + + + + +
+
+
+ + + + + + + + + + + +
+
+
+ + + + + + + + + + + +
+
+
+ + + + + + + + + + + +
+
+
+ + + + + + + + + - + - + @@ -6056,12 +6312,21 @@ + + + + + + + + + - + @@ -6070,47 +6335,95 @@ - + + +
+
+
+
+ + + +
+
+
+ + + + + + +
+
+
+ + + + + + +
+
+
+ + + + + + +
+
+
+ + + + + + +
+
+
+ + + + + + +
+
+
+ + + + - + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + @@ -6118,5 +6431,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml index d6410db..1a15db4 100644 --- a/ONAP Information Model/Service.uml +++ b/ONAP Information Model/Service.uml @@ -518,6 +518,20 @@ + + + + + + + + + + + + + + @@ -663,6 +677,20 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + Describe whether this service descriptor is shared or not in the service design. + + + + + + Includes a list of events and corresponding management scripts performed for the +Service. + + + + @@ -717,6 +745,18 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + Record the using number by multiple services. This attribute can be used when an service instance is prepared to be deleted, the detected number will help to find how many ongoing services is reusing this instance. If number is more than 1, it shows this is reusing by other service, otherwise it can be deleted directly. + + + + + + + + + @@ -981,6 +1021,9 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + @@ -1310,12 +1353,6 @@ NOTE: Cardinality of zero is only valid for a non-instantiated NS. - - - - - - @@ -1392,12 +1429,72 @@ If null, then represents to the end of time - - - - - - + + + The LifeCycleManagementScript information element specifies a script for the service. + + + + Describes Service lifecycle event(s) or an external stimulus detected on an orchestrator +reference point. + + + Describes Service lifecycle event(s) or an external stimulus detected on an orchestrator +reference point. + + + + + + + Describes the transition Service lifecycle event(s) that cannot be mapped to any of the enumerated values defined for the event attribute. + + + + + + + + Includes a Service LCM script (e.g. written in a DSL) triggered to react to one of the events listed in the event attribute. + + + + + + Defines the domain specific language (i.e. the type) of script that is provided. Types of scripts could include bash, python, etc. + + + + + + Array of KVP requirements with the key as the parameter name and the value as the parameter that need to be passed as an input to the script. Note: The scriptInput values are passed to the scripts in addition to the parameters received in the operation invocation request or indicator value change. + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1714,7 +1811,6 @@ If null, then represents to the end of time - @@ -1751,4 +1847,21 @@ If null, then represents to the end of time + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg