From 5dd2a4bae36c22fb002e611fa6fbb5ad6c7c62b7 Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Sun, 17 Feb 2019 17:07:20 +0800 Subject: Supplement nested Service Delete 3 repeated classes, supplement Atomic/Composite Service View attributes. Issue-ID: MODELING-104 Change-Id: I5b7179b56235bcc37e4deb71c86862409b3a65ae Change-Id: I5b7179b56235bcc37e4deb71c86862409b3a65ae Signed-off-by: guochuyicmri --- ONAP Information Model/Resource.notation | 46 +- ONAP Information Model/Resource.uml | 3 + ONAP Information Model/Service.notation | 1834 ++++++++++-------------------- ONAP Information Model/Service.uml | 130 ++- 4 files changed, 734 insertions(+), 1279 deletions(-) diff --git a/ONAP Information Model/Resource.notation b/ONAP Information Model/Resource.notation index 75e9556..5944fa1 100644 --- a/ONAP Information Model/Resource.notation +++ b/ONAP Information Model/Resource.notation @@ -24,7 +24,7 @@ - + @@ -34,6 +34,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,4 +84,14 @@ + + + + + + + + + + diff --git a/ONAP Information Model/Resource.uml b/ONAP Information Model/Resource.uml index 08361ea..6d36f8a 100644 --- a/ONAP Information Model/Resource.uml +++ b/ONAP Information Model/Resource.uml @@ -13,6 +13,7 @@ In this context, a resource is something that goes into a resource catalog from + @@ -24,4 +25,6 @@ In this context, a resource is something that goes into a resource catalog from + + diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation index adaf44a..7391686 100644 --- a/ONAP Information Model/Service.notation +++ b/ONAP Information Model/Service.notation @@ -1,416 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1871,812 +1460,6 @@ - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - -

- - - - - - - -

- - - -

- - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - -

- - - - - - - - - - - - -

- - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - -

- - - -

- - - - - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3541,7 +2324,7 @@ - + @@ -4273,7 +3056,7 @@ - + @@ -4312,7 +3095,7 @@ - + @@ -4328,6 +3111,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4351,7 +3215,7 @@ - + @@ -4364,7 +3228,7 @@ - + @@ -4395,7 +3259,7 @@ - + @@ -4411,6 +3275,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + @@ -4434,7 +3415,7 @@ - + @@ -4444,15 +3425,138 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4529,7 +3633,7 @@ - + @@ -4538,9 +3642,9 @@ - - - + + + @@ -4549,9 +3653,9 @@ - - - + + + @@ -4560,9 +3664,9 @@ - - - + + + @@ -4571,7 +3675,7 @@ - + @@ -4591,9 +3695,9 @@ - + - + @@ -4602,7 +3706,7 @@ - + @@ -4622,9 +3726,9 @@ - + - + @@ -4653,9 +3757,9 @@ - - - + + + @@ -4684,9 +3788,235 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml index 10c29b6..66dce7f 100644 --- a/ONAP Information Model/Service.uml +++ b/ONAP Information Model/Service.uml @@ -1,5 +1,5 @@ - + @@ -274,12 +274,6 @@ - - -

- - -

@@ -430,12 +424,6 @@ Found 4 ServiceDescriptor Objects. Deleted down to one. - - Kevin to complete draft of composite/atomic diagram and some class/association clean-up this week. - -Chuyi to then work on service descriptor attributes next week (after papyrus model fix). - - found 2 ServiceCompositeDescriptors - deleted down to 1 @@ -445,6 +433,48 @@ Chuyi to then work on service descriptor attributes next week (after papyrus mod Do we need this diagram? + + +

+ + + + + +

+ + + + + + + + +

+ + + + + + @@ -569,19 +599,13 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - - - The service component descriptor UUIDs that the service includes (relationhip to Service Component). - - - - - - + + + @@ -622,6 +646,9 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th The service model version in SDC catalog. + + The service model version in SDC catalog. + @@ -660,7 +687,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + ServcieComponentDescriptor is used to model the design time representation of a service component or network service. @@ -710,6 +737,11 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + + + @@ -871,9 +903,19 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + + + + + + + + @@ -918,6 +960,11 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th + + + + + @@ -1354,7 +1401,6 @@ If null, then represents to the end of time - @@ -1482,8 +1528,6 @@ If null, then represents to the end of time - - @@ -1560,4 +1604,38 @@ If null, then represents to the end of time + + + + + + + + + + + + + + + + + + + + + + +