From f5be2e501db44e2e8ed4ae9e524e5c67e343573b Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Thu, 14 Mar 2019 16:48:16 +0800 Subject: Update Nested Service model Update the Atomic/Composite Service View to align with the wiki page. Issue-ID: MODELING-104 Change-Id: I448ab11a77dbbc7f6341541c4efedeb7633d7f06 Signed-off-by: guochuyicmri --- ONAP Information Model/Service.notation | 155 +---------------- ONAP Information Model/Service.uml | 284 +++++++++++++++----------------- 2 files changed, 133 insertions(+), 306 deletions(-) (limited to 'ONAP Information Model') diff --git a/ONAP Information Model/Service.notation b/ONAP Information Model/Service.notation index 7391686..46a02dc 100644 --- a/ONAP Information Model/Service.notation +++ b/ONAP Information Model/Service.notation @@ -2602,22 +2602,6 @@ - - - - - - - - - - - - - - - - @@ -2634,10 +2618,6 @@ - - - - @@ -3225,11 +3205,6 @@ - - - - - @@ -3293,45 +3268,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - @@ -3368,16 +3304,7 @@ - - - - - - - - - - +

@@ -3425,11 +3352,6 @@ - - - - - @@ -3485,40 +3407,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3843,47 +3731,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ONAP Information Model/Service.uml b/ONAP Information Model/Service.uml index cfe7f68..59d01f9 100644 --- a/ONAP Information Model/Service.uml +++ b/ONAP Information Model/Service.uml @@ -166,8 +166,11 @@

- - + + + + + @@ -182,13 +185,20 @@

- + + + sbnd f + +

+ + dbfb + @@ -374,21 +384,27 @@

- + + An implementation of composite Service corresponding to a ServiceCompositeDescriptor. + + - +

- + + Describe the nested relationship between multiple Serive Descriptors. + + - + @@ -397,62 +413,30 @@

- - + + An implementation of atomic Service corresponding to a ServicecAtomicDescriptor. + + + - - - - Some Questions: -1. Do we have a business need to have multiple service catalogs? -- -2. Do we have a need to have a service descriptor in a given catalog multiple times for different time periods? -- -3. How do we handle moving a descriptor from a test catalog to a production catalog? -- -4. What is the attachment class? - - - Presently, SDC stores the descriptor directly in the catalog. - - - I don't think SDC uses the SID Characteristic patern. - - - Found 4 ServiceDescriptor Objects. Deleted down to one. - - - found 2 ServiceCompositeDescriptors - deleted down to 1 - - - Removed recursive associations, given we are using the composite/atomic pattern. - - - Do we need this diagram? -

- - -

- - - - - -

- + + Resource components of constituting a serivce descriptor. + + + @@ -461,7 +445,10 @@

- + + Resource instance components of constituting a serivce instance. + + @@ -470,13 +457,57 @@

- + + Resource instance components of constituting a serivce instance. + + + + + +

+ + + Resource components of constituting a serivce descriptor. + + + + + + + + + + + Some Questions: +1. Do we have a business need to have multiple service catalogs? +- +2. Do we have a need to have a service descriptor in a given catalog multiple times for different time periods? +- +3. How do we handle moving a descriptor from a test catalog to a production catalog? +- +4. What is the attachment class? + + + Presently, SDC stores the descriptor directly in the catalog. + + + I don't think SDC uses the SID Characteristic patern. + + + Removed recursive associations, given we are using the composite/atomic pattern. + + + Do we need this diagram? + + + + + - @@ -541,17 +572,17 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th ServiceDescriptor is used to model the design time representation of a service. - + Constant identifier of the service model. - + - + Versioned identifier of the service model (this uuid is changed for every major version of the service) - + @@ -584,6 +615,8 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th 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”. + + @@ -603,7 +636,10 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + + + An instance of Service deployment. + @@ -623,33 +659,8 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th 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. - - - The service model version in SDC catalog. - - + + @@ -677,67 +688,37 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - - - The service component instance ID that the service instance includes. + + + Describe NS instance staus: instantiating(creating the Networek Service instance), active(the existed Network Service instance is under using), terminating(the existed Network Service instance stops using) or etc(healing and other possible status). - - - - ServcieComponentDescriptor is used to model the design time representation of a service component or network service. + ServcieCompositeDescriptor is used to model the design time representation of a service component or network service. - - - 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 name of the service component. + + + Describe the nested relationship between multiple Service Descriptors. - - - - - The description of service component. - - - - - - The version of service component. - - - - - - The designer of the service component. - - - - - + - + + + An implementation of composite Service corresponding to a ServiceCompositeDescriptor. + - + + + Resource components of constituting a serivce descriptor. + @@ -899,11 +880,17 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + + + An implementation of atomic Service corresponding to a ServicecAtomicDescriptor. + - + + + Resource components of constituting a serivce descriptor. + @@ -911,7 +898,10 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + + + Resource instance components of constituting a service instance. + @@ -960,7 +950,10 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th - + + + Resource instance components of constituting a service instance. + @@ -1013,6 +1006,9 @@ NOTE: NFV Management and Orchestration functions shall instantiate VNFs from th The value of a given ServiceCharacteristic + + The value of a given ServiceCharacteristic + @@ -1410,23 +1406,12 @@ If null, then represents to the end of time - - - - - + - - - - - - - @@ -1626,16 +1611,10 @@ If null, then represents to the end of time - - - - - - @@ -1645,4 +1624,5 @@ If null, then represents to the end of time + -- cgit 1.2.3-korg