From 43ff225646225202783815b270f495bedc2d9a2c Mon Sep 17 00:00:00 2001 From: LINMENG Date: Fri, 12 Oct 2018 22:47:47 +0800 Subject: Delete redundant service descriptors Issue-ID: MODELING-104 Change-Id: Ia3aabdada6af18c429b4c73f63ed5263bd92ef0d Signed-off-by: LINMENG --- papyrus/ONAP Information Model/Service.notation | 773 ++++++++++++++---------- papyrus/ONAP Information Model/Service.uml | 216 ++----- 2 files changed, 514 insertions(+), 475 deletions(-) (limited to 'papyrus') diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation index b371b58..10eaee2 100644 --- a/papyrus/ONAP Information Model/Service.notation +++ b/papyrus/ONAP Information Model/Service.notation @@ -491,37 +491,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4458,7 +4427,7 @@ - + @@ -4536,75 +4505,194 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + +
+
+ + + + + + + +
+ + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + - - - - + + +
+ + + +
+ + + + + + + + + - + @@ -4622,17 +4710,6 @@ - - - - - - - - - - - @@ -4643,17 +4720,6 @@ - - - - - - - - - - - @@ -4686,7 +4752,8 @@ - + + @@ -4696,7 +4763,8 @@ - + + @@ -4731,7 +4799,7 @@ - + @@ -4797,147 +4865,94 @@ - - - - + + + + - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5058,22 +5073,152 @@ + + +
+ + + + + + + +
+ + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -5094,61 +5239,71 @@ - - - + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index 1215883..7bcb310 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -25,15 +25,6 @@ - - -
- - - - - -
@@ -378,12 +369,6 @@ - - -
- - -
@@ -402,28 +387,6 @@ - - -
- - - - - - - - - -
- - - - - -
- - -
@@ -550,6 +513,30 @@ + + +
+ + + + + +
+ + + + + +
+ + + + + +
+ + + @@ -998,7 +985,7 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances Respresents the port of a NS VL. - + ServiceDescriptor is used to model the design time representation of a service. @@ -1066,10 +1053,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - - - - @@ -1082,6 +1065,18 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances + + + + + + + + + + + + @@ -1508,7 +1503,7 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - + @@ -1559,14 +1554,14 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - + - - - + + + @@ -1576,95 +1571,6 @@ NOTE: It indicates an exhaustive list of all the CP instances and SAP instances - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Constant identifier of the service model. - - - - - - Versioned identifier of the service model (this uuid is changed for every major version of the service) - - - - - - The name of the service model designed. - - - - - - - - - - - - - - - - An optional string field defining a generic type (like category) of the service. E.g. this field can be used for defining the service as “TRANSPORT”. - - - - - - An optional string field for shortcode that defines the function that the service is providing. E.g. “MISVPN” or “AIM”. - - - - - - - - The icon path of the service. - - - - - - The service component descriptor UUIDs that the service includes (relationhip to Service Component). - - - - @@ -2003,8 +1909,6 @@ If null, then represents to the end of time - - @@ -2342,16 +2246,6 @@ If null, then represents to the end of time - - - - - - - - - - @@ -2367,24 +2261,6 @@ If null, then represents to the end of time - - - - - - - - - - - - - - - - - - @@ -2409,4 +2285,12 @@ If null, then represents to the end of time + + + + + + + + -- cgit 1.2.3-korg