From b4a92dc343291d73debf6abfba677b271600af30 Mon Sep 17 00:00:00 2001 From: Kevin Scaggs Date: Thu, 24 Jan 2019 08:09:52 -0600 Subject: Updates to Service Started updates to service, deleting duplicate and dated classes and associated relationships, and started building composite/atomic diagram per discussion on Service IM call. Issue-ID: MODELING-104 Change-Id: Ibce2e2a022813babb2fdc469087d4814b54d1d31 Signed-off-by: Kevin Scaggs --- papyrus/ONAP Information Model/Service.notation | 987 +++++++++++++++--------- papyrus/ONAP Information Model/Service.uml | 207 +---- 2 files changed, 639 insertions(+), 555 deletions(-) diff --git a/papyrus/ONAP Information Model/Service.notation b/papyrus/ONAP Information Model/Service.notation index f9efe74..b1e2e65 100644 --- a/papyrus/ONAP Information Model/Service.notation +++ b/papyrus/ONAP Information Model/Service.notation @@ -364,117 +364,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -629,109 +518,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2265,40 +2051,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2453,13 +2205,6 @@ - - -

- - - -

@@ -2542,6 +2287,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2568,16 +2347,6 @@ - - - - - - - - - - @@ -2598,7 +2367,7 @@ - + @@ -2607,9 +2376,9 @@ - + - + @@ -2618,9 +2387,9 @@ - + - + @@ -2647,9 +2416,9 @@ - + - + @@ -2743,7 +2512,7 @@ - + @@ -2766,7 +2535,7 @@ - + @@ -2799,6 +2568,72 @@ + + + + + + + + + + + + +

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

+ + + + + + + + + + + + + + + + + + + + + + + + + @@ -3489,7 +3324,7 @@ - + @@ -3717,84 +3552,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

@@ -4164,6 +3921,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4210,16 +4053,6 @@ - - - - - - - - - -

@@ -4288,7 +4121,7 @@ - +

@@ -4318,9 +4151,9 @@ - - - + + + @@ -4480,5 +4313,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/papyrus/ONAP Information Model/Service.uml b/papyrus/ONAP Information Model/Service.uml index 68eb1ed..caa89f0 100644 --- a/papyrus/ONAP Information Model/Service.uml +++ b/papyrus/ONAP Information Model/Service.uml @@ -35,27 +35,6 @@ - - -

- - - - - -

@@ -216,7 +195,7 @@ - +

@@ -444,6 +423,15 @@ I don't think SDC uses the SID Characteristic patern. + + 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). + + @@ -586,7 +574,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + @@ -667,15 +655,15 @@ 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. + Constant identifier of the Service Component model. @@ -716,67 +704,6 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - - - - - - - - ServiceComponentInstance is used to model the run time representation of a service component. - - - - Uniquely identifies this instance of a service component. - - - - - - The name assigned to the service component instance. - - - - - - Constant identifier of the service component model. - - - - - - Versioned identifier of the service component model (this uuid is changed for every major version of the service component). - - - - - - The service version in SDC catalog. - - - - - - URL to endpoint where more details can be gotten. - - - - - - Orchestration status of the service component instance. - - - - - - The description of service component instance. - - - - - - - @@ -940,7 +867,7 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + @@ -995,13 +922,12 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - - + + - @@ -1101,7 +1027,7 @@ If it is set to True, management and orchestration functions are responsible for - + @@ -1254,80 +1180,12 @@ NOTE 2: There may be multiple data sources (each identified as monitoredInfo) p - - - - Uniquely identifies this instance of a service. - - - - - - The name assigned to the service-instance. - - - - - - The description assigned to the service-instance. - - - - - - Constant identifier of the service model (relationship to service model). - - - - - - Versioned identifier of the service model (relationship to service model). - - - - - - The service model version in SDC catalog. - - - - - - 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”. - - - - - - URL to endpoint where more details can be gotten. - - - - - - Orchestration status of the service instance. - - - - - - - A composition of Network Functions and defined by its functional and behavioural specification. NOTE: The Network Service (NS) contributes to the behaviour of the higher layer service, which is characterized by at least performance, dependability, and security specifications. The end-to-end network service behaviour is the result of the combination of the individual network function behaviours as well as the behaviours of the network infrastructure composition mechanism. - Identifier of this NetworkService, identifying the NS instance. @@ -1800,21 +1658,6 @@ If null, then represents to the end of time - - - - - - - - - - - - - - - @@ -2156,7 +1999,6 @@ If null, then represents to the end of time - @@ -2199,7 +2041,6 @@ If null, then represents to the end of time - @@ -2234,16 +2075,6 @@ If null, then represents to the end of time - - - - - - - - - - -- cgit 1.2.3-korg