From d2d9dbe58dab63620e8981c43eed1a7cd2fe2ce8 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Wed, 30 Jan 2019 19:20:24 +0800 Subject: Supplement nested service attributes. Issue-ID: MODELING-104 Change-Id: I273de1cab1609af83301ff2d2754e4b753879d08 Change-Id: I273de1cab1609af83301ff2d2754e4b753879d08 Signed-off-by: guochuyicmri --- papyrus/ONAP Information Model/Service.notation | 206 ++++++++++++++++-------- papyrus/ONAP Information Model/Service.uml | 32 ++-- 2 files changed, 159 insertions(+), 79 deletions(-) diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation index adaf44a..349e72d 100644 --- a/papyrus/ONAP Information Model/Service.notation +++ b/papyrus/ONAP Information Model/Service.notation @@ -70,15 +70,6 @@ - - - - - - - - - @@ -88,15 +79,6 @@ - - - - - - - - - @@ -2042,13 +2024,6 @@ - - -
- - - -
@@ -2056,13 +2031,6 @@ - - -
- - - -
@@ -2509,26 +2477,32 @@
- + + - + + - + + - + + - + + - + + - + @@ -2595,13 +2569,6 @@ - - -
- - - -
@@ -2609,13 +2576,6 @@ - - -
- - - -
@@ -2650,7 +2610,7 @@ - + @@ -4328,6 +4288,115 @@ + + + +
+ + + + + + + +
+ + + + + + + + multiplicity + visibility + name + type + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4351,7 +4420,7 @@ - + @@ -4364,7 +4433,7 @@ - + @@ -4372,6 +4441,15 @@ + + + + + + + + + @@ -4395,7 +4473,7 @@ - + @@ -4529,7 +4607,7 @@ - + @@ -4539,8 +4617,8 @@ - - + + @@ -4602,7 +4680,7 @@ - + @@ -4622,9 +4700,9 @@ - + - + @@ -4685,7 +4763,7 @@ - + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index aa853b4..5fc32ad 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -555,26 +555,12 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - - - 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). - - - @@ -710,6 +696,12 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + The service component descriptor UUIDs that the service includes (relationhip to Service Component). + + + @@ -1619,7 +1611,6 @@ If null, then represents to the end of time - @@ -2086,4 +2077,15 @@ If null, then represents to the end of time + + + + + + + + + + + -- cgit 1.2.3-korg